#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

75.0

/source/client/src/clientMonitorSql.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* selectMonitorName = "taos_sql_req:count";
const char* selectMonitorHelp = "count for select sql";
const int   selectMonitorLabelCount = 4;
const char* selectMonitorLabels[] = {"cluster_id", "sql_type", "username", "result"};

void monitorClientSQLReqInit(int64_t clusterId) {
  monitorCreateClient(clusterId);
  monitorCreateClientCounter(clusterId, selectMonitorName, selectMonitorHelp, selectMonitorLabelCount, selectMonitorLabels);
}

void clientSQLReqLog(int64_t clusterId, const char* user, SQL_RESULT_CODE result, int8_t type) {
  const char* typeStr;
  switch (type) {
    case MONITORSQLTYPEDELETE:
      typeStr = "delete";
      break;
    case MONITORSQLTYPEINSERT:
      typeStr = "insert";
      break;
    default:
      typeStr = "select";
      break;
  }
  char clusterIdStr[32] = {0};
  if (snprintf(clusterIdStr, sizeof(clusterIdStr), "%" PRId64, clusterId) < 0){
    uError("failed to generate clusterId:%" PRId64, clusterId);
  }
  const char* selectMonitorLabelValues[] = {clusterIdStr, typeStr, user, monitorResultStr(result)};
  monitorCounterInc(clusterId, selectMonitorName, selectMonitorLabelValues);
}

void sqlReqLog(int64_t rid,  bool killed, int32_t code, int8_t type) {
  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("sqlReqLog, not found pAppInfo");
    } else {
      clientSQLReqLog(pTscObj->pAppInfo->clusterId, pTscObj->user, result, type);
    }
    (void)releaseTscObj(rid);
  } else {
    tscLog("sqlReqLog, 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* selectMonitorName = "taos_sql_req:count";
21	const char* selectMonitorHelp = "count for select sql";
22	const int selectMonitorLabelCount = 4;
23	const char* selectMonitorLabels[] = {"cluster_id", "sql_type", "username", "result"};
24
25	void monitorClientSQLReqInit(int64_t clusterId) {	3✔
26	monitorCreateClient(clusterId);	3✔
27	monitorCreateClientCounter(clusterId, selectMonitorName, selectMonitorHelp, selectMonitorLabelCount, selectMonitorLabels);	3✔
28	}	3✔
29
30	void clientSQLReqLog(int64_t clusterId, const char* user, SQL_RESULT_CODE result, int8_t type) {	271✔
31	const char* typeStr;
32	switch (type) {	271!
UNCOV 33	case MONITORSQLTYPEDELETE:	×
UNCOV 34	typeStr = "delete";	×
UNCOV 35	break;	×
36	case MONITORSQLTYPEINSERT:	123✔
37	typeStr = "insert";	123✔
38	break;	123✔
39	default:	148✔
40	typeStr = "select";	148✔
41	break;	148✔
42	}
43	char clusterIdStr[32] = {0};	271✔
44	if (snprintf(clusterIdStr, sizeof(clusterIdStr), "%" PRId64, clusterId) < 0){	271!
45	uError("failed to generate clusterId:%" PRId64, clusterId);	×
46	}
47	const char* selectMonitorLabelValues[] = {clusterIdStr, typeStr, user, monitorResultStr(result)};	271✔
48	monitorCounterInc(clusterId, selectMonitorName, selectMonitorLabelValues);	271✔
49	}	271✔
50
51	void sqlReqLog(int64_t rid, bool killed, int32_t code, int8_t type) {	275✔
52	SQL_RESULT_CODE result = SQL_RESULT_SUCCESS;	275✔
53	if (TSDB_CODE_SUCCESS != code) {	275✔
54	result = SQL_RESULT_FAILED;	2✔
55	}
56	// to do Distinguish active Kill events
57	// else if (killed) {
58	// result = SQL_RESULT_CANCEL;
59	// }
60
61	STscObj* pTscObj = acquireTscObj(rid);	275✔
62	if (pTscObj != NULL) {	275✔
63	if (pTscObj->pAppInfo == NULL) {	271!
64	tscLog("sqlReqLog, not found pAppInfo");	×
65	} else {
66	clientSQLReqLog(pTscObj->pAppInfo->clusterId, pTscObj->user, result, type);	271✔
67	}
68	(void)releaseTscObj(rid);	271✔
69	} else {
70	tscLog("sqlReqLog, not found rid");	4✔
71	}
72	}	275✔

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