#3610

Committed 12 Feb 2025 09:54AM UTC coverage: 54.713% (-8.4%) from 63.066%

Build # #3610

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

Merge pull request #29745 from taosdata/fix/TD33664-3.0

fix: --version show information check for 3.0

Run Details

120957 of 286549 branches covered (42.21%)

Branch coverage included in aggregate %.

190849 of 283342 relevant lines covered (67.36%)

4969786.97 hits per line

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

58.33

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

taosdata / TDengine / #3610

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