#4807

Committed 17 Oct 2025 06:47AM UTC coverage: 61.121% (+0.03%) from 61.094%

Build # #4807

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

Merge pull request #33289 from taosdata/3.0

enh: Code Optimization (#33283)

Run Details

155421 of 324369 branches covered (47.91%)

Branch coverage included in aggregate %.

1 of 1 new or added line in 1 file covered. (100.0%)

2727 existing lines in 120 files now uncovered.

207582 of 269535 relevant lines covered (77.01%)

127069383.69 hits per line

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

65.05

/source/dnode/mnode/impl/src/mndQuery.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 "mndQuery.h"
#include "executor.h"
#include "mndMnode.h"
#include "qworker.h"

int32_t mndPreProcessQueryMsg(SRpcMsg *pMsg, int32_t* qType) {
  SMnode *pMnode = pMsg->info.node;
  if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) {
    return 0;
  }

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

void mndPostProcessQueryMsg(SRpcMsg *pMsg) {
  if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) return;
  SMnode *pMnode = pMsg->info.node;
  (void)qWorkerAbortPreprocessQueryMsg(pMnode->pQuery, pMsg);
}

int32_t mndProcessQueryMsg(SRpcMsg *pMsg, SQueueInfo *pInfo) {
  int32_t code = -1;
  SMnode *pMnode = pMsg->info.node;

  SReadHandle handle = {0};
  handle =  (SReadHandle){.mnd = pMnode, .pMsgCb = &pMnode->msgCb, .pWorkerCb = pInfo->workerCb};

  mTrace("msg:%p, in query queue is processing", pMsg);
  switch (pMsg->msgType) {
    case TDMT_SCH_QUERY:
    case TDMT_SCH_MERGE_QUERY:
      code = qWorkerProcessQueryMsg(&handle, pMnode->pQuery, pMsg, 0);
      break;
    case TDMT_SCH_QUERY_CONTINUE:
      code = qWorkerProcessCQueryMsg(&handle, pMnode->pQuery, pMsg, 0);
      break;
    case TDMT_SCH_FETCH:
    case TDMT_SCH_MERGE_FETCH:
      code = qWorkerProcessFetchMsg(pMnode, pMnode->pQuery, pMsg, 0);
      break;
    case TDMT_SCH_DROP_TASK:
      code = qWorkerProcessDropMsg(pMnode, pMnode->pQuery, pMsg, 0);
      break;
    case TDMT_SCH_QUERY_HEARTBEAT:
      code = qWorkerProcessHbMsg(pMnode, pMnode->pQuery, pMsg, 0);
      break;
    case TDMT_SCH_TASK_NOTIFY:
      code = qWorkerProcessNotifyMsg(pMnode, pMnode->pQuery, pMsg, 0);
      break;
    default:
      terrno = TSDB_CODE_APP_ERROR;
      mError("unknown msg type:%d in query queue", pMsg->msgType);
  }

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

static FORCE_INLINE void mnodeFreeSBatchRspMsg(void *p) {
  if (NULL == p) {
    return;
  }

  SBatchRspMsg *pRsp = (SBatchRspMsg *)p;
  rpcFreeCont(pRsp->msg);
}

int32_t mndProcessBatchMetaMsg(SRpcMsg *pMsg) {
  int32_t      code = 0;
  int32_t      rspSize = 0;
  SBatchReq    batchReq = {0};
  SBatchMsg    req = {0};
  SBatchRspMsg rsp = {0};
  SBatchRsp    batchRsp = {0};
  SRpcMsg      reqMsg = *pMsg;
  void        *pRsp = NULL;
  SMnode      *pMnode = pMsg->info.node;

  if ((code = tDeserializeSBatchReq(pMsg->pCont, pMsg->contLen, &batchReq)) != 0) {
    code = TSDB_CODE_OUT_OF_MEMORY;
    mError("tDeserializeSBatchReq failed");
    goto _exit;
  }

  int32_t msgNum = taosArrayGetSize(batchReq.pMsgs);
  if (msgNum >= MAX_META_MSG_IN_BATCH) {
    code = TSDB_CODE_INVALID_MSG;
    mError("too many msgs %d in mnode batch meta req", msgNum);
    goto _exit;
  }

  batchRsp.pRsps = taosArrayInit(msgNum, sizeof(SBatchRspMsg));
  if (NULL == batchRsp.pRsps) {
    code = terrno;
    goto _exit;
  }

  for (int32_t i = 0; i < msgNum; ++i) {
    SBatchMsg *req = taosArrayGet(batchReq.pMsgs, i);

    reqMsg.msgType = req->msgType;
    reqMsg.pCont = req->msg;
    reqMsg.contLen = req->msgLen;
    reqMsg.info.rsp = NULL;
    reqMsg.info.rspLen = 0;

    MndMsgFp fp = pMnode->msgFp[TMSG_INDEX(req->msgType)];
    if (fp == NULL) {
      mError("msg:%p, failed to get msg handle, app:%p type:%s", pMsg, pMsg->info.ahandle, TMSG_INFO(pMsg->msgType));
      code = TSDB_CODE_MSG_NOT_PROCESSED;
      taosArrayDestroy(batchRsp.pRsps);
      return -1;
    }

    if ((*fp)(&reqMsg)) {
      rsp.rspCode = terrno;
    } else {
      rsp.rspCode = 0;
    }
    rsp.msgIdx = req->msgIdx;
    rsp.reqType = reqMsg.msgType;
    rsp.msgLen = reqMsg.info.rspLen;
    rsp.msg = reqMsg.info.rsp;

    if (taosArrayPush(batchRsp.pRsps, &rsp) == NULL) {
      mError("msg:%p, failed to put array since %s, app:%p type:%s", pMsg, terrstr(), pMsg->info.ahandle,
             TMSG_INFO(pMsg->msgType));
    }
  }

  rspSize = tSerializeSBatchRsp(NULL, 0, &batchRsp);
  if (rspSize < 0) {
    code = TSDB_CODE_OUT_OF_MEMORY;
    goto _exit;
  }
  pRsp = rpcMallocCont(rspSize);
  if (pRsp == NULL) {
    code = terrno;
    goto _exit;
  }
  if (tSerializeSBatchRsp(pRsp, rspSize, &batchRsp) < 0) {
    code = TSDB_CODE_OUT_OF_MEMORY;
    goto _exit;
  }

_exit:

  pMsg->info.rsp = pRsp;
  pMsg->info.rspLen = rspSize;

  if (code) {
    mError("mnd get batch meta failed cause of %s", tstrerror(code));
  }

  taosArrayDestroyEx(batchReq.pMsgs, tFreeSBatchReqMsg);
  taosArrayDestroyEx(batchRsp.pRsps, mnodeFreeSBatchRspMsg);

  TAOS_RETURN(code);
}

int32_t mndInitQuery(SMnode *pMnode) {
  if (qWorkerInit(NODE_TYPE_MNODE, MNODE_HANDLE, (void **)&pMnode->pQuery, &pMnode->msgCb) != 0) {
    mError("failed to init qworker in mnode since %s", terrstr());
    return -1;
  }

  mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_MERGE_QUERY, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY_CONTINUE, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_FETCH, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_MERGE_FETCH, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_TASK_NOTIFY, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_DROP_TASK, mndProcessQueryMsg);
  mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY_HEARTBEAT, mndProcessQueryMsg);
  mndSetMsgHandle(pMnode, TDMT_MND_BATCH_META, mndProcessBatchMetaMsg);

  return 0;
}

void mndCleanupQuery(SMnode *pMnode) { qWorkerDestroy((void **)&pMnode->pQuery); }

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 "mndQuery.h"
17	#include "executor.h"
18	#include "mndMnode.h"
19	#include "qworker.h"
20
21	int32_t mndPreProcessQueryMsg(SRpcMsg pMsg, int32_t qType) {	5,317,367✔
22	SMnode *pMnode = pMsg->info.node;	5,317,367✔
23	if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) {	5,317,367!
24	return 0;	×
25	}
26
27	return qWorkerPreprocessQueryMsg(pMnode->pQuery, pMsg, false, qType);	5,317,367✔
28	}
29
30	void mndPostProcessQueryMsg(SRpcMsg *pMsg) {	3,480,281✔
31	if (TDMT_SCH_QUERY != pMsg->msgType && TDMT_SCH_MERGE_QUERY != pMsg->msgType) return;	3,480,281!
32	SMnode *pMnode = pMsg->info.node;	178✔
33	(void)qWorkerAbortPreprocessQueryMsg(pMnode->pQuery, pMsg);	×
34	}
35
36	int32_t mndProcessQueryMsg(SRpcMsg pMsg, SQueueInfo pInfo) {	20,750,608✔
37	int32_t code = -1;	20,750,608✔
38	SMnode *pMnode = pMsg->info.node;	20,750,608✔
39
40	SReadHandle handle = {0};	20,750,895✔
41	handle = (SReadHandle){.mnd = pMnode, .pMsgCb = &pMnode->msgCb, .pWorkerCb = pInfo->workerCb};	20,750,895✔
42
43	mTrace("msg:%p, in query queue is processing", pMsg);	20,750,608✔
44	switch (pMsg->msgType) {	20,750,608!
45	case TDMT_SCH_QUERY:	5,317,367✔
46	case TDMT_SCH_MERGE_QUERY:
47	code = qWorkerProcessQueryMsg(&handle, pMnode->pQuery, pMsg, 0);	5,317,367✔
48	break;	5,317,367✔
49	case TDMT_SCH_QUERY_CONTINUE:	248✔
50	code = qWorkerProcessCQueryMsg(&handle, pMnode->pQuery, pMsg, 0);	248✔
51	break;	248✔
52	case TDMT_SCH_FETCH:	5,331,538✔
53	case TDMT_SCH_MERGE_FETCH:
54	code = qWorkerProcessFetchMsg(pMnode, pMnode->pQuery, pMsg, 0);	5,331,538✔
55	break;	5,331,538✔
56	case TDMT_SCH_DROP_TASK:	5,278,213✔
57	code = qWorkerProcessDropMsg(pMnode, pMnode->pQuery, pMsg, 0);	5,278,213✔
58	break;	5,278,213✔
59	case TDMT_SCH_QUERY_HEARTBEAT:	4,823,808✔
60	code = qWorkerProcessHbMsg(pMnode, pMnode->pQuery, pMsg, 0);	4,823,808✔
61	break;	4,823,808✔
62	case TDMT_SCH_TASK_NOTIFY:	×
63	code = qWorkerProcessNotifyMsg(pMnode, pMnode->pQuery, pMsg, 0);	×
64	break;	×
65	default:	×
66	terrno = TSDB_CODE_APP_ERROR;	×
67	mError("unknown msg type:%d in query queue", pMsg->msgType);	×
68	}
69
70	if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS;	20,751,174!
71	return code;	20,751,174✔
72	}
73
74	static FORCE_INLINE void mnodeFreeSBatchRspMsg(void *p) {	70,584,327✔
75	if (NULL == p) {	70,584,327!
76	return;	×
77	}
78
79	SBatchRspMsg pRsp = (SBatchRspMsg )p;	70,584,327✔
80	rpcFreeCont(pRsp->msg);	70,584,327✔
81	}
82
83	int32_t mndProcessBatchMetaMsg(SRpcMsg *pMsg) {	39,279,995✔
84	int32_t code = 0;	39,279,995✔
85	int32_t rspSize = 0;	39,279,995✔
86	SBatchReq batchReq = {0};	39,279,995✔
87	SBatchMsg req = {0};	39,279,995✔
88	SBatchRspMsg rsp = {0};	39,279,995✔
89	SBatchRsp batchRsp = {0};	39,278,998✔
90	SRpcMsg reqMsg = *pMsg;	39,278,998✔
91	void *pRsp = NULL;	39,278,998✔
92	SMnode *pMnode = pMsg->info.node;	39,278,998✔
93
94	if ((code = tDeserializeSBatchReq(pMsg->pCont, pMsg->contLen, &batchReq)) != 0) {	39,279,264!
95	code = TSDB_CODE_OUT_OF_MEMORY;	×
96	mError("tDeserializeSBatchReq failed");	×
97	goto _exit;	×
98	}
99
100	int32_t msgNum = taosArrayGetSize(batchReq.pMsgs);	39,279,839✔
101	if (msgNum >= MAX_META_MSG_IN_BATCH) {	39,278,883!
102	code = TSDB_CODE_INVALID_MSG;	×
103	mError("too many msgs %d in mnode batch meta req", msgNum);	×
104	goto _exit;	×
105	}
106
107	batchRsp.pRsps = taosArrayInit(msgNum, sizeof(SBatchRspMsg));	39,278,883✔
108	if (NULL == batchRsp.pRsps) {	39,278,699!
UNCOV 109	code = terrno;	×
110	goto _exit;	×
111	}
112
113	for (int32_t i = 0; i < msgNum; ++i) {	109,863,356✔
114	SBatchMsg *req = taosArrayGet(batchReq.pMsgs, i);	70,584,657✔
115
116	reqMsg.msgType = req->msgType;	70,584,657✔
117	reqMsg.pCont = req->msg;	70,584,657✔
118	reqMsg.contLen = req->msgLen;	70,584,657✔
119	reqMsg.info.rsp = NULL;	70,584,125✔
120	reqMsg.info.rspLen = 0;	70,584,125✔
121
122	MndMsgFp fp = pMnode->msgFp[TMSG_INDEX(req->msgType)];	70,584,125✔
123	if (fp == NULL) {	70,583,279!
124	mError("msg:%p, failed to get msg handle, app:%p type:%s", pMsg, pMsg->info.ahandle, TMSG_INFO(pMsg->msgType));	×
125	code = TSDB_CODE_MSG_NOT_PROCESSED;	×
126	taosArrayDestroy(batchRsp.pRsps);	×
127	return -1;	×
128	}
129
130	if ((*fp)(&reqMsg)) {	70,583,279✔
131	rsp.rspCode = terrno;	20,999,708✔
132	} else {
133	rsp.rspCode = 0;	49,584,780✔
134	}
135	rsp.msgIdx = req->msgIdx;	70,584,492✔
136	rsp.reqType = reqMsg.msgType;	70,584,492✔
137	rsp.msgLen = reqMsg.info.rspLen;	70,584,492✔
138	rsp.msg = reqMsg.info.rsp;	70,584,492✔
139
140	if (taosArrayPush(batchRsp.pRsps, &rsp) == NULL) {	141,169,149!
141	mError("msg:%p, failed to put array since %s, app:%p type:%s", pMsg, terrstr(), pMsg->info.ahandle,	×
142	TMSG_INFO(pMsg->msgType));
143	}
144	}
145
146	rspSize = tSerializeSBatchRsp(NULL, 0, &batchRsp);	39,278,699✔
147	if (rspSize < 0) {	39,279,995!
148	code = TSDB_CODE_OUT_OF_MEMORY;	×
149	goto _exit;	×
150	}
151	pRsp = rpcMallocCont(rspSize);	39,279,995✔
152	if (pRsp == NULL) {	39,279,995!
153	code = terrno;	×
154	goto _exit;	×
155	}
156	if (tSerializeSBatchRsp(pRsp, rspSize, &batchRsp) < 0) {	39,279,995!
157	code = TSDB_CODE_OUT_OF_MEMORY;	×
158	goto _exit;	×
159	}
160
161	_exit:	39,279,830✔
162
163	pMsg->info.rsp = pRsp;	39,279,995✔
164	pMsg->info.rspLen = rspSize;	39,279,995✔
165
166	if (code) {	39,279,995!
167	mError("mnd get batch meta failed cause of %s", tstrerror(code));	×
168	}
169
170	taosArrayDestroyEx(batchReq.pMsgs, tFreeSBatchReqMsg);	39,279,995✔
171	taosArrayDestroyEx(batchRsp.pRsps, mnodeFreeSBatchRspMsg);	39,279,830✔
172
173	TAOS_RETURN(code);	39,279,995✔
174	}
175
176	int32_t mndInitQuery(SMnode *pMnode) {	547,988✔
177	if (qWorkerInit(NODE_TYPE_MNODE, MNODE_HANDLE, (void **)&pMnode->pQuery, &pMnode->msgCb) != 0) {	547,988!
178	mError("failed to init qworker in mnode since %s", terrstr());	×
179	return -1;	×
180	}
181
182	mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY, mndProcessQueryMsg);	547,988✔
183	mndSetMsgHandleExt(pMnode, TDMT_SCH_MERGE_QUERY, mndProcessQueryMsg);	547,988✔
184	mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY_CONTINUE, mndProcessQueryMsg);	547,988✔
185	mndSetMsgHandleExt(pMnode, TDMT_SCH_FETCH, mndProcessQueryMsg);	547,988✔
186	mndSetMsgHandleExt(pMnode, TDMT_SCH_MERGE_FETCH, mndProcessQueryMsg);	547,988✔
187	mndSetMsgHandleExt(pMnode, TDMT_SCH_TASK_NOTIFY, mndProcessQueryMsg);	547,988✔
188	mndSetMsgHandleExt(pMnode, TDMT_SCH_DROP_TASK, mndProcessQueryMsg);	547,988✔
189	mndSetMsgHandleExt(pMnode, TDMT_SCH_QUERY_HEARTBEAT, mndProcessQueryMsg);	547,988✔
190	mndSetMsgHandle(pMnode, TDMT_MND_BATCH_META, mndProcessBatchMetaMsg);	547,988✔
191
192	return 0;	547,988✔
193	}
194
195	void mndCleanupQuery(SMnode pMnode) { qWorkerDestroy((void *)&pMnode->pQuery); }	547,774✔

taosdata / TDengine / #4807

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