Merge pull request #17340 from taosdata/refact/code_format

refact: code format

source/dnode/vnode/src/tsdb/tsdbMergeTree.c

@@ -101,7 +101,7 @@ void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
 static SBlockData *loadLastBlock(SLDataIter *pIter, const char *idStr) {
   int32_t code = 0;
 
-  SSttBlockLoadInfo* pInfo = pIter->pBlockLoadInfo;
+  SSttBlockLoadInfo *pInfo = pIter->pBlockLoadInfo;
   if (pInfo->blockIndex[0] == pIter->iSttBlk) {
     if (pInfo->currentLoadBlockIndex != 0) {
       tsdbDebug("current load index is set to 0, block index:%d, file index:%d, due to uid:%" PRIu64 ", load data, %s",
@@ -113,7 +113,7 @@ static SBlockData *loadLastBlock(SLDataIter *pIter, const char *idStr) {
 
   if (pInfo->blockIndex[1] == pIter->iSttBlk) {
     if (pInfo->currentLoadBlockIndex != 1) {
-      tsdbDebug("current load index is set to 1, block index:%d, file index:%d, due to uid:%"PRIu64", load data, %s",
+      tsdbDebug("current load index is set to 1, block index:%d, file index:%d, due to uid:%" PRIu64 ", load data, %s",
                 pIter->iSttBlk, pIter->iStt, pIter->uid, idStr);
       pInfo->currentLoadBlockIndex = 1;
     }
@@ -140,8 +140,10 @@ static SBlockData *loadLastBlock(SLDataIter *pIter, const char *idStr) {
     pInfo->elapsedTime += el;
     pInfo->loadBlocks += 1;
 
-    tsdbDebug("read last block, total load:%d, trigger by uid:%"PRIu64", last file index:%d, last block index:%d, entry:%d, %p, elapsed time:%.2f ms, %s",
-              pInfo->loadBlocks, pIter->uid, pIter->iStt, pIter->iSttBlk, pInfo->currentLoadBlockIndex, pBlock, el, idStr);
+    tsdbDebug("read last block, total load:%d, trigger by uid:%" PRIu64
+              ", last file index:%d, last block index:%d, entry:%d, %p, elapsed time:%.2f ms, %s",
+              pInfo->loadBlocks, pIter->uid, pIter->iStt, pIter->iSttBlk, pInfo->currentLoadBlockIndex, pBlock, el,
+              idStr);
     if (code != TSDB_CODE_SUCCESS) {
       goto _exit;
     }
@@ -336,7 +338,7 @@ _exit:
 
 void tLDataIterClose(SLDataIter *pIter) { taosMemoryFree(pIter); }
 
-void tLDataIterNextBlock(SLDataIter *pIter, const char* idStr) {
+void tLDataIterNextBlock(SLDataIter *pIter, const char *idStr) {
   int32_t step = pIter->backward ? -1 : 1;
   int32_t oldIndex = pIter->iSttBlk;
 
@@ -386,10 +388,10 @@ void tLDataIterNextBlock(SLDataIter *pIter, const char* idStr) {
   if (index != -1) {
     pIter->iSttBlk = index;
     pIter->pSttBlk = (SSttBlk *)taosArrayGet(pIter->pBlockLoadInfo->aSttBlk, pIter->iSttBlk);
-    tsdbDebug("try next last file block:%d from %d, trigger by uid:%"PRIu64", file index:%d, %s", pIter->iSttBlk, oldIndex, pIter->uid, pIter->iStt,
-        idStr);
+    tsdbDebug("try next last file block:%d from %d, trigger by uid:%" PRIu64 ", file index:%d, %s", pIter->iSttBlk,
+              oldIndex, pIter->uid, pIter->iStt, idStr);
   } else {
-    tsdbDebug("no more last block qualified, uid:%"PRIu64", file index::%d, %s", pIter->uid, oldIndex, idStr);
+    tsdbDebug("no more last block qualified, uid:%" PRIu64 ", file index::%d, %s", pIter->uid, oldIndex, idStr);
   }
 }
 

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -1645,7 +1645,7 @@ static int32_t doMergeFileBlockAndLastBlock(SLastBlockReader* pLastBlockReader,
   STSRow*    pTSRow = NULL;
   SRowMerger merge = {0};
   TSDBROW    fRow = tMergeTreeGetRow(&pLastBlockReader->mergeTree);
-  tsdbTrace("fRow ptr:%p, %d, uid:%"PRIu64", %s", fRow.pBlockData, fRow.iRow, pLastBlockReader->uid, pReader->idStr);
+  tsdbTrace("fRow ptr:%p, %d, uid:%" PRIu64 ", %s", fRow.pBlockData, fRow.iRow, pLastBlockReader->uid, pReader->idStr);
 
   // only last block exists
   if ((!mergeBlockData) || (tsLastBlock != pBlockData->aTSKEY[pDumpInfo->rowIndex])) {

source/libs/scheduler/src/schDbg.c

@@ -30,5 +30,3 @@ void schdExecCallback(SExecResult* pResult, void* param, int32_t code) {
 
   tsem_post(&schdRspSem);
 }
-
-

source/libs/scheduler/src/schFlowCtrl.c

@@ -13,10 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "catalog.h"
+#include "query.h"
 #include "schInt.h"
 #include "tmsg.h"
-#include "query.h"
-#include "catalog.h"
 #include "tref.h"
 
 void schFreeFlowCtrl(SSchJob *pJob) {
@@ -59,7 +59,8 @@ int32_t schChkJobNeedFlowCtrl(SSchJob *pJob, SSchLevel *pLevel) {
     return TSDB_CODE_SUCCESS;
   }
 
-  pJob->flowCtrl = taosHashInit(pJob->taskNum, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
+  pJob->flowCtrl =
+      taosHashInit(pJob->taskNum, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
   if (NULL == pJob->flowCtrl) {
     SCH_JOB_ELOG("taosHashInit %d flowCtrl failed", pJob->taskNum);
     SCH_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
@@ -93,8 +94,8 @@ int32_t schDecTaskFlowQuota(SSchJob *pJob, SSchTask *pTask) {
   --ctrl->execTaskNum;
   ctrl->tableNumSum -= pTask->plan->execNodeStat.tableNum;
 
-  SCH_TASK_DLOG("task quota removed, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", 
-     ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
+  SCH_TASK_DLOG("task quota removed, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", ep->fqdn,
+                ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
 
 _return:
 
@@ -124,8 +125,8 @@ int32_t schCheckIncTaskFlowQuota(SSchJob *pJob, SSchTask *pTask, bool *enough) {
         SCH_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
       }
 
-      SCH_TASK_DLOG("task quota added, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", 
-         ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, nctrl.tableNumSum, nctrl.execTaskNum);
+      SCH_TASK_DLOG("task quota added, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", ep->fqdn,
+                    ep->port, pTask->plan->execNodeStat.tableNum, nctrl.tableNumSum, nctrl.execTaskNum);
 
       *enough = true;
       return TSDB_CODE_SUCCESS;
@@ -173,14 +174,15 @@ int32_t schCheckIncTaskFlowQuota(SSchJob *pJob, SSchTask *pTask, bool *enough) {
 _return:
 
   SCH_TASK_DLOG("task quota %s added, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d",
-     ((*enough)?"":"NOT"), ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
+                ((*enough) ? "" : "NOT"), ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum,
+                ctrl->execTaskNum);
 
   SCH_UNLOCK(SCH_WRITE, &ctrl->lock);
 
   SCH_RET(code);
 }
 
-int32_t schTaskTableNumCompare(const void* key1, const void* key2) {
+int32_t schTaskTableNumCompare(const void *key1, const void *key2) {
   SSchTask *pTask1 = *(SSchTask **)key1;
   SSchTask *pTask2 = *(SSchTask **)key2;
 
@@ -193,7 +195,6 @@ int32_t schTaskTableNumCompare(const void* key1, const void* key2) {
   }
 }
 
-
 int32_t schLaunchTasksInFlowCtrlListImpl(SSchJob *pJob, SSchFlowControl *ctrl) {
   SCH_LOCK(SCH_WRITE, &ctrl->lock);
 
@@ -216,8 +217,8 @@ int32_t schLaunchTasksInFlowCtrlListImpl(SSchJob *pJob, SSchFlowControl *ctrl) {
     SEp *ep = SCH_GET_CUR_EP(&pTask->plan->execNode);
 
     if (pTask->plan->execNodeStat.tableNum > remainNum && ctrl->execTaskNum > 0) {
-      SCH_TASK_DLOG("task NOT to launch, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", 
-         ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
+      SCH_TASK_DLOG("task NOT to launch, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", ep->fqdn,
+                    ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
 
       continue;
     }
@@ -227,15 +228,15 @@ int32_t schLaunchTasksInFlowCtrlListImpl(SSchJob *pJob, SSchFlowControl *ctrl) {
 
     taosArrayRemove(ctrl->taskList, i);
 
-    SCH_TASK_DLOG("task to launch, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", 
-       ep->fqdn, ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
+    SCH_TASK_DLOG("task to launch, fqdn:%s, port:%d, tableNum:%d, remainNum:%d, remainExecTaskNum:%d", ep->fqdn,
+                  ep->port, pTask->plan->execNodeStat.tableNum, ctrl->tableNumSum, ctrl->execTaskNum);
 
     SCH_ERR_JRET(schAsyncLaunchTaskImpl(pJob, pTask));
 
     remainNum -= pTask->plan->execNodeStat.tableNum;
     if (remainNum <= 0) {
-      SCH_TASK_DLOG("no more task to launch, fqdn:%s, port:%d, remainNum:%d, remainExecTaskNum:%d", 
-         ep->fqdn, ep->port, ctrl->tableNumSum, ctrl->execTaskNum);
+      SCH_TASK_DLOG("no more task to launch, fqdn:%s, port:%d, remainNum:%d, remainExecTaskNum:%d", ep->fqdn, ep->port,
+                    ctrl->tableNumSum, ctrl->execTaskNum);
 
       break;
     }
@@ -265,7 +266,6 @@ _return:
   SCH_RET(code);
 }
 
-
 int32_t schLaunchTasksInFlowCtrlList(SSchJob *pJob, SSchTask *pTask) {
   if (!SCH_TASK_NEED_FLOW_CTRL(pJob, pTask)) {
     return TSDB_CODE_SUCCESS;
@@ -281,10 +281,9 @@ int32_t schLaunchTasksInFlowCtrlList(SSchJob *pJob, SSchTask *pTask) {
     SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR);
   }
 
-  int32_t code = schLaunchTasksInFlowCtrlListImpl(pJob, ctrl);;
+  int32_t code = schLaunchTasksInFlowCtrlListImpl(pJob, ctrl);
+  ;
   SCH_ERR_RET(code);
 
   return code;  // to avoid compiler error
 }
-
-

source/libs/scheduler/src/schJob.c

@@ -53,8 +53,7 @@ _return:
 bool schJobDone(SSchJob *pJob) {
   int8_t status = SCH_GET_JOB_STATUS(pJob);
 
-  return (status == JOB_TASK_STATUS_FAIL || status == JOB_TASK_STATUS_DROP ||
-          status == JOB_TASK_STATUS_SUCC);
+  return (status == JOB_TASK_STATUS_FAIL || status == JOB_TASK_STATUS_DROP || status == JOB_TASK_STATUS_SUCC);
 }
 
 FORCE_INLINE bool schJobNeedToStop(SSchJob *pJob, int8_t *pStatus) {
@@ -235,7 +234,7 @@ int32_t schBuildTaskRalation(SSchJob *pJob, SHashObj *planToTask) {
       SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR);
     }
 
-    SSchTask* pTask = taosArrayGet(pLevel->subTasks, 0);
+    SSchTask *pTask = taosArrayGet(pLevel->subTasks, 0);
     if (SUBPLAN_TYPE_MODIFY != pTask->plan->subplanType) {
       pJob->attr.needFetch = true;
     }
@@ -244,7 +243,6 @@ int32_t schBuildTaskRalation(SSchJob *pJob, SHashObj *planToTask) {
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schAppendJobDataSrc(SSchJob *pJob, SSchTask *pTask) {
   if (!SCH_IS_DATA_BIND_QRY_TASK(pTask)) {
     return TSDB_CODE_SUCCESS;
@@ -255,7 +253,6 @@ int32_t schAppendJobDataSrc(SSchJob *pJob, SSchTask *pTask) {
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schValidateAndBuildJob(SQueryPlan *pDag, SSchJob *pJob) {
   int32_t code = 0;
   pJob->queryId = pDag->queryId;
@@ -373,8 +370,7 @@ _return:
   SCH_RET(code);
 }
 
-
-int32_t schDumpJobExecRes(SSchJob* pJob, SExecResult* pRes) {
+int32_t schDumpJobExecRes(SSchJob *pJob, SExecResult *pRes) {
   pRes->code = atomic_load_32(&pJob->errCode);
   pRes->numOfRows = pJob->resNumOfRows;
   pRes->res = pJob->execRes.res;
@@ -387,7 +383,7 @@ int32_t schDumpJobExecRes(SSchJob* pJob, SExecResult* pRes) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t schDumpJobFetchRes(SSchJob* pJob, void** pData) {
+int32_t schDumpJobFetchRes(SSchJob *pJob, void **pData) {
   int32_t code = 0;
 
   SCH_LOCK(SCH_WRITE, &pJob->resLock);
@@ -426,8 +422,8 @@ _return:
   return code;
 }
 
-int32_t schNotifyUserExecRes(SSchJob* pJob) {
-  SExecResult* pRes = taosMemoryCalloc(1, sizeof(SExecResult));
+int32_t schNotifyUserExecRes(SSchJob *pJob) {
+  SExecResult *pRes = taosMemoryCalloc(1, sizeof(SExecResult));
   if (pRes) {
     schDumpJobExecRes(pJob, pRes);
   }
@@ -439,8 +435,8 @@ int32_t schNotifyUserExecRes(SSchJob* pJob) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t schNotifyUserFetchRes(SSchJob* pJob) {
-  void* pRes = NULL;
+int32_t schNotifyUserFetchRes(SSchJob *pJob) {
+  void *pRes = NULL;
 
   schDumpJobFetchRes(pJob, &pRes);
 
@@ -507,9 +503,7 @@ int32_t schHandleJobFailure(SSchJob *pJob, int32_t errCode) {
   return TSDB_CODE_SCH_IGNORE_ERROR;
 }
 
-int32_t schProcessOnJobDropped(SSchJob *pJob, int32_t errCode) {
-  SCH_RET(schProcessOnJobFailure(pJob, errCode));
-}
+int32_t schProcessOnJobDropped(SSchJob *pJob, int32_t errCode) { SCH_RET(schProcessOnJobFailure(pJob, errCode)); }
 
 int32_t schHandleJobDrop(SSchJob *pJob, int32_t errCode) {
   if (TSDB_CODE_SCH_IGNORE_ERROR == errCode) {
@@ -520,7 +514,6 @@ int32_t schHandleJobDrop(SSchJob *pJob, int32_t errCode) {
   return TSDB_CODE_SCH_IGNORE_ERROR;
 }
 
-
 int32_t schProcessOnJobPartialSuccess(SSchJob *pJob) {
   if (schChkCurrentOp(pJob, SCH_OP_FETCH, -1)) {
     SCH_ERR_RET(schLaunchFetchTask(pJob));
@@ -531,9 +524,7 @@ int32_t schProcessOnJobPartialSuccess(SSchJob *pJob) {
   return TSDB_CODE_SUCCESS;
 }
 
-void schProcessOnDataFetched(SSchJob *pJob) {
-  schPostJobRes(pJob, SCH_OP_FETCH);
-}
+void schProcessOnDataFetched(SSchJob *pJob) { schPostJobRes(pJob, SCH_OP_FETCH); }
 
 int32_t schProcessOnExplainDone(SSchJob *pJob, SSchTask *pTask, SRetrieveTableRsp *pRsp) {
   SCH_TASK_DLOG("got explain rsp, rows:%d, complete:%d", htonl(pRsp->numOfRows), pRsp->completed);
@@ -548,7 +539,6 @@ int32_t schProcessOnExplainDone(SSchJob *pJob, SSchTask *pTask, SRetrieveTableRs
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schLaunchJobLowerLevel(SSchJob *pJob, SSchTask *pTask) {
   if (!SCH_IS_QUERY_JOB(pJob)) {
     return TSDB_CODE_SUCCESS;
@@ -610,7 +600,6 @@ int32_t schGetTaskInJob(SSchJob *pJob, uint64_t taskId, SSchTask **pTask) {
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schLaunchJob(SSchJob *pJob) {
   if (EXPLAIN_MODE_STATIC == pJob->attr.explainMode) {
     SCH_ERR_RET(qExecStaticExplain(pJob->pDag, (SRetrieveTableRsp **)&pJob->fetchRes));
@@ -623,11 +612,10 @@ int32_t schLaunchJob(SSchJob *pJob) {
   return TSDB_CODE_SUCCESS;
 }
 
-
 void schDropJobAllTasks(SSchJob *pJob) {
   schDropTaskInHashList(pJob, pJob->execTasks);
-//  schDropTaskInHashList(pJob, pJob->succTasks);
-//  schDropTaskInHashList(pJob, pJob->failTasks);
+  //  schDropTaskInHashList(pJob, pJob->succTasks);
+  //  schDropTaskInHashList(pJob, pJob->failTasks);
 }
 
 void schFreeJobImpl(void *job) {
@@ -659,8 +647,8 @@ void schFreeJobImpl(void *job) {
   schFreeFlowCtrl(pJob);
 
   taosHashCleanup(pJob->execTasks);
-//  taosHashCleanup(pJob->failTasks);
-//  taosHashCleanup(pJob->succTasks);
+  //  taosHashCleanup(pJob->failTasks);
+  //  taosHashCleanup(pJob->succTasks);
   taosHashCleanup(pJob->taskList);
 
   taosArrayDestroy(pJob->levels);
@@ -737,8 +725,8 @@ int32_t schInitJob(int64_t *pJobId, SSchedulerReq *pReq) {
     pJob->nodeList = taosArrayDup(pReq->pNodeList);
   }
 
-  pJob->taskList =
-      taosHashInit(pReq->pDag->numOfSubplans, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_ENTRY_LOCK);
+  pJob->taskList = taosHashInit(pReq->pDag->numOfSubplans, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false,
+                                HASH_ENTRY_LOCK);
   if (NULL == pJob->taskList) {
     SCH_JOB_ELOG("taosHashInit %d taskList failed", pReq->pDag->numOfSubplans);
     SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
@@ -750,8 +738,8 @@ int32_t schInitJob(int64_t *pJobId, SSchedulerReq *pReq) {
     SCH_ERR_JRET(qExecExplainBegin(pReq->pDag, &pJob->explainCtx, pReq->startTs));
   }
 
-  pJob->execTasks =
-      taosHashInit(pReq->pDag->numOfSubplans, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_ENTRY_LOCK);
+  pJob->execTasks = taosHashInit(pReq->pDag->numOfSubplans, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false,
+                                 HASH_ENTRY_LOCK);
   if (NULL == pJob->execTasks) {
     SCH_JOB_ELOG("taosHashInit %d execTasks failed", pReq->pDag->numOfSubplans);
     SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
@@ -769,7 +757,7 @@ int32_t schInitJob(int64_t *pJobId, SSchedulerReq *pReq) {
 
   *pJobId = pJob->refId;
 
-  SCH_JOB_DLOG("job refId:0x%" PRIx64" created", pJob->refId);
+  SCH_JOB_DLOG("job refId:0x%" PRIx64 " created", pJob->refId);
 
   return TSDB_CODE_SUCCESS;
 
@@ -788,7 +776,7 @@ _return:
 
 int32_t schExecJob(SSchJob *pJob, SSchedulerReq *pReq) {
   int32_t code = 0;
-  qDebug("QID:0x%" PRIx64 " sch job refId 0x%"PRIx64 " started", pReq->pDag->queryId, pJob->refId);
+  qDebug("QID:0x%" PRIx64 " sch job refId 0x%" PRIx64 " started", pReq->pDag->queryId, pJob->refId);
 
   SCH_ERR_RET(schLaunchJob(pJob));
 
@@ -802,7 +790,7 @@ int32_t schExecJob(SSchJob *pJob, SSchedulerReq *pReq) {
   return TSDB_CODE_SUCCESS;
 }
 
-void schDirectPostJobRes(SSchedulerReq* pReq, int32_t errCode) {
+void schDirectPostJobRes(SSchedulerReq *pReq, int32_t errCode) {
   if (NULL == pReq || pReq->syncReq) {
     return;
   }
@@ -827,7 +815,7 @@ bool schChkCurrentOp(SSchJob *pJob, int32_t op, int8_t sync) {
   return r;
 }
 
-void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq* pReq, int32_t errCode) {
+void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq *pReq, int32_t errCode) {
   int32_t op = 0;
 
   switch (type) {
@@ -836,7 +824,8 @@ void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq* pReq, int
         SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
         op = atomic_val_compare_exchange_32(&pJob->opStatus.op, type, SCH_OP_NULL);
         if (SCH_OP_NULL == op || op != type) {
-          SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op), jobTaskStatusStr(pJob->status));
+          SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op),
+                       jobTaskStatusStr(pJob->status));
         }
         SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
         schDumpJobExecRes(pJob, pReq->pExecRes);
@@ -847,7 +836,8 @@ void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq* pReq, int
         SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
         op = atomic_val_compare_exchange_32(&pJob->opStatus.op, type, SCH_OP_NULL);
         if (SCH_OP_NULL == op || op != type) {
-          SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op), jobTaskStatusStr(pJob->status));
+          SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op),
+                       jobTaskStatusStr(pJob->status));
         }
         SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
       }
@@ -866,7 +856,7 @@ void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq* pReq, int
   SCH_JOB_DLOG("job end %s operation with code %s", schGetOpStr(type), tstrerror(errCode));
 }
 
-int32_t schProcessOnOpBegin(SSchJob* pJob, SCH_OP_TYPE type, SSchedulerReq* pReq) {
+int32_t schProcessOnOpBegin(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq *pReq) {
   int32_t code = 0;
   int8_t  status = SCH_GET_JOB_STATUS(pJob);
 
@@ -947,7 +937,7 @@ void schProcessOnCbEnd(SSchJob *pJob, SSchTask *pTask, int32_t errCode) {
   }
 }
 
-int32_t schProcessOnCbBegin(SSchJob** job, SSchTask** task, uint64_t qId, int64_t rId, uint64_t tId) {
+int32_t schProcessOnCbBegin(SSchJob **job, SSchTask **task, uint64_t qId, int64_t rId, uint64_t tId) {
   int32_t code = 0;
   int8_t  status = 0;
 
@@ -983,6 +973,3 @@ _return:
 
   SCH_RET(code);
 }
-
-
-

source/libs/scheduler/src/schStatus.c

@@ -62,7 +62,7 @@ _return:
 }
 
 int32_t schHandleOpBeginEvent(int64_t jobId, SSchJob** job, SCH_OP_TYPE type, SSchedulerReq* pReq) {
-  SSchJob *pJob = schAcquireJob(jobId);
+  SSchJob* pJob = schAcquireJob(jobId);
   if (NULL == pJob) {
     qWarn("Acquire sch job failed, may be dropped, jobId:0x%" PRIx64, jobId);
     SCH_ERR_RET(TSDB_CODE_SCH_STATUS_ERROR);
@@ -91,5 +91,3 @@ int32_t schHandleOpEndEvent(SSchJob* pJob, SCH_OP_TYPE type, SSchedulerReq* pReq
 
   return code;
 }
-
-

source/libs/scheduler/src/schTask.c

@@ -16,12 +16,12 @@
 #include "catalog.h"
 #include "command.h"
 #include "query.h"
+#include "qworker.h"
 #include "schInt.h"
+#include "tglobal.h"
 #include "tmsg.h"
 #include "tref.h"
 #include "trpc.h"
-#include "qworker.h"
-#include "tglobal.h"
 
 void schFreeTask(SSchJob *pJob, SSchTask *pTask) {
   schDeregisterTaskHb(pJob, pTask);
@@ -166,7 +166,8 @@ int32_t schUpdateTaskHandle(SSchJob *pJob, SSchTask *pTask, bool dropExecNode, v
   schUpdateTaskExecNode(pJob, pTask, handle, execId);
 
   if ((execId != pTask->execId) || pTask->waitRetry) {  // ignore it
-    SCH_TASK_DLOG("handle not updated since execId %d is already not current execId %d, waitRetry %d", execId, pTask->execId, pTask->waitRetry);
+    SCH_TASK_DLOG("handle not updated since execId %d is already not current execId %d, waitRetry %d", execId,
+                  pTask->execId, pTask->waitRetry);
     SCH_ERR_RET(TSDB_CODE_SCH_IGNORE_ERROR);
   }
 
@@ -841,13 +842,14 @@ int32_t schHandleExplainRes(SArray *pExplainRes) {
   SSchJob  *pJob = NULL;
 
   for (int32_t i = 0; i < resNum; ++i) {
-    SExplainLocalRsp* localRsp = taosArrayGet(pExplainRes, i);
+    SExplainLocalRsp *localRsp = taosArrayGet(pExplainRes, i);
 
     qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", begin to handle LOCAL explain rsp msg", localRsp->qId, localRsp->tId);
 
     pJob = schAcquireJob(localRsp->rId);
     if (NULL == pJob) {
-      qWarn("QID:0x%" PRIx64 ",TID:0x%" PRIx64 "job no exist, may be dropped, refId:0x%" PRIx64, localRsp->qId, localRsp->tId, localRsp->rId);
+      qWarn("QID:0x%" PRIx64 ",TID:0x%" PRIx64 "job no exist, may be dropped, refId:0x%" PRIx64, localRsp->qId,
+            localRsp->tId, localRsp->rId);
       SCH_ERR_JRET(TSDB_CODE_QRY_JOB_NOT_EXIST);
     }
 
@@ -866,7 +868,8 @@ int32_t schHandleExplainRes(SArray *pExplainRes) {
 
     schReleaseJob(pJob->refId);
 
-    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", end to handle LOCAL explain rsp msg, code:%x", localRsp->qId, localRsp->tId, code);
+    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", end to handle LOCAL explain rsp msg, code:%x", localRsp->qId,
+           localRsp->tId, code);
 
     SCH_ERR_JRET(code);
 
@@ -879,7 +882,7 @@ int32_t schHandleExplainRes(SArray *pExplainRes) {
 _return:
 
   for (int32_t i = 0; i < resNum; ++i) {
-    SExplainLocalRsp* localRsp = taosArrayGet(pExplainRes, i);
+    SExplainLocalRsp *localRsp = taosArrayGet(pExplainRes, i);
     tFreeSExplainRsp(&localRsp->rsp);
   }
 
@@ -917,7 +920,7 @@ int32_t schLaunchRemoteTask(SSchJob *pJob, SSchTask *pTask) {
 }
 
 int32_t schLaunchLocalTask(SSchJob *pJob, SSchTask *pTask) {
-  //SCH_ERR_JRET(schSetTaskCandidateAddrs(pJob, pTask));
+  // SCH_ERR_JRET(schSetTaskCandidateAddrs(pJob, pTask));
   if (NULL == schMgmt.queryMgmt) {
     SCH_ERR_RET(qWorkerInit(NODE_TYPE_CLIENT, CLIENT_HANDLE, (void **)&schMgmt.queryMgmt, NULL));
   }
@@ -935,7 +938,8 @@ int32_t schLaunchLocalTask(SSchJob *pJob, SSchTask *pTask) {
     explainRes = taosArrayInit(pJob->taskNum, sizeof(SExplainLocalRsp));
   }
 
-  SCH_ERR_RET(qWorkerProcessLocalQuery(schMgmt.queryMgmt, schMgmt.sId, pJob->queryId, pTask->taskId, pJob->refId, pTask->execId, &qwMsg, explainRes));
+  SCH_ERR_RET(qWorkerProcessLocalQuery(schMgmt.queryMgmt, schMgmt.sId, pJob->queryId, pTask->taskId, pJob->refId,
+                                       pTask->execId, &qwMsg, explainRes));
 
   if (SCH_IS_EXPLAIN_JOB(pJob)) {
     SCH_ERR_RET(schHandleExplainRes(explainRes));
@@ -967,8 +971,8 @@ int32_t schLaunchTaskImpl(void *param) {
   pTask->retryTimes++;
   pTask->waitRetry = false;
 
-  SCH_TASK_DLOG("start to launch %s task, execId %d, retry %d", SCH_IS_LOCAL_EXEC_TASK(pJob, pTask) ? "LOCAL" : "REMOTE", 
-                pTask->execId, pTask->retryTimes);
+  SCH_TASK_DLOG("start to launch %s task, execId %d, retry %d",
+                SCH_IS_LOCAL_EXEC_TASK(pJob, pTask) ? "LOCAL" : "REMOTE", pTask->execId, pTask->retryTimes);
 
   SCH_LOG_TASK_START_TS(pTask);
 
@@ -1093,7 +1097,8 @@ int32_t schExecLocalFetch(SSchJob *pJob, SSchTask *pTask) {
     explainRes = taosArrayInit(pJob->taskNum, sizeof(SExplainLocalRsp));
   }
 
-  SCH_ERR_RET(qWorkerProcessLocalFetch(schMgmt.queryMgmt, schMgmt.sId, pJob->queryId, pTask->taskId, pJob->refId, pTask->execId, &pRsp, explainRes));
+  SCH_ERR_RET(qWorkerProcessLocalFetch(schMgmt.queryMgmt, schMgmt.sId, pJob->queryId, pTask->taskId, pJob->refId,
+                                       pTask->execId, &pRsp, explainRes));
 
   if (SCH_IS_EXPLAIN_JOB(pJob)) {
     SCH_ERR_RET(schHandleExplainRes(explainRes));

source/libs/scheduler/src/schUtil.c

@@ -22,7 +22,7 @@
 #include "trpc.h"
 
 FORCE_INLINE SSchJob *schAcquireJob(int64_t refId) {
-  qDebug("sch acquire jobId:0x%"PRIx64, refId); 
+  qDebug("sch acquire jobId:0x%" PRIx64, refId);
   return (SSchJob *)taosAcquireRef(schMgmt.jobRef, refId);
 }
 
@@ -31,11 +31,11 @@ FORCE_INLINE int32_t schReleaseJob(int64_t refId) {
     return TSDB_CODE_SUCCESS;
   }
 
-  qDebug("sch release jobId:0x%"PRIx64, refId); 
+  qDebug("sch release jobId:0x%" PRIx64, refId);
   return taosReleaseRef(schMgmt.jobRef, refId);
 }
 
-char* schGetOpStr(SCH_OP_TYPE type) {
+char *schGetOpStr(SCH_OP_TYPE type) {
   switch (type) {
     case SCH_OP_NULL:
       return "NULL";
@@ -56,13 +56,13 @@ void schFreeHbTrans(SSchHbTrans *pTrans) {
   schFreeRpcCtx(&pTrans->rpcCtx);
 }
 
-void schCleanClusterHb(void* pTrans) {
+void schCleanClusterHb(void *pTrans) {
   SCH_LOCK(SCH_WRITE, &schMgmt.hbLock);
 
   SSchHbTrans *hb = taosHashIterate(schMgmt.hbConnections, NULL);
   while (hb) {
     if (hb->trans.pTrans == pTrans) {
-      SQueryNodeEpId* pEpId = taosHashGetKey(hb, NULL);
+      SQueryNodeEpId *pEpId = taosHashGetKey(hb, NULL);
       schFreeHbTrans(hb);
       taosHashRemove(schMgmt.hbConnections, pEpId, sizeof(SQueryNodeEpId));
     }
@@ -94,7 +94,6 @@ int32_t schRemoveHbConnection(SSchJob *pJob, SSchTask *pTask, SQueryNodeEpId *ep
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schAddHbConnection(SSchJob *pJob, SSchTask *pTask, SQueryNodeEpId *epId, bool *exist) {
   int32_t     code = 0;
   SSchHbTrans hb = {0};
@@ -161,7 +160,7 @@ void schDeregisterTaskHb(SSchJob *pJob, SSchTask *pTask) {
 
   epId.nodeId = addr->nodeId;
 
-  SEp* pEp = SCH_GET_CUR_EP(addr);
+  SEp *pEp = SCH_GET_CUR_EP(addr);
   strcpy(epId.ep.fqdn, pEp->fqdn);
   epId.ep.port = pEp->port;
 
@@ -184,15 +183,13 @@ void schDeregisterTaskHb(SSchJob *pJob, SSchTask *pTask) {
   pTask->registerdHb = false;
 }
 
-
-
 int32_t schEnsureHbConnection(SSchJob *pJob, SSchTask *pTask) {
   SQueryNodeAddr *addr = taosArrayGet(pTask->candidateAddrs, pTask->candidateIdx);
   SQueryNodeEpId  epId = {0};
 
   epId.nodeId = addr->nodeId;
 
-  SEp* pEp = SCH_GET_CUR_EP(addr);
+  SEp *pEp = SCH_GET_CUR_EP(addr);
   strcpy(epId.ep.fqdn, pEp->fqdn);
   epId.ep.port = pEp->port;
 
@@ -226,7 +223,6 @@ int32_t schUpdateHbConnection(SQueryNodeEpId *epId, SSchTrans *trans) {
   return TSDB_CODE_SUCCESS;
 }
 
-
 void schCloseJobRef(void) {
   if (!atomic_load_8((int8_t *)&schMgmt.exit)) {
     return;
@@ -262,7 +258,6 @@ uint64_t schGenUUID(void) {
   return id;
 }
 
-
 void schFreeRpcCtxVal(const void *arg) {
   if (NULL == arg) {
     return;
@@ -307,5 +302,3 @@ int32_t schGetTaskFromList(SHashObj *pTaskList, uint64_t taskId, SSchTask **pTas
 
   return TSDB_CODE_SUCCESS;
 }
-
-

source/libs/scheduler/src/scheduler.c

@@ -14,10 +14,10 @@
  */
 
 #include "query.h"
+#include "qworker.h"
 #include "schInt.h"
 #include "tmsg.h"
 #include "tref.h"
-#include "qworker.h"
 
 SSchedulerMgmt schMgmt = {
     .jobRef = -1,
@@ -144,7 +144,7 @@ int32_t schedulerEnableReSchedule(bool enableResche) {
   return TSDB_CODE_SUCCESS;
 }
 
-void schedulerFreeJob(int64_t* jobId, int32_t errCode) {
+void schedulerFreeJob(int64_t *jobId, int32_t errCode) {
   if (0 == *jobId) {
     return;
   }

source/libs/scheduler/test/schedulerTests.cpp

@@ -30,15 +30,12 @@
 #endif
 #include "os.h"
 
-#include "tglobal.h"
-#include "taos.h"
-#include "tdef.h"
-#include "tvariant.h"
 #include "catalog.h"
 #include "scheduler.h"
 #include "taos.h"
 #include "tdatablock.h"
 #include "tdef.h"
+#include "tglobal.h"
 #include "trpc.h"
 #include "tvariant.h"
 
@@ -56,8 +53,9 @@
 
 namespace {
 
-extern "C" int32_t schHandleResponseMsg(SSchJob *job, SSchTask *task, int32_t msgType, char *msg, int32_t msgSize, int32_t rspCode);
-extern "C" int32_t schHandleCallback(void* param, const SDataBuf* pMsg, int32_t msgType, int32_t rspCode);
+extern "C" int32_t schHandleResponseMsg(SSchJob *job, SSchTask *task, int32_t msgType, char *msg, int32_t msgSize,
+                                        int32_t rspCode);
+extern "C" int32_t schHandleCallback(void *param, const SDataBuf *pMsg, int32_t msgType, int32_t rspCode);
 
 int64_t insertJobRefId = 0;
 int64_t queryJobRefId = 0;
@@ -72,7 +70,6 @@ int32_t schtTestMTRunSec = 10;
 int32_t schtTestPrintNum = 1000;
 int32_t schtStartFetch = 0;
 
-
 void schtInitLogFile() {
   const char   *defaultLogFileNamePrefix = "taoslog";
   const int32_t maxLogFileNum = 10;
@@ -84,23 +81,21 @@ void schtInitLogFile() {
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
     printf("failed to open log file in directory:%s\n", tsLogDir);
   }
-
 }
 
-void schtQueryCb(SExecResult* pResult, void* param, int32_t code) {
+void schtQueryCb(SExecResult *pResult, void *param, int32_t code) {
   assert(TSDB_CODE_SUCCESS == code);
-  *(int32_t*)param = 1;
+  *(int32_t *)param = 1;
 }
 
-
 void schtBuildQueryDag(SQueryPlan *dag) {
   uint64_t qId = schtQueryId;
 
   dag->queryId = qId;
   dag->numOfSubplans = 2;
   dag->pSubplans = nodesMakeList();
-  SNodeListNode *scan = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
-  SNodeListNode *merge = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
+  SNodeListNode *scan = (SNodeListNode *)nodesMakeNode(QUERY_NODE_NODE_LIST);
+  SNodeListNode *merge = (SNodeListNode *)nodesMakeNode(QUERY_NODE_NODE_LIST);
 
   SSubplan *scanPlan = (SSubplan *)taosMemoryCalloc(1, sizeof(SSubplan));
   SSubplan *mergePlan = (SSubplan *)taosMemoryCalloc(1, sizeof(SSubplan));
@@ -117,7 +112,7 @@ void schtBuildQueryDag(SQueryPlan *dag) {
   scanPlan->pChildren = NULL;
   scanPlan->level = 1;
   scanPlan->pParents = nodesMakeList();
-  scanPlan->pNode = (SPhysiNode*)taosMemoryCalloc(1, sizeof(SPhysiNode));
+  scanPlan->pNode = (SPhysiNode *)taosMemoryCalloc(1, sizeof(SPhysiNode));
   scanPlan->msgType = TDMT_SCH_QUERY;
 
   mergePlan->id.queryId = qId;
@@ -129,20 +124,20 @@ void schtBuildQueryDag(SQueryPlan *dag) {
 
   mergePlan->pChildren = nodesMakeList();
   mergePlan->pParents = NULL;
-  mergePlan->pNode = (SPhysiNode*)taosMemoryCalloc(1, sizeof(SPhysiNode));
+  mergePlan->pNode = (SPhysiNode *)taosMemoryCalloc(1, sizeof(SPhysiNode));
   mergePlan->msgType = TDMT_SCH_QUERY;
 
   merge->pNodeList = nodesMakeList();
   scan->pNodeList = nodesMakeList();
 
-  nodesListAppend(merge->pNodeList, (SNode*)mergePlan);
-  nodesListAppend(scan->pNodeList, (SNode*)scanPlan);
+  nodesListAppend(merge->pNodeList, (SNode *)mergePlan);
+  nodesListAppend(scan->pNodeList, (SNode *)scanPlan);
 
-  nodesListAppend(mergePlan->pChildren, (SNode*)scanPlan);
-  nodesListAppend(scanPlan->pParents, (SNode*)mergePlan);
+  nodesListAppend(mergePlan->pChildren, (SNode *)scanPlan);
+  nodesListAppend(scanPlan->pParents, (SNode *)mergePlan);
 
-  nodesListAppend(dag->pSubplans, (SNode*)merge);  
-  nodesListAppend(dag->pSubplans, (SNode*)scan);
+  nodesListAppend(dag->pSubplans, (SNode *)merge);
+  nodesListAppend(dag->pSubplans, (SNode *)scan);
 }
 
 void schtBuildQueryFlowCtrlDag(SQueryPlan *dag) {
@@ -152,8 +147,8 @@ void schtBuildQueryFlowCtrlDag(SQueryPlan *dag) {
   dag->queryId = qId;
   dag->numOfSubplans = 2;
   dag->pSubplans = nodesMakeList();
-  SNodeListNode *scan = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
-  SNodeListNode *merge = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
+  SNodeListNode *scan = (SNodeListNode *)nodesMakeNode(QUERY_NODE_NODE_LIST);
+  SNodeListNode *merge = (SNodeListNode *)nodesMakeNode(QUERY_NODE_NODE_LIST);
 
   SSubplan *scanPlan = (SSubplan *)taosMemoryCalloc(scanPlanNum, sizeof(SSubplan));
   SSubplan *mergePlan = (SSubplan *)taosMemoryCalloc(1, sizeof(SSubplan));
@@ -180,13 +175,13 @@ void schtBuildQueryFlowCtrlDag(SQueryPlan *dag) {
     scanPlan[i].pChildren = NULL;
     scanPlan[i].level = 1;
     scanPlan[i].pParents = nodesMakeList();
-    scanPlan[i].pNode = (SPhysiNode*)taosMemoryCalloc(1, sizeof(SPhysiNode));
+    scanPlan[i].pNode = (SPhysiNode *)taosMemoryCalloc(1, sizeof(SPhysiNode));
     scanPlan[i].msgType = TDMT_SCH_QUERY;
 
-    nodesListAppend(scanPlan[i].pParents, (SNode*)mergePlan);
-    nodesListAppend(mergePlan->pChildren, (SNode*)(scanPlan + i));
+    nodesListAppend(scanPlan[i].pParents, (SNode *)mergePlan);
+    nodesListAppend(mergePlan->pChildren, (SNode *)(scanPlan + i));
 
-    nodesListAppend(scan->pNodeList, (SNode*)(scanPlan + i));
+    nodesListAppend(scan->pNodeList, (SNode *)(scanPlan + i));
   }
 
   mergePlan->id.queryId = qId;
@@ -197,20 +192,16 @@ void schtBuildQueryFlowCtrlDag(SQueryPlan *dag) {
   mergePlan->execNode.epSet.numOfEps = 0;
 
   mergePlan->pParents = NULL;
-  mergePlan->pNode = (SPhysiNode*)taosMemoryCalloc(1, sizeof(SPhysiNode));
+  mergePlan->pNode = (SPhysiNode *)taosMemoryCalloc(1, sizeof(SPhysiNode));
   mergePlan->msgType = TDMT_SCH_QUERY;
 
-  nodesListAppend(merge->pNodeList, (SNode*)mergePlan);
-
-  nodesListAppend(dag->pSubplans, (SNode*)merge);  
-  nodesListAppend(dag->pSubplans, (SNode*)scan);
-}
-
-
-void schtFreeQueryDag(SQueryPlan *dag) {
+  nodesListAppend(merge->pNodeList, (SNode *)mergePlan);
 
+  nodesListAppend(dag->pSubplans, (SNode *)merge);
+  nodesListAppend(dag->pSubplans, (SNode *)scan);
 }
 
+void schtFreeQueryDag(SQueryPlan *dag) {}
 
 void schtBuildInsertDag(SQueryPlan *dag) {
   uint64_t qId = 0x0000000000000002;
@@ -218,7 +209,7 @@ void schtBuildInsertDag(SQueryPlan *dag) {
   dag->queryId = qId;
   dag->numOfSubplans = 2;
   dag->pSubplans = nodesMakeList();
-  SNodeListNode *inserta = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
+  SNodeListNode *inserta = (SNodeListNode *)nodesMakeNode(QUERY_NODE_NODE_LIST);
 
   SSubplan *insertPlan = (SSubplan *)taosMemoryCalloc(2, sizeof(SSubplan));
 
@@ -235,7 +226,7 @@ void schtBuildInsertDag(SQueryPlan *dag) {
   insertPlan[0].pChildren = NULL;
   insertPlan[0].pParents = NULL;
   insertPlan[0].pNode = NULL;
-  insertPlan[0].pDataSink = (SDataSinkNode*)taosMemoryCalloc(1, sizeof(SDataSinkNode));
+  insertPlan[0].pDataSink = (SDataSinkNode *)taosMemoryCalloc(1, sizeof(SDataSinkNode));
   insertPlan[0].msgType = TDMT_VND_SUBMIT;
 
   insertPlan[1].id.queryId = qId;
@@ -251,32 +242,27 @@ void schtBuildInsertDag(SQueryPlan *dag) {
   insertPlan[1].pChildren = NULL;
   insertPlan[1].pParents = NULL;
   insertPlan[1].pNode = NULL;
-  insertPlan[1].pDataSink = (SDataSinkNode*)taosMemoryCalloc(1, sizeof(SDataSinkNode));
+  insertPlan[1].pDataSink = (SDataSinkNode *)taosMemoryCalloc(1, sizeof(SDataSinkNode));
   insertPlan[1].msgType = TDMT_VND_SUBMIT;
 
   inserta->pNodeList = nodesMakeList();
 
-  nodesListAppend(inserta->pNodeList, (SNode*)insertPlan);
+  nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
   insertPlan += 1;
-  nodesListAppend(inserta->pNodeList, (SNode*)insertPlan);
+  nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
 
-  nodesListAppend(dag->pSubplans, (SNode*)inserta);  
+  nodesListAppend(dag->pSubplans, (SNode *)inserta);
 }
 
-
-int32_t schtPlanToString(const SSubplan *subplan, char** str, int32_t* len) {
+int32_t schtPlanToString(const SSubplan *subplan, char **str, int32_t *len) {
   *str = (char *)taosMemoryCalloc(1, 20);
   *len = 20;
   return 0;
 }
 
-void schtExecNode(SSubplan* subplan, uint64_t groupId, SQueryNodeAddr* ep) {
+void schtExecNode(SSubplan *subplan, uint64_t groupId, SQueryNodeAddr *ep) {}
 
-}
-
-void schtRpcSendRequest(void *shandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *pRid) {
-
-}
+void schtRpcSendRequest(void *shandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *pRid) {}
 
 void schtSetPlanToString() {
   static Stub stub;
@@ -284,15 +270,15 @@ void schtSetPlanToString() {
   {
 #ifdef WINDOWS
     AddrAny                       any;
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_func_addr("qSubPlanToString", result);
 #endif
 #ifdef LINUX
     AddrAny                       any("libplanner.so");
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_global_func_addr_dynsym("^qSubPlanToString$", result);
 #endif
-    for (const auto& f : result) {
+    for (const auto &f : result) {
       stub.set(f.second, schtPlanToString);
     }
   }
@@ -304,15 +290,15 @@ void schtSetExecNode() {
   {
 #ifdef WINDOWS
     AddrAny                       any;
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_func_addr("qSetSubplanExecutionNode", result);
 #endif
 #ifdef LINUX
     AddrAny                       any("libplanner.so");
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_global_func_addr_dynsym("^qSetSubplanExecutionNode$", result);
 #endif
-    for (const auto& f : result) {
+    for (const auto &f : result) {
       stub.set(f.second, schtExecNode);
     }
   }
@@ -324,21 +310,21 @@ void schtSetRpcSendRequest() {
   {
 #ifdef WINDOWS
     AddrAny                       any;
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_func_addr("rpcSendRequest", result);
 #endif
 #ifdef LINUX
     AddrAny                       any("libtransport.so");
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_global_func_addr_dynsym("^rpcSendRequest$", result);
 #endif
-    for (const auto& f : result) {
+    for (const auto &f : result) {
       stub.set(f.second, schtRpcSendRequest);
     }
   }
 }
 
-int32_t schtAsyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransporterId, SMsgSendInfo* pInfo) {
+int32_t schtAsyncSendMsgToServer(void *pTransporter, SEpSet *epSet, int64_t *pTransporterId, SMsgSendInfo *pInfo) {
   if (pInfo) {
     taosMemoryFreeClear(pInfo->param);
     taosMemoryFreeClear(pInfo->msgInfo.pData);
@@ -347,28 +333,26 @@ int32_t schtAsyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTr
   return 0;
 }
 
-
 void schtSetAsyncSendMsgToServer() {
   static Stub stub;
   stub.set(asyncSendMsgToServer, schtAsyncSendMsgToServer);
   {
 #ifdef WINDOWS
     AddrAny                       any;
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_func_addr("asyncSendMsgToServer", result);
 #endif
 #ifdef LINUX
     AddrAny                       any("libtransport.so");
-    std::map<std::string,void*> result;
+    std::map<std::string, void *> result;
     any.get_global_func_addr_dynsym("^asyncSendMsgToServer$", result);
 #endif
-    for (const auto& f : result) {
+    for (const auto &f : result) {
       stub.set(f.second, schtAsyncSendMsgToServer);
     }
   }
 }
 
-
 void *schtSendRsp(void *param) {
   SSchJob *pJob = NULL;
   int64_t  job = 0;
@@ -403,7 +387,7 @@ void *schtSendRsp(void *param) {
 
 void *schtCreateFetchRspThread(void *param) {
   int64_t  job = *(int64_t *)param;
-  SSchJob* pJob = schAcquireJob(job);
+  SSchJob *pJob = schAcquireJob(job);
 
   taosSsleep(1);
 
@@ -420,10 +404,9 @@ void *schtCreateFetchRspThread(void *param) {
   return NULL;
 }
 
-
 void *schtFetchRspThread(void *aa) {
   SDataBuf               dataBuf = {0};
-  SSchTaskCallbackParam* param = NULL;
+  SSchTaskCallbackParam *param = NULL;
 
   while (!schtTestStop) {
     if (0 == atomic_val_compare_exchange_32(&schtStartFetch, 1, 0)) {
@@ -466,7 +449,7 @@ void schtFreeQueryJob(int32_t freeThread) {
   }
 }
 
-void* schtRunJobThread(void *aa) {
+void *schtRunJobThread(void *aa) {
   void       *mockPointer = (void *)0x1;
   char       *clusterId = "cluster1";
   char       *dbname = "1.db1";
@@ -476,11 +459,9 @@ void* schtRunJobThread(void *aa) {
 
   schtInitLogFile();
 
-  
   int32_t code = schedulerInit();
   assert(code == 0);
 
-
   schtSetPlanToString();
   schtSetExecNode();
   schtSetAsyncSendMsgToServer();
@@ -573,7 +554,6 @@ void* schtRunJobThread(void *aa) {
       pIter = taosHashIterate(execTasks, pIter);
     }
 
-
     while (true) {
       if (queryDone) {
         break;
@@ -620,7 +600,7 @@ void* schtRunJobThread(void *aa) {
   return NULL;
 }
 
-void* schtFreeJobThread(void *aa) {
+void *schtFreeJobThread(void *aa) {
   while (!schtTestStop) {
     taosUsleep(taosRand() % 100);
     schtFreeQueryJob(1);
@@ -628,8 +608,7 @@ void* schtFreeJobThread(void *aa) {
   return NULL;
 }
 
-
-}
+}  // namespace
 
 TEST(queryTest, normalCase) {
   void       *mockPointer = (void *)0x1;
@@ -673,7 +652,6 @@ TEST(queryTest, normalCase) {
   code = schedulerExecJob(&req, &job);
   ASSERT_EQ(code, 0);
 
-  
   SSchJob *pJob = schAcquireJob(job);
 
   void *pIter = taosHashIterate(pJob->execTasks, NULL);
@@ -779,7 +757,6 @@ TEST(queryTest, readyFirstCase) {
   code = schedulerExecJob(&req, &job);
   ASSERT_EQ(code, 0);
 
-  
   SSchJob *pJob = schAcquireJob(job);
 
   void *pIter = taosHashIterate(pJob->execTasks, NULL);
@@ -812,7 +789,6 @@ TEST(queryTest, readyFirstCase) {
     taosUsleep(10000);
   }
 
-
   TdThreadAttr thattr;
   taosThreadAttrInit(&thattr);
 
@@ -844,8 +820,6 @@ TEST(queryTest, readyFirstCase) {
   schedulerDestroy();
 }
 
-
-
 TEST(queryTest, flowCtrlCase) {
   void       *mockPointer = (void *)0x1;
   char       *clusterId = "cluster1";
@@ -889,7 +863,6 @@ TEST(queryTest, flowCtrlCase) {
   code = schedulerExecJob(&req, &job);
   ASSERT_EQ(code, 0);
 
-  
   SSchJob *pJob = schAcquireJob(job);
 
   bool qDone = false;
@@ -958,7 +931,6 @@ TEST(queryTest, flowCtrlCase) {
   schedulerDestroy();
 }
 
-
 TEST(insertTest, normalCase) {
   void       *mockPointer = (void *)0x1;
   char       *clusterId = "cluster1";
@@ -1032,7 +1004,7 @@ TEST(multiThread, forceFree) {
   taosSsleep(3);
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char **argv) {
   taosSeedRand(taosGetTimestampSec());
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

tools/scripts/codeFormat.sh

@@ -12,25 +12,7 @@ FORMAT_DIR_LIST=(
     "${PRJ_ROOT_DIR}/source/os"
     "${PRJ_ROOT_DIR}/source/util"
     "${PRJ_ROOT_DIR}/source/common"
-    "${PRJ_ROOT_DIR}/source/libs/cache"
-    "${PRJ_ROOT_DIR}/source/libs/catalog"
-    "${PRJ_ROOT_DIR}/source/libs/command"
-    "${PRJ_ROOT_DIR}/source/libs/executor"
-    "${PRJ_ROOT_DIR}/source/libs/function"
-    "${PRJ_ROOT_DIR}/source/libs/index"
-    "${PRJ_ROOT_DIR}/source/libs/monitor"
-    "${PRJ_ROOT_DIR}/source/libs/nodes"
-    # "${PRJ_ROOT_DIR}/source/libs/parser"
-    "${PRJ_ROOT_DIR}/source/libs/planner"
-    "${PRJ_ROOT_DIR}/source/libs/qcom"
-    "${PRJ_ROOT_DIR}/source/libs/qworker"
-    "${PRJ_ROOT_DIR}/source/libs/scalar"
-    "${PRJ_ROOT_DIR}/source/libs/stream"
-    "${PRJ_ROOT_DIR}/source/libs/sync"
-    "${PRJ_ROOT_DIR}/source/libs/tdb"
-    "${PRJ_ROOT_DIR}/source/libs/tfs"
-    "${PRJ_ROOT_DIR}/source/libs/transport"
-    "${PRJ_ROOT_DIR}/source/libs/wal"
+    "${PRJ_ROOT_DIR}/source/libs"
     "${PRJ_ROOT_DIR}/source/client/inc"
     "${PRJ_ROOT_DIR}/source/client/src"
     "${PRJ_ROOT_DIR}/source/client/test"
@@ -45,7 +27,7 @@ EXCLUDE_FILE_LIST=(
 )
 
 for d in ${FORMAT_DIR_LIST[@]}; do
-    for f in $(find $d -type f -regex '.*\.\(cpp\|hpp\|c\|h\)'); do
+    for f in $(find $d -type f -not -name '*sql.c' -regex '.*\.\(cpp\|hpp\|c\|h\)'); do
         ${FORMAT_BIN} -i $f
     done
 done