#4643

Committed 01 Aug 2025 02:04AM UTC coverage: 60.992% (-0.1%) from 61.105%

Build # #4643

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

merge: from 3.3.6 to main branch (#32389)

* enh: grant support for data source ORC (#32378)

* fix: wrong col_id in ins_columns (#32358)

* test: remove un checked case (#32388)

* fix(parser): subquery use last_row can't found the colname (#32353)

* add col_id info in ins_columns

* fix: test case

---------

Co-authored-by: Kaili Xu <klxu@taosdata.com>
Co-authored-by: Tony Zhang <34825804+Tony2h@users.noreply.github.com>
Co-authored-by: hongzhenliu <wluckyjob@gmail.com>
Co-authored-by: Tony Zhang <tonyzhang@taosdata.com>

Run Details

139991 of 291593 branches covered (48.01%)

Branch coverage included in aggregate %.

10 of 10 new or added lines in 3 files covered. (100.0%)

3514 existing lines in 141 files now uncovered.

211118 of 284074 relevant lines covered (74.32%)

17514058.99 hits per line

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

63.25

/source/dnode/qnode/src/qnode.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 "tqueue.h"

#include "executor.h"
#include "qndInt.h"
#include "query.h"
#include "qworker.h"

int32_t qndOpen(const SQnodeOpt *pOption, SQnode **pQnode) {
  *pQnode = taosMemoryCalloc(1, sizeof(SQnode));
  if (NULL == *pQnode) {
    qError("calloc SQnode failed");
    return terrno;
  }
  (*pQnode)->qndId = QNODE_HANDLE;

  int32_t code = qWorkerInit(NODE_TYPE_QNODE, (*pQnode)->qndId, (void **)&(*pQnode)->pQuery, &pOption->msgCb);
  if (TSDB_CODE_SUCCESS != code) {
    taosMemoryFreeClear(pQnode);
    return code;
  }

  (*pQnode)->msgCb = pOption->msgCb;
  return TSDB_CODE_SUCCESS;
}

void qndClose(SQnode *pQnode) {
  qWorkerDestroy((void **)&pQnode->pQuery);
  taosMemoryFree(pQnode);
}

int32_t qndGetLoad(SQnode *pQnode, SQnodeLoad *pLoad) {
  SReadHandle  handle = {.pMsgCb = &pQnode->msgCb};
  SQWorkerStat stat = {0};

  int32_t code = qWorkerGetStat(&handle, pQnode->pQuery, &stat);
  if (code) {
    return code;
  }

  pLoad->numOfQueryInQueue = stat.numOfQueryInQueue;
  pLoad->numOfFetchInQueue = stat.numOfFetchInQueue;
  pLoad->timeInQueryQueue = stat.timeInQueryQueue;
  pLoad->timeInFetchQueue = stat.timeInFetchQueue;
  pLoad->cacheDataSize = stat.cacheDataSize;
  pLoad->numOfProcessedQuery = stat.queryProcessed;
  pLoad->numOfProcessedCQuery = stat.cqueryProcessed;
  pLoad->numOfProcessedFetch = stat.fetchProcessed;
  pLoad->numOfProcessedDrop = stat.dropProcessed;
  pLoad->numOfProcessedNotify = stat.notifyProcessed;
  pLoad->numOfProcessedHb = stat.hbProcessed;
  pLoad->numOfProcessedDelete = stat.deleteProcessed;

  return 0;
}

int32_t qndPreprocessQueryMsg(SQnode *pQnode, SRpcMsg *pMsg) {
  if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) {
    return 0;
  }

  return qWorkerPreprocessQueryMsg(pQnode->pQuery, pMsg, false);
}

int32_t qndProcessQueryMsg(SQnode *pQnode, SQueueInfo *pInfo, SRpcMsg *pMsg) {
  int32_t     code = -1;
  int64_t     ts = pInfo->timestamp;
  SReadHandle handle = {0};
  handle.pMsgCb = &pQnode->msgCb;
  handle.pWorkerCb = pInfo->workerCb;
  qTrace("message in qnode queue is processing");

  switch (pMsg->msgType) {
    case TDMT_SCH_QUERY:
    case TDMT_SCH_MERGE_QUERY:
      code = qWorkerProcessQueryMsg(&handle, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_SCH_QUERY_CONTINUE:
      code = qWorkerProcessCQueryMsg(&handle, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_SCH_FETCH:
    case TDMT_SCH_MERGE_FETCH:
      code = qWorkerProcessFetchMsg(pQnode, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_SCH_CANCEL_TASK:
      // code = qWorkerProcessCancelMsg(pQnode, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_SCH_DROP_TASK:
      code = qWorkerProcessDropMsg(pQnode, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_VND_TMQ_CONSUME:
      // code =  tqProcessConsumeReq(pQnode->pTq, pMsg);
      // break;
    case TDMT_SCH_QUERY_HEARTBEAT:
      code = qWorkerProcessHbMsg(pQnode, pQnode->pQuery, pMsg, ts);
      break;
    case TDMT_SCH_TASK_NOTIFY:
      code = qWorkerProcessNotifyMsg(pQnode, pQnode->pQuery, pMsg, ts);
      break;
    default:
      qError("unknown msg type:%d in qnode queue", pMsg->msgType);
      terrno = TSDB_CODE_APP_ERROR;
  }

  if (code == 0) {
    return TSDB_CODE_ACTION_IN_PROGRESS;
  } else {
    return code;
  }
}

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
16	#include "tqueue.h"
17
18	#include "executor.h"
19	#include "qndInt.h"
20	#include "query.h"
21	#include "qworker.h"
22
23	int32_t qndOpen(const SQnodeOpt pOption, SQnode *pQnode) {	525✔
24	*pQnode = taosMemoryCalloc(1, sizeof(SQnode));	525!
25	if (NULL == *pQnode) {	525!
26	qError("calloc SQnode failed");	×
27	return terrno;	×
28	}
29	(*pQnode)->qndId = QNODE_HANDLE;	525✔
30
31	int32_t code = qWorkerInit(NODE_TYPE_QNODE, (pQnode)->qndId, (void )&(pQnode)->pQuery, &pOption->msgCb);	525✔
32	if (TSDB_CODE_SUCCESS != code) {	525!
33	taosMemoryFreeClear(pQnode);	×
34	return code;	×
35	}
36
37	(*pQnode)->msgCb = pOption->msgCb;	525✔
38	return TSDB_CODE_SUCCESS;	525✔
39	}
40
41	void qndClose(SQnode *pQnode) {	525✔
42	qWorkerDestroy((void **)&pQnode->pQuery);	525✔
43	taosMemoryFree(pQnode);	525!
44	}	525✔
45
46	int32_t qndGetLoad(SQnode pQnode, SQnodeLoad pLoad) {	41,653✔
47	SReadHandle handle = {.pMsgCb = &pQnode->msgCb};	41,653✔
48	SQWorkerStat stat = {0};	41,653✔
49
50	int32_t code = qWorkerGetStat(&handle, pQnode->pQuery, &stat);	41,653✔
51	if (code) {	41,653!
52	return code;	×
53	}
54
55	pLoad->numOfQueryInQueue = stat.numOfQueryInQueue;	41,653✔
56	pLoad->numOfFetchInQueue = stat.numOfFetchInQueue;	41,653✔
57	pLoad->timeInQueryQueue = stat.timeInQueryQueue;	41,653✔
58	pLoad->timeInFetchQueue = stat.timeInFetchQueue;	41,653✔
59	pLoad->cacheDataSize = stat.cacheDataSize;	41,653✔
60	pLoad->numOfProcessedQuery = stat.queryProcessed;	41,653✔
61	pLoad->numOfProcessedCQuery = stat.cqueryProcessed;	41,653✔
62	pLoad->numOfProcessedFetch = stat.fetchProcessed;	41,653✔
63	pLoad->numOfProcessedDrop = stat.dropProcessed;	41,653✔
64	pLoad->numOfProcessedNotify = stat.notifyProcessed;	41,653✔
65	pLoad->numOfProcessedHb = stat.hbProcessed;	41,653✔
66	pLoad->numOfProcessedDelete = stat.deleteProcessed;	41,653✔
67
68	return 0;	41,653✔
69	}
70
71	int32_t qndPreprocessQueryMsg(SQnode pQnode, SRpcMsg pMsg) {	272,692✔
72	if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) {	272,692!
73	return 0;	×
74	}
75
76	return qWorkerPreprocessQueryMsg(pQnode->pQuery, pMsg, false);	272,692✔
77	}
78
79	int32_t qndProcessQueryMsg(SQnode pQnode, SQueueInfo pInfo, SRpcMsg *pMsg) {	976,029✔
80	int32_t code = -1;	976,029✔
81	int64_t ts = pInfo->timestamp;	976,029✔
82	SReadHandle handle = {0};	976,029✔
83	handle.pMsgCb = &pQnode->msgCb;	976,029✔
84	handle.pWorkerCb = pInfo->workerCb;	976,029✔
85	qTrace("message in qnode queue is processing");	976,029!
86
87	switch (pMsg->msgType) {	976,029!
88	case TDMT_SCH_QUERY:	272,697✔
89	case TDMT_SCH_MERGE_QUERY:
90	code = qWorkerProcessQueryMsg(&handle, pQnode->pQuery, pMsg, ts);	272,697✔
91	break;	272,698✔
92	case TDMT_SCH_QUERY_CONTINUE:	1,962✔
93	code = qWorkerProcessCQueryMsg(&handle, pQnode->pQuery, pMsg, ts);	1,962✔
94	break;	1,962✔
95	case TDMT_SCH_FETCH:	298,256✔
96	case TDMT_SCH_MERGE_FETCH:
97	code = qWorkerProcessFetchMsg(pQnode, pQnode->pQuery, pMsg, ts);	298,256✔
98	break;	298,256✔
99	case TDMT_SCH_CANCEL_TASK:	×
100	// code = qWorkerProcessCancelMsg(pQnode, pQnode->pQuery, pMsg, ts);
101	break;	×
102	case TDMT_SCH_DROP_TASK:	272,658✔
103	code = qWorkerProcessDropMsg(pQnode, pQnode->pQuery, pMsg, ts);	272,658✔
104	break;	272,658✔
105	case TDMT_VND_TMQ_CONSUME:	130,456✔
106	// code = tqProcessConsumeReq(pQnode->pTq, pMsg);
107	// break;
108	case TDMT_SCH_QUERY_HEARTBEAT:
109	code = qWorkerProcessHbMsg(pQnode, pQnode->pQuery, pMsg, ts);	130,456✔
110	break;	130,456✔
111	case TDMT_SCH_TASK_NOTIFY:	×
112	code = qWorkerProcessNotifyMsg(pQnode, pQnode->pQuery, pMsg, ts);	×
113	break;	×
114	default:	×
115	qError("unknown msg type:%d in qnode queue", pMsg->msgType);	×
116	terrno = TSDB_CODE_APP_ERROR;	×
117	}
118
119	if (code == 0) {	976,030!
120	return TSDB_CODE_ACTION_IN_PROGRESS;	976,031✔
121	} else {
UNCOV 122	return code;	×
123	}
124	}

taosdata / TDengine / #4643

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