#3653

Committed 14 Mar 2025 08:10AM UTC coverage: 22.565% (-41.0%) from 63.596%

Build # #3653

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

feat(keep): support keep on super table level. (#30097)

* Feat: support use keep while create super table.

* Test(keep): add test for create super table with keep option.

* Feat(keep): Add tmsg for create keep.

* Feat(keep): support alter table option keep.

* Fix(keep): Add baisc test for alter table option.

* Fix(keep): memory leek.

* Feat(keep): add keep to metaEntry&metaCache and fix earliestTs with stn keep.

* Test(keep): add some cases for select with stb keep.

* Fix: fix ci core while alter stb.

* Feat(keep): delete expired data in super table level.

* Feat: remove get stb keep while query.

* Fix : build error.

* Revert "Fix : build error."

This reverts commit 0ed66e4e8.

* Revert "Feat(keep): delete expired data in super table level."

This reverts commit 36330f6b4.

* Fix : build errors.

* Feat : support restart taosd.

* Fix : alter table comment problems.

* Test : add tests for super table keep.

* Fix: change sdb stb reserve size.

* Test: add more tests.

* Feat: Disable normal tables and sub tables from setting the keep parameter

* Fix: add more checks to avoid unknown address.

* Docs: Add docs for stable keep.

* Fix: some review changes.

* Fix: review errors.

Run Details

49248 of 302527 branches covered (16.28%)

Branch coverage included in aggregate %.

53 of 99 new or added lines in 12 files covered. (53.54%)

155872 existing lines in 443 files now uncovered.

87359 of 302857 relevant lines covered (28.84%)

570004.22 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

7.55

/source/client/src/clientMonitorSlow.c

/*
 * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
 *
 * This program is free software: you can use, redistribute, and/or modify
 * it under the terms of the GNU Affero General Public License, version 3
 * or later ("AGPL"), as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
#include "clientInt.h"
#include "clientMonitor.h"
#include "clientLog.h"
#include "tglobal.h"

const char* slowQueryName = "taos_slow_sql:count";
const char* slowQueryHelp = "slow query log when cost over than config duration";
const int   slowQueryLabelCount = 4;
const char* slowQueryLabels[] = {"cluster_id", "username", "result", "duration"};

const int64_t usInSeconds = 1000 * 1000;
const int64_t msInMinutes = 60 * 1000;

static const char* getSlowQueryLableCostDesc(int64_t cost) {
  if (cost >= 1000 * usInSeconds) {
    return "1000s-";
  } else if (cost >= 100 * usInSeconds) {
    return "100-1000s";
  } else if (cost >= 10 * usInSeconds) {
    return "10-100s";
  } else if (cost >= 3 * usInSeconds) {
    return "3-10s";
  }
  return "0-3s";
}

void monitorClientSlowQueryInit(int64_t clusterid) {
  monitorCreateClient(clusterid);
  monitorCreateClientCounter(clusterid, slowQueryName, slowQueryHelp, slowQueryLabelCount, slowQueryLabels);
}

void clientSlowQueryLog(int64_t clusterId, const char* user, SQL_RESULT_CODE result, int32_t cost) {
  char clusterIdStr[32] = {0};
  if (snprintf(clusterIdStr, sizeof(clusterIdStr), "%" PRId64, clusterId) < 0){
    uError("failed to generate clusterId:%" PRId64, clusterId);
  }
  const char* slowQueryLabelValues[] = {clusterIdStr, user, monitorResultStr(result), getSlowQueryLableCostDesc(cost)};
  monitorCounterInc(clusterId, slowQueryName, slowQueryLabelValues);
}

void slowQueryLog(int64_t rid, bool killed, int32_t code, int32_t cost) {
  SQL_RESULT_CODE result = SQL_RESULT_SUCCESS;
  if (TSDB_CODE_SUCCESS != code) {
    result = SQL_RESULT_FAILED;
  }
  // to do Distinguish active Kill events
  // else if (killed) {
  //   result = SQL_RESULT_CANCEL;
  // }

  STscObj* pTscObj = acquireTscObj(rid);
  if (pTscObj != NULL) {
    if(pTscObj->pAppInfo == NULL) {
      tscLog("slowQueryLog, not found pAppInfo");
    } else {
      clientSlowQueryLog(pTscObj->pAppInfo->clusterId, pTscObj->user, result, cost);
    }
    (void)releaseTscObj(rid);
  } else {
    tscLog("slowQueryLog, not found rid");
  }
}

1	/*
2	* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
3	*
4	* This program is free software: you can use, redistribute, and/or modify
5	* it under the terms of the GNU Affero General Public License, version 3
6	* or later ("AGPL"), as published by the Free Software Foundation.
7	*
8	* This program is distributed in the hope that it will be useful, but WITHOUT
9	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10	* FITNESS FOR A PARTICULAR PURPOSE.
11	*
12	* You should have received a copy of the GNU Affero General Public License
13	* along with this program. If not, see <http://www.gnu.org/licenses/>.
14	*/
15	#include "clientInt.h"
16	#include "clientMonitor.h"
17	#include "clientLog.h"
18	#include "tglobal.h"
19
20	const char* slowQueryName = "taos_slow_sql:count";
21	const char* slowQueryHelp = "slow query log when cost over than config duration";
22	const int slowQueryLabelCount = 4;
23	const char* slowQueryLabels[] = {"cluster_id", "username", "result", "duration"};
24
25	const int64_t usInSeconds = 1000 * 1000;
26	const int64_t msInMinutes = 60 * 1000;
27
UNCOV 28	static const char* getSlowQueryLableCostDesc(int64_t cost) {	×
UNCOV 29	if (cost >= 1000 * usInSeconds) {	×
30	return "1000s-";	×
UNCOV 31	} else if (cost >= 100 * usInSeconds) {	×
32	return "100-1000s";	×
UNCOV 33	} else if (cost >= 10 * usInSeconds) {	×
UNCOV 34	return "10-100s";	×
35	} else if (cost >= 3 * usInSeconds) {	×
36	return "3-10s";	×
37	}
38	return "0-3s";	×
39	}
40
41	void monitorClientSlowQueryInit(int64_t clusterid) {	3✔
42	monitorCreateClient(clusterid);	3✔
43	monitorCreateClientCounter(clusterid, slowQueryName, slowQueryHelp, slowQueryLabelCount, slowQueryLabels);	3✔
44	}	3✔
45
UNCOV 46	void clientSlowQueryLog(int64_t clusterId, const char* user, SQL_RESULT_CODE result, int32_t cost) {	×
UNCOV 47	char clusterIdStr[32] = {0};	×
UNCOV 48	if (snprintf(clusterIdStr, sizeof(clusterIdStr), "%" PRId64, clusterId) < 0){	×
49	uError("failed to generate clusterId:%" PRId64, clusterId);	×
50	}
UNCOV 51	const char* slowQueryLabelValues[] = {clusterIdStr, user, monitorResultStr(result), getSlowQueryLableCostDesc(cost)};	×
UNCOV 52	monitorCounterInc(clusterId, slowQueryName, slowQueryLabelValues);	×
UNCOV 53	}	×
54
UNCOV 55	void slowQueryLog(int64_t rid, bool killed, int32_t code, int32_t cost) {	×
UNCOV 56	SQL_RESULT_CODE result = SQL_RESULT_SUCCESS;	×
UNCOV 57	if (TSDB_CODE_SUCCESS != code) {	×
UNCOV 58	result = SQL_RESULT_FAILED;	×
59	}
60	// to do Distinguish active Kill events
61	// else if (killed) {
62	// result = SQL_RESULT_CANCEL;
63	// }
64
UNCOV 65	STscObj* pTscObj = acquireTscObj(rid);	×
UNCOV 66	if (pTscObj != NULL) {	×
UNCOV 67	if(pTscObj->pAppInfo == NULL) {	×
68	tscLog("slowQueryLog, not found pAppInfo");	×
69	} else {
UNCOV 70	clientSlowQueryLog(pTscObj->pAppInfo->clusterId, pTscObj->user, result, cost);	×
71	}
UNCOV 72	(void)releaseTscObj(rid);	×
73	} else {
74	tscLog("slowQueryLog, not found rid");	×
75	}
UNCOV 76	}	×

taosdata / TDengine / #3653

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous