From 1bf581db49cea7cfb1c67dfcb577ecdd81936e63 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 2 Sep 2024 16:28:43 +0800 Subject: [PATCH 01/38] fix: add block decode check --- source/common/src/tdatablock.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 8e50c943b9..718763e063 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3036,6 +3036,11 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos // total rows sizeof(int32_t) int32_t numOfRows = *(int32_t*)pStart; pStart += sizeof(int32_t); + if (numOfRows <= 0) { + uError("block decode numOfRows:%d error", numOfRows); + terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; + return terrno; + } // total columns sizeof(int32_t) int32_t numOfCols = *(int32_t*)pStart; @@ -3084,8 +3089,9 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos for (int32_t i = 0; i < numOfCols; ++i) { colLen[i] = htonl(colLen[i]); - if (colLen[i] < 0) { + if (colLen[i] <= 0) { uError("block decode colLen:%d error, colIdx:%d", colLen[i], i); + ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return terrno; } From 4e6781d7531ba5ac9648a2cb9e3f66aff0c2ba04 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 2 Sep 2024 16:50:30 +0800 Subject: [PATCH 02/38] fix: add encode debug info --- source/common/src/tdatablock.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 718763e063..8cf7094fc3 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3009,6 +3009,13 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) { data += colSizes[col]; } + if (colSizes[col] <= 0) { + uError("Invalid colSize:%d while encoding block", colSizes[col]); + ASSERT(0); + terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; + return -1; + } + colSizes[col] = htonl(colSizes[col]); // uError("blockEncode col bytes:%d, type:%d, size:%d, htonl size:%d", pColRes->info.bytes, pColRes->info.type, // htonl(colSizes[col]), colSizes[col]); From 24eb6c439bc33a8d2fe556cc60f0c050d809031b Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 2 Sep 2024 17:18:40 +0800 Subject: [PATCH 03/38] fix: add validation --- source/common/src/tdatablock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 8cf7094fc3..d970b7ab88 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3009,7 +3009,7 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) { data += colSizes[col]; } - if (colSizes[col] <= 0) { + if (colSizes[col] <= 0 && !colDataIsNull_s(pColRes, 0)) { uError("Invalid colSize:%d while encoding block", colSizes[col]); ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; From ebcb1e0c3617cdd5a40485add68daa69c66ce809 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 2 Sep 2024 17:27:43 +0800 Subject: [PATCH 04/38] fix: correct validation --- source/common/src/tdatablock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index d970b7ab88..0bfff81d46 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3096,7 +3096,7 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos for (int32_t i = 0; i < numOfCols; ++i) { colLen[i] = htonl(colLen[i]); - if (colLen[i] <= 0) { + if (colLen[i] < 0) { uError("block decode colLen:%d error, colIdx:%d", colLen[i], i); ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; @@ -3130,6 +3130,11 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos if (colLen[i] > 0) { memcpy(pColInfoData->pData, pStart, colLen[i]); + } else if (!colDataIsNull_s(pColInfoData, 0)) { + uError("block decode colLen:%d error, colIdx:%d", colLen[i], i); + ASSERT(0); + terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; + return terrno; } // TODO From cd04e9e39dbd2a6aa84e2232e813c1b398504b70 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 2 Sep 2024 18:52:11 +0800 Subject: [PATCH 05/38] fix: downstream free issue --- source/libs/executor/src/mergejoinoperator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/executor/src/mergejoinoperator.c b/source/libs/executor/src/mergejoinoperator.c index 14f3a08e17..30cc596a44 100644 --- a/source/libs/executor/src/mergejoinoperator.c +++ b/source/libs/executor/src/mergejoinoperator.c @@ -1919,10 +1919,10 @@ _return: if (pInfo != NULL) { destroyMergeJoinOperator(pInfo); } + destroyOperatorAndDownstreams(pOperator, pDownstream, oldNum); if (newDownstreams) { taosMemoryFree(pDownstream); } - destroyOperatorAndDownstreams(pOperator, pDownstream, oldNum); pTaskInfo->code = code; return code; From b939a9daab7b2cd05e12a29ccd0c4560116094ce Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Tue, 3 Sep 2024 08:35:24 +0800 Subject: [PATCH 06/38] fix: return code issue --- source/libs/executor/src/scanoperator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index 7c016d8c2a..45b4fd544a 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -4541,6 +4541,7 @@ static int32_t tagScanFillResultBlock(SOperatorInfo* pOperator, SSDataBlock* pRe SColumnInfoData* pDst = taosArrayGet(pRes->pDataBlock, pExprInfo[j].base.resSchema.slotId); QUERY_CHECK_NULL(pDst, code, lino, _end, terrno); code = tagScanFillOneCellWithTag(pOperator, pUidTagInfo, &pExprInfo[j], pDst, i, pAPI, pInfo->readHandle.vnode); + QUERY_CHECK_CODE(code, lino, _end); } } } From a72c0c2bd2c4a8eeb02598391f04e8eee25ff2bb Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 2 Sep 2024 16:49:47 +0800 Subject: [PATCH 07/38] fix(tsdb): init merge if get the initial pschema failed. --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 101 ++++++++++-------------- 1 file changed, 40 insertions(+), 61 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index b7bfd045d1..cecc52c51c 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -1734,14 +1734,35 @@ static bool isCleanFileDataBlock(STsdbReader* pReader, SFileDataBlockInfo* pBloc return isCleanFileBlock; } +static int32_t initRowMergeIfNeeded(STsdbReader* pReader, int64_t uid) { + SRowMerger* pMerger = &pReader->status.merger; + int32_t code = 0; + + if (pMerger->pArray == NULL) { + STSchema* ps = getTableSchemaImpl(pReader, uid); + if (ps == NULL) { + return terrno; + } + + code = tsdbRowMergerInit(pMerger, ps); + } + + return code; +} + static int32_t buildDataBlockFromBuf(STsdbReader* pReader, STableBlockScanInfo* pBlockScanInfo, int64_t endKey) { if (!(pBlockScanInfo->iiter.hasVal || pBlockScanInfo->iter.hasVal)) { return TSDB_CODE_SUCCESS; } + int32_t code = initRowMergeIfNeeded(pReader, pBlockScanInfo->uid); + if (code != 0) { + return code; + } + int64_t st = taosGetTimestampUs(); SSDataBlock* pBlock = pReader->resBlockInfo.pResBlock; - int32_t code = buildDataBlockFromBufImpl(pBlockScanInfo, endKey, pReader->resBlockInfo.capacity, pReader); + code = buildDataBlockFromBufImpl(pBlockScanInfo, endKey, pReader->resBlockInfo.capacity, pReader); double el = (taosGetTimestampUs() - st) / 1000.0; updateComposedBlockInfo(pReader, el, pBlockScanInfo); @@ -1943,19 +1964,9 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* TSDBROW fRow = tsdbRowFromBlockData(pBlockData, pDumpInfo->rowIndex); // merge is not initialized yet, due to the fact that the pReader->info.pSchema is not initialized - if (pMerger->pArray == NULL) { - if (pReader->info.pSchema != NULL) { - tsdbError("tsdb failed at %s:%d", __func__, __LINE__); - return TSDB_CODE_INTERNAL_ERROR; - } - STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); - if (ps == NULL) { - return terrno; - } - int32_t code = tsdbRowMergerInit(pMerger, ps); - if (code != TSDB_CODE_SUCCESS) { - return code; - } + int32_t code = initRowMergeIfNeeded(pReader, pBlockScanInfo->uid); + if (code != 0) { + return code; } SRowKey minKey = k; @@ -1983,7 +1994,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* // file block ---> stt block -----> mem if (pkCompEx(&minKey, pfKey) == 0) { - int32_t code = tsdbRowMergerAdd(pMerger, &fRow, NULL); + code = tsdbRowMergerAdd(pMerger, &fRow, NULL); if (code != TSDB_CODE_SUCCESS) { return code; } @@ -1996,7 +2007,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* if (pkCompEx(&minKey, pSttKey) == 0) { TSDBROW* fRow1 = tMergeTreeGetRow(&pSttBlockReader->mergeTree); - int32_t code = tsdbRowMergerAdd(pMerger, fRow1, NULL); + code = tsdbRowMergerAdd(pMerger, fRow1, NULL); if (code != TSDB_CODE_SUCCESS) { return code; } @@ -2007,7 +2018,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* } if (pkCompEx(&minKey, &k) == 0) { - int32_t code = tsdbRowMergerAdd(pMerger, pRow, pSchema); + code = tsdbRowMergerAdd(pMerger, pRow, pSchema); if (code != TSDB_CODE_SUCCESS) { return code; } @@ -2018,7 +2029,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* } } - int32_t code = tsdbRowMergerGetRow(pMerger, &pTSRow); + code = tsdbRowMergerGetRow(pMerger, &pTSRow); if (code != TSDB_CODE_SUCCESS) { return code; } @@ -2039,19 +2050,9 @@ static int32_t mergeFileBlockAndSttBlock(STsdbReader* pReader, SSttBlockReader* int32_t pkSrcSlot = pReader->suppInfo.pkSrcSlot; // merge is not initialized yet, due to the fact that the pReader->info.pSchema is not initialized - if (pMerger->pArray == NULL) { - if (pReader->info.pSchema) { - tsdbError("tsdb failed at %s %d", __func__, __LINE__); - return TSDB_CODE_INTERNAL_ERROR; - } - STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); - if (ps == NULL) { - return terrno; - } - code = tsdbRowMergerInit(pMerger, ps); - if (code != TSDB_CODE_SUCCESS) { - return code; - } + code = initRowMergeIfNeeded(pReader, pBlockScanInfo->uid); + if (code != 0) { + return code; } bool dataInDataFile = hasDataInFileBlock(pBlockData, pDumpInfo); @@ -2175,20 +2176,9 @@ static int32_t doMergeMultiLevelRows(STsdbReader* pReader, STableBlockScanInfo* } // merge is not initialized yet, due to the fact that the pReader->info.pSchema is not initialized - if (pMerger->pArray == NULL) { - if (pReader->info.pSchema != NULL) { - tsdbError("tsdb read failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_INTERNAL_ERROR; - } - STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); - if (ps == NULL) { - return terrno; - } - - code = tsdbRowMergerInit(pMerger, ps); - if (code != TSDB_CODE_SUCCESS) { - return code; - } + code = initRowMergeIfNeeded(pReader, pBlockScanInfo->uid); + if (code != 0) { + return code; } SRowKey minKey = k; @@ -2579,20 +2569,9 @@ int32_t mergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pBloc } // merge is not initialized yet, due to the fact that the pReader->info.pSchema is not initialized - if (pMerger->pArray == NULL) { - if (pReader->info.pSchema != NULL) { - tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_INTERNAL_ERROR; - } - STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); - if (ps == NULL) { - return terrno; - } - - code = tsdbRowMergerInit(pMerger, ps); - if (code != TSDB_CODE_SUCCESS) { - return code; - } + code = initRowMergeIfNeeded(pReader, pBlockScanInfo->uid); + if (code != 0) { + return code; } tRowKeyAssign(&pBlockScanInfo->lastProcKey, pKey); @@ -4770,13 +4749,13 @@ int32_t tsdbReaderOpen2(void* pVnode, SQueryTableDataCond* pCond, void* pTableLi if (pCond->suid != 0) { pReader->info.pSchema = metaGetTbTSchema(pReader->pTsdb->pVnode->pMeta, pReader->info.suid, -1, 1); if (pReader->info.pSchema == NULL) { - tsdbError("failed to get table schema, suid:%" PRIu64 ", ver:-1, %s", pReader->info.suid, pReader->idStr); + tsdbWarn("failed to get table schema, suid:%" PRIu64 ", ver:-1, %s", pReader->info.suid, pReader->idStr); } } else if (numOfTables > 0) { STableKeyInfo* pKey = pTableList; pReader->info.pSchema = metaGetTbTSchema(pReader->pTsdb->pVnode->pMeta, pKey->uid, -1, 1); if (pReader->info.pSchema == NULL) { - tsdbError("failed to get table schema, uid:%" PRIu64 ", ver:-1, %s", pKey->uid, pReader->idStr); + tsdbWarn("failed to get table schema, uid:%" PRIu64 ", ver:-1, %s", pKey->uid, pReader->idStr); } } From e9c7c33a1a8eb78355f4b012339b467b31117bbe Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Tue, 3 Sep 2024 09:55:45 +0800 Subject: [PATCH 08/38] fix: remove debug assert --- source/common/src/tdatablock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 0bfff81d46..5dbe01d8ba 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3009,9 +3009,8 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) { data += colSizes[col]; } - if (colSizes[col] <= 0 && !colDataIsNull_s(pColRes, 0)) { - uError("Invalid colSize:%d while encoding block", colSizes[col]); - ASSERT(0); + if (colSizes[col] <= 0 && !colDataIsNull_s(pColRes, 0) && pColRes->info.type != TSDB_DATA_TYPE_NULL) { + uError("Invalid colSize:%d colIdx:%d colType:%d while encoding block", colSizes[col], col, pColRes->info.type); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return -1; } @@ -3098,7 +3097,6 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos colLen[i] = htonl(colLen[i]); if (colLen[i] < 0) { uError("block decode colLen:%d error, colIdx:%d", colLen[i], i); - ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return terrno; } @@ -3130,9 +3128,8 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos if (colLen[i] > 0) { memcpy(pColInfoData->pData, pStart, colLen[i]); - } else if (!colDataIsNull_s(pColInfoData, 0)) { - uError("block decode colLen:%d error, colIdx:%d", colLen[i], i); - ASSERT(0); + } else if (!colDataIsNull_s(pColInfoData, 0) && pColInfoData->info.type != TSDB_DATA_TYPE_NULL) { + uError("block decode colLen:%d error, colIdx:%d, type:%d", colLen[i], i, pColInfoData->info.type); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return terrno; } From d3518fbc89b964232828dd0a2d052d34d3555557 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Tue, 3 Sep 2024 15:24:33 +0800 Subject: [PATCH 09/38] fix:TD-31587:Repeated insert performance degradation --- include/libs/monitorfw/taos_counter.h | 3 ++ source/dnode/mgmt/mgmt_dnode/inc/dmInt.h | 1 + source/dnode/mgmt/mgmt_dnode/src/dmInt.c | 1 + source/dnode/mgmt/mgmt_dnode/src/dmWorker.c | 1 + source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 24 ++++++++++++ source/dnode/mgmt/node_mgmt/inc/dmMgmt.h | 1 + source/dnode/mgmt/node_mgmt/inc/dmNodes.h | 2 + source/dnode/mgmt/node_mgmt/src/dmEnv.c | 1 + source/dnode/mgmt/node_mgmt/src/dmMonitor.c | 18 +++++++++ source/dnode/mgmt/node_util/inc/dmUtil.h | 2 + .../monitorfw/inc/taos_metric_formatter_i.h | 1 + source/libs/monitorfw/src/taos_counter.c | 38 +++++++++++++++++++ .../monitorfw/src/taos_metric_formatter.c | 15 ++++++++ 13 files changed, 108 insertions(+) diff --git a/include/libs/monitorfw/taos_counter.h b/include/libs/monitorfw/taos_counter.h index 28a9eed41c..1fdb6f7f7a 100644 --- a/include/libs/monitorfw/taos_counter.h +++ b/include/libs/monitorfw/taos_counter.h @@ -99,4 +99,7 @@ int taos_counter_inc(taos_counter_t *self, const char **label_values); */ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_values); +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids); +int taos_counter_get_keys_size(taos_counter_t *self); +int taos_counter_delete(taos_counter_t *self, char *key); #endif // TAOS_COUNTER_H diff --git a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h index be9ff56674..5a55af24b1 100644 --- a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h +++ b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h @@ -37,6 +37,7 @@ typedef struct SDnodeMgmt { ProcessAlterNodeTypeFp processAlterNodeTypeFp; ProcessDropNodeFp processDropNodeFp; SendMonitorReportFp sendMonitorReportFp; + MonitorCleanExpiredSamplesFp monitorCleanExpiredSamplesFp; SendAuditRecordsFp sendAuditRecordsFp; GetVnodeLoadsFp getVnodeLoadsFp; GetVnodeLoadsFp getVnodeLoadsLiteFp; diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c index 958b411881..d7170398fb 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c @@ -65,6 +65,7 @@ static int32_t dmOpenMgmt(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) { pMgmt->processAlterNodeTypeFp = pInput->processAlterNodeTypeFp; pMgmt->processDropNodeFp = pInput->processDropNodeFp; pMgmt->sendMonitorReportFp = pInput->sendMonitorReportFp; + pMgmt->monitorCleanExpiredSamplesFp = pInput->monitorCleanExpiredSamplesFp; pMgmt->sendAuditRecordsFp = pInput->sendAuditRecordFp; pMgmt->getVnodeLoadsFp = pInput->getVnodeLoadsFp; pMgmt->getVnodeLoadsLiteFp = pInput->getVnodeLoadsLiteFp; diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c index aeb519596d..4cfadc8f59 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c @@ -168,6 +168,7 @@ static void *dmMonitorThreadFp(void *param) { float interval = (curTime - lastTime) / 1000.0f; if (interval >= tsMonitorInterval) { (*pMgmt->sendMonitorReportFp)(); + (*pMgmt->monitorCleanExpiredSamplesFp)(); lastTime = curTime; trimCount = (trimCount + 1) % TRIM_FREQ; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 4cb6c5c724..685a35d9ff 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -15,6 +15,9 @@ #define _DEFAULT_SOURCE #include "vmInt.h" +#include "taos_monitor.h" + +extern taos_counter_t *tsInsertCounter; void vmGetVnodeLoads(SVnodeMgmt *pMgmt, SMonVloadInfo *pInfo, bool isReset) { pInfo->pVloads = taosArrayInit(pMgmt->state.totalVnodes, sizeof(SVnodeLoad)); @@ -117,6 +120,27 @@ void vmGetMonitorInfo(SVnodeMgmt *pMgmt, SMonVmInfo *pInfo) { taosArrayDestroy(pVloads); } +int vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { + int list_size = taos_counter_get_keys_size(tsInsertCounter); + if (list_size == 0) return 0; + int32_t *vgroup_ids; + char **keys; + taos_counter_get_vgroup_ids(tsInsertCounter,&keys,&vgroup_ids); + int r = 0; + (void)taosThreadRwlockWrlock(&pMgmt->lock); + for (int i = 0; ihash, &vgroup_id, sizeof(int32_t)); + if (vnode == NULL) { + r = taos_counter_delete(tsInsertCounter, keys[i]); + } + } + (void)taosThreadRwlockUnlock(&pMgmt->lock); + taosMemoryFree(vgroup_ids); + taosMemoryFree(keys); + return r; +} + static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) { memcpy(pCfg, &vnodeCfgDefault, sizeof(SVnodeCfg)); diff --git a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h index 9548d0cad9..5196987f28 100644 --- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h +++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h @@ -128,6 +128,7 @@ int32_t dmProcessNodeMsg(SMgmtWrapper *pWrapper, SRpcMsg *pMsg); // dmMonitor.c void dmSendMonitorReport(); +void dmMonitorCleanExpiredSamples(); void dmSendAuditRecords(); void dmGetVnodeLoads(SMonVloadInfo *pInfo); void dmGetVnodeLoadsLite(SMonVloadInfo *pInfo); diff --git a/source/dnode/mgmt/node_mgmt/inc/dmNodes.h b/source/dnode/mgmt/node_mgmt/inc/dmNodes.h index 7d635c6bdc..c0ef92b537 100644 --- a/source/dnode/mgmt/node_mgmt/inc/dmNodes.h +++ b/source/dnode/mgmt/node_mgmt/inc/dmNodes.h @@ -39,6 +39,8 @@ void vmGetVnodeLoadsLite(void *pMgmt, SMonVloadInfo *pInfo); void mmGetMnodeLoads(void *pMgmt, SMonMloadInfo *pInfo); void qmGetQnodeLoads(void *pMgmt, SQnodeLoad *pInfo); +int vmCleanExpriedSamples(void *pMgmt); + #ifdef __cplusplus } #endif diff --git a/source/dnode/mgmt/node_mgmt/src/dmEnv.c b/source/dnode/mgmt/node_mgmt/src/dmEnv.c index 0a75847d96..620aed709f 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c +++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c @@ -409,6 +409,7 @@ SMgmtInputOpt dmBuildMgmtInputOpt(SMgmtWrapper *pWrapper) { .processAlterNodeTypeFp = dmProcessAlterNodeTypeReq, .processDropNodeFp = dmProcessDropNodeReq, .sendMonitorReportFp = dmSendMonitorReport, + .monitorCleanExpiredSamplesFp = dmMonitorCleanExpiredSamples, .sendAuditRecordFp = auditSendRecordsInBatch, .getVnodeLoadsFp = dmGetVnodeLoads, .getVnodeLoadsLiteFp = dmGetVnodeLoadsLite, diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c index d3197282b6..a2658b26cb 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c @@ -52,6 +52,16 @@ static void dmGetDmMonitorInfo(SDnode *pDnode) { monSetDmInfo(&dmInfo); } +int dmCleanExpriedSamples(SDnode *pDnode) { + SMgmtWrapper *pWrapper = &pDnode->wrappers[VNODE]; + if (dmMarkWrapper(pWrapper) == 0) { + if (pWrapper->pMgmt != NULL) { + return vmCleanExpriedSamples(pWrapper->pMgmt); + } + } + return 0; +} + static void dmGetDmMonitorInfoBasic(SDnode *pDnode) { SMonDmInfo dmInfo = {0}; dmGetMonitorBasicInfoBasic(pDnode, &dmInfo.basic); @@ -123,6 +133,14 @@ void dmSendMonitorReport() { monGenAndSendReport(); } +void dmMonitorCleanExpiredSamples() { + if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; + dTrace("send monitor report to %s:%u", tsMonitorFqdn, tsMonitorPort); + + SDnode *pDnode = dmInstance(); + (void)dmCleanExpriedSamples(pDnode); +} + //Todo: put this in seperate file in the future void dmSendAuditRecords() { auditSendRecordsInBatch(); diff --git a/source/dnode/mgmt/node_util/inc/dmUtil.h b/source/dnode/mgmt/node_util/inc/dmUtil.h index 4ad4ea7c30..a66b8d7b67 100644 --- a/source/dnode/mgmt/node_util/inc/dmUtil.h +++ b/source/dnode/mgmt/node_util/inc/dmUtil.h @@ -116,6 +116,7 @@ typedef enum { typedef int32_t (*ProcessCreateNodeFp)(EDndNodeType ntype, SRpcMsg *pMsg); typedef int32_t (*ProcessDropNodeFp)(EDndNodeType ntype, SRpcMsg *pMsg); typedef void (*SendMonitorReportFp)(); +typedef void (*MonitorCleanExpiredSamplesFp)(); typedef void (*SendAuditRecordsFp)(); typedef void (*GetVnodeLoadsFp)(SMonVloadInfo *pInfo); typedef void (*GetMnodeLoadsFp)(SMonMloadInfo *pInfo); @@ -155,6 +156,7 @@ typedef struct { ProcessAlterNodeTypeFp processAlterNodeTypeFp; ProcessDropNodeFp processDropNodeFp; SendMonitorReportFp sendMonitorReportFp; + MonitorCleanExpiredSamplesFp monitorCleanExpiredSamplesFp; SendAuditRecordsFp sendAuditRecordFp; GetVnodeLoadsFp getVnodeLoadsFp; GetVnodeLoadsFp getVnodeLoadsLiteFp; diff --git a/source/libs/monitorfw/inc/taos_metric_formatter_i.h b/source/libs/monitorfw/inc/taos_metric_formatter_i.h index ab60359f4a..dee25f4c06 100644 --- a/source/libs/monitorfw/inc/taos_metric_formatter_i.h +++ b/source/libs/monitorfw/inc/taos_metric_formatter_i.h @@ -80,4 +80,5 @@ int taos_metric_formatter_clear(taos_metric_formatter_t *self); */ char *taos_metric_formatter_dump(taos_metric_formatter_t *metric_formatter); +int32_t taos_metric_formatter_get_vgroup_id(char *key); #endif // TAOS_METRIC_FORMATTER_I_H diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index ef7d41cf2c..c01322295d 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -27,6 +27,7 @@ #include "taos_metric_sample_i.h" #include "taos_metric_sample_t.h" #include "taos_metric_t.h" +#include "taos_metric_formatter_i.h" taos_counter_t *taos_counter_new(const char *name, const char *help, size_t label_key_count, const char **label_keys) { return (taos_counter_t *)taos_metric_new(TAOS_COUNTER, name, help, label_key_count, label_keys); @@ -64,3 +65,40 @@ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_va if (sample == NULL) return 1; return taos_metric_sample_add(sample, r_value); } + +int taos_counter_get_keys_size(taos_counter_t *self) { + return self->samples->keys->size; +} + +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids) { + TAOS_TEST_PARA(self != NULL); + if (self == NULL) return 1; + if (self->type != TAOS_COUNTER) { + TAOS_LOG(TAOS_METRIC_INCORRECT_TYPE); + return 1; + } + if (self->samples == NULL) return 1; + taos_linked_list_t *key_list = self->samples->keys; + int r = 0; + *vgroup_ids = (int32_t *)taos_malloc(key_list->size*sizeof(int32_t)); + *keys = (char **)taos_malloc(key_list->size*sizeof(char *)); + int index = 0; + for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL;current_key = current_key->next) { + char *key = (char *)current_key->item; + int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key); + (*vgroup_ids)[index] = vgroup_id; + (*keys)[index] = key; + index++; + } + return r; +} + +int taos_counter_delete(taos_counter_t *self, char *key) { + TAOS_TEST_PARA(self != NULL); + if (self == NULL) return 1; + if (self->type != TAOS_COUNTER) { + TAOS_LOG(TAOS_METRIC_INCORRECT_TYPE); + return 1; + } + return taos_map_delete(self->samples, key); +} \ No newline at end of file diff --git a/source/libs/monitorfw/src/taos_metric_formatter.c b/source/libs/monitorfw/src/taos_metric_formatter.c index a20a8d919c..1d5925f565 100644 --- a/source/libs/monitorfw/src/taos_metric_formatter.c +++ b/source/libs/monitorfw/src/taos_metric_formatter.c @@ -156,6 +156,21 @@ int taos_metric_formatter_load_l_value(taos_metric_formatter_t *self, const char } return 0; } +int32_t taos_metric_formatter_get_vgroup_id(char *key) { + char *start,*end; + char vgroupid[10]; + start = strstr(key, "vgroup_id=\""); + if (start) { + start += strlen("vgroup_id=\""); + end = strchr(start, '\"'); + if (end) { + strncpy(vgroupid, start, end - start); + vgroupid[end - start] = '\0'; + } + return strtol(vgroupid, NULL, 10); + } + return 0; +} /* int taos_metric_formatter_load_sample(taos_metric_formatter_t *self, taos_metric_sample_t *sample, char *ts, char *format) { From 81615362c3a93fa802f75ec4716eab1d2f2bbaa0 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Tue, 3 Sep 2024 16:25:40 +0800 Subject: [PATCH 10/38] format --- include/libs/monitorfw/taos_counter.h | 2 +- source/dnode/mgmt/mgmt_dnode/inc/dmInt.h | 40 +++++++++---------- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 18 ++++----- source/dnode/mgmt/node_mgmt/src/dmMonitor.c | 12 +++--- source/dnode/mgmt/node_util/inc/dmUtil.h | 30 +++++++------- .../monitorfw/inc/taos_metric_formatter_i.h | 4 +- source/libs/monitorfw/src/taos_counter.c | 22 +++++----- .../monitorfw/src/taos_metric_formatter.c | 24 +++++------ 8 files changed, 74 insertions(+), 78 deletions(-) diff --git a/include/libs/monitorfw/taos_counter.h b/include/libs/monitorfw/taos_counter.h index 1fdb6f7f7a..816d8ea7b9 100644 --- a/include/libs/monitorfw/taos_counter.h +++ b/include/libs/monitorfw/taos_counter.h @@ -99,7 +99,7 @@ int taos_counter_inc(taos_counter_t *self, const char **label_values); */ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_values); -int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids); +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids); int taos_counter_get_keys_size(taos_counter_t *self); int taos_counter_delete(taos_counter_t *self, char *key); #endif // TAOS_COUNTER_H diff --git a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h index 5a55af24b1..18b3f66a60 100644 --- a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h +++ b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h @@ -23,27 +23,27 @@ extern "C" { #endif typedef struct SDnodeMgmt { - SDnodeData *pData; - SMsgCb msgCb; - const char *path; - const char *name; - TdThread statusThread; - TdThread notifyThread; - TdThread monitorThread; - TdThread auditThread; - TdThread crashReportThread; - SSingleWorker mgmtWorker; - ProcessCreateNodeFp processCreateNodeFp; - ProcessAlterNodeTypeFp processAlterNodeTypeFp; - ProcessDropNodeFp processDropNodeFp; - SendMonitorReportFp sendMonitorReportFp; + SDnodeData *pData; + SMsgCb msgCb; + const char *path; + const char *name; + TdThread statusThread; + TdThread notifyThread; + TdThread monitorThread; + TdThread auditThread; + TdThread crashReportThread; + SSingleWorker mgmtWorker; + ProcessCreateNodeFp processCreateNodeFp; + ProcessAlterNodeTypeFp processAlterNodeTypeFp; + ProcessDropNodeFp processDropNodeFp; + SendMonitorReportFp sendMonitorReportFp; MonitorCleanExpiredSamplesFp monitorCleanExpiredSamplesFp; - SendAuditRecordsFp sendAuditRecordsFp; - GetVnodeLoadsFp getVnodeLoadsFp; - GetVnodeLoadsFp getVnodeLoadsLiteFp; - GetMnodeLoadsFp getMnodeLoadsFp; - GetQnodeLoadsFp getQnodeLoadsFp; - int32_t statusSeq; + SendAuditRecordsFp sendAuditRecordsFp; + GetVnodeLoadsFp getVnodeLoadsFp; + GetVnodeLoadsFp getVnodeLoadsLiteFp; + GetMnodeLoadsFp getMnodeLoadsFp; + GetQnodeLoadsFp getQnodeLoadsFp; + int32_t statusSeq; } SDnodeMgmt; // dmHandle.c diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 685a35d9ff..8ec51b637b 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -14,8 +14,8 @@ */ #define _DEFAULT_SOURCE -#include "vmInt.h" #include "taos_monitor.h" +#include "vmInt.h" extern taos_counter_t *tsInsertCounter; @@ -124,16 +124,16 @@ int vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { int list_size = taos_counter_get_keys_size(tsInsertCounter); if (list_size == 0) return 0; int32_t *vgroup_ids; - char **keys; - taos_counter_get_vgroup_ids(tsInsertCounter,&keys,&vgroup_ids); + char **keys; + taos_counter_get_vgroup_ids(tsInsertCounter, &keys, &vgroup_ids); int r = 0; (void)taosThreadRwlockWrlock(&pMgmt->lock); - for (int i = 0; ihash, &vgroup_id, sizeof(int32_t)); - if (vnode == NULL) { - r = taos_counter_delete(tsInsertCounter, keys[i]); - } + for (int i = 0; i < list_size; i++) { + int32_t vgroup_id = vgroup_ids[i]; + void *vnode = taosHashGet(pMgmt->hash, &vgroup_id, sizeof(int32_t)); + if (vnode == NULL) { + r = taos_counter_delete(tsInsertCounter, keys[i]); + } } (void)taosThreadRwlockUnlock(&pMgmt->lock); taosMemoryFree(vgroup_ids); diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c index a2658b26cb..61cdd5a272 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c @@ -14,9 +14,9 @@ */ #define _DEFAULT_SOURCE +#include "audit.h" #include "dmMgmt.h" #include "dmNodes.h" -#include "audit.h" static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) { pInfo->protocol = 1; @@ -33,8 +33,8 @@ static void dmGetMonitorBasicInfoBasic(SDnode *pDnode, SMonBasicInfo *pInfo) { } static void dmGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) { - //pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / (86400000.0f); - pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) /1000.0f; + // pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / (86400000.0f); + pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / 1000.0f; pInfo->has_mnode = pDnode->wrappers[MNODE].required; pInfo->has_qnode = pDnode->wrappers[QNODE].required; pInfo->has_snode = pDnode->wrappers[SNODE].required; @@ -141,10 +141,8 @@ void dmMonitorCleanExpiredSamples() { (void)dmCleanExpriedSamples(pDnode); } -//Todo: put this in seperate file in the future -void dmSendAuditRecords() { - auditSendRecordsInBatch(); -} +// Todo: put this in seperate file in the future +void dmSendAuditRecords() { auditSendRecordsInBatch(); } void dmGetVnodeLoads(SMonVloadInfo *pInfo) { SDnode *pDnode = dmInstance(); diff --git a/source/dnode/mgmt/node_util/inc/dmUtil.h b/source/dnode/mgmt/node_util/inc/dmUtil.h index a66b8d7b67..425f10392f 100644 --- a/source/dnode/mgmt/node_util/inc/dmUtil.h +++ b/source/dnode/mgmt/node_util/inc/dmUtil.h @@ -147,22 +147,22 @@ typedef struct { } SDnodeData; typedef struct { - const char *path; - const char *name; - STfs *pTfs; - SDnodeData *pData; - SMsgCb msgCb; - ProcessCreateNodeFp processCreateNodeFp; - ProcessAlterNodeTypeFp processAlterNodeTypeFp; - ProcessDropNodeFp processDropNodeFp; - SendMonitorReportFp sendMonitorReportFp; + const char *path; + const char *name; + STfs *pTfs; + SDnodeData *pData; + SMsgCb msgCb; + ProcessCreateNodeFp processCreateNodeFp; + ProcessAlterNodeTypeFp processAlterNodeTypeFp; + ProcessDropNodeFp processDropNodeFp; + SendMonitorReportFp sendMonitorReportFp; MonitorCleanExpiredSamplesFp monitorCleanExpiredSamplesFp; - SendAuditRecordsFp sendAuditRecordFp; - GetVnodeLoadsFp getVnodeLoadsFp; - GetVnodeLoadsFp getVnodeLoadsLiteFp; - GetMnodeLoadsFp getMnodeLoadsFp; - GetQnodeLoadsFp getQnodeLoadsFp; - StopDnodeFp stopDnodeFp; + SendAuditRecordsFp sendAuditRecordFp; + GetVnodeLoadsFp getVnodeLoadsFp; + GetVnodeLoadsFp getVnodeLoadsLiteFp; + GetMnodeLoadsFp getMnodeLoadsFp; + GetQnodeLoadsFp getQnodeLoadsFp; + StopDnodeFp stopDnodeFp; } SMgmtInputOpt; typedef struct { diff --git a/source/libs/monitorfw/inc/taos_metric_formatter_i.h b/source/libs/monitorfw/inc/taos_metric_formatter_i.h index dee25f4c06..5c330b50e7 100644 --- a/source/libs/monitorfw/inc/taos_metric_formatter_i.h +++ b/source/libs/monitorfw/inc/taos_metric_formatter_i.h @@ -57,8 +57,8 @@ int taos_metric_formatter_load_l_value(taos_metric_formatter_t *metric_formatter /** * @brief API PRIVATE Loads the formatter with a metric sample */ -int taos_metric_formatter_load_sample(taos_metric_formatter_t *metric_formatter, taos_metric_sample_t *sample, - char *ts, char *format); +int taos_metric_formatter_load_sample(taos_metric_formatter_t *metric_formatter, taos_metric_sample_t *sample, char *ts, + char *format); /** * @brief API PRIVATE Loads a metric in the string exposition format diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index c01322295d..84e29b5f93 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -20,14 +20,14 @@ #include "taos_alloc.h" // Private -#include "taos_test.h" #include "taos_errors.h" #include "taos_log.h" +#include "taos_metric_formatter_i.h" #include "taos_metric_i.h" #include "taos_metric_sample_i.h" #include "taos_metric_sample_t.h" #include "taos_metric_t.h" -#include "taos_metric_formatter_i.h" +#include "taos_test.h" taos_counter_t *taos_counter_new(const char *name, const char *help, size_t label_key_count, const char **label_keys) { return (taos_counter_t *)taos_metric_new(TAOS_COUNTER, name, help, label_key_count, label_keys); @@ -66,11 +66,9 @@ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_va return taos_metric_sample_add(sample, r_value); } -int taos_counter_get_keys_size(taos_counter_t *self) { - return self->samples->keys->size; -} +int taos_counter_get_keys_size(taos_counter_t *self) { return self->samples->keys->size; } -int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids) { +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids) { TAOS_TEST_PARA(self != NULL); if (self == NULL) return 1; if (self->type != TAOS_COUNTER) { @@ -79,12 +77,12 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgr } if (self->samples == NULL) return 1; taos_linked_list_t *key_list = self->samples->keys; - int r = 0; - *vgroup_ids = (int32_t *)taos_malloc(key_list->size*sizeof(int32_t)); - *keys = (char **)taos_malloc(key_list->size*sizeof(char *)); + int r = 0; + *vgroup_ids = (int32_t *)taos_malloc(key_list->size * sizeof(int32_t)); + *keys = (char **)taos_malloc(key_list->size * sizeof(char *)); int index = 0; - for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL;current_key = current_key->next) { - char *key = (char *)current_key->item; + for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) { + char *key = (char *)current_key->item; int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key); (*vgroup_ids)[index] = vgroup_id; (*keys)[index] = key; @@ -100,5 +98,5 @@ int taos_counter_delete(taos_counter_t *self, char *key) { TAOS_LOG(TAOS_METRIC_INCORRECT_TYPE); return 1; } - return taos_map_delete(self->samples, key); + return taos_map_delete(self->samples, key); } \ No newline at end of file diff --git a/source/libs/monitorfw/src/taos_metric_formatter.c b/source/libs/monitorfw/src/taos_metric_formatter.c index 1d5925f565..cb1edd30b6 100644 --- a/source/libs/monitorfw/src/taos_metric_formatter.c +++ b/source/libs/monitorfw/src/taos_metric_formatter.c @@ -157,19 +157,19 @@ int taos_metric_formatter_load_l_value(taos_metric_formatter_t *self, const char return 0; } int32_t taos_metric_formatter_get_vgroup_id(char *key) { - char *start,*end; - char vgroupid[10]; - start = strstr(key, "vgroup_id=\""); - if (start) { - start += strlen("vgroup_id=\""); - end = strchr(start, '\"'); - if (end) { - strncpy(vgroupid, start, end - start); - vgroupid[end - start] = '\0'; - } - return strtol(vgroupid, NULL, 10); + char *start, *end; + char vgroupid[10]; + start = strstr(key, "vgroup_id=\""); + if (start) { + start += strlen("vgroup_id=\""); + end = strchr(start, '\"'); + if (end) { + strncpy(vgroupid, start, end - start); + vgroupid[end - start] = '\0'; } - return 0; + return strtol(vgroupid, NULL, 10); + } + return 0; } /* int taos_metric_formatter_load_sample(taos_metric_formatter_t *self, taos_metric_sample_t *sample, From d6955fd2bd6179aafb6549dfbc10a8ad63a25585 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Tue, 3 Sep 2024 17:15:32 +0800 Subject: [PATCH 11/38] fix: column decode has null issue --- source/common/src/tdatablock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 5dbe01d8ba..816bf3a757 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3126,6 +3126,11 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos pStart += BitmapLen(numOfRows); } + // TODO + // setting this flag to true temporarily so aggregate function on stable will + // examine NULL value for non-primary key column + pColInfoData->hasNull = true; + if (colLen[i] > 0) { memcpy(pColInfoData->pData, pStart, colLen[i]); } else if (!colDataIsNull_s(pColInfoData, 0) && pColInfoData->info.type != TSDB_DATA_TYPE_NULL) { @@ -3134,10 +3139,6 @@ int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos return terrno; } - // TODO - // setting this flag to true temporarily so aggregate function on stable will - // examine NULL value for non-primary key column - pColInfoData->hasNull = true; pStart += colLen[i]; } From 97bcdfb86c27c2f7e536079b8d57f64f0aa8620a Mon Sep 17 00:00:00 2001 From: xiao77 Date: Tue, 3 Sep 2024 20:09:06 +0800 Subject: [PATCH 12/38] resolve comments --- include/libs/monitorfw/taos_counter.h | 2 +- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 20 ++++++++++++++------ source/dnode/mgmt/node_mgmt/inc/dmNodes.h | 2 +- source/dnode/mgmt/node_mgmt/src/dmMonitor.c | 13 +++++++------ source/libs/monitorfw/src/taos_counter.c | 11 +++++++---- 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/include/libs/monitorfw/taos_counter.h b/include/libs/monitorfw/taos_counter.h index 816d8ea7b9..910f6e1aed 100644 --- a/include/libs/monitorfw/taos_counter.h +++ b/include/libs/monitorfw/taos_counter.h @@ -99,7 +99,7 @@ int taos_counter_inc(taos_counter_t *self, const char **label_values); */ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_values); -int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids); +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids, int *list_size); int taos_counter_get_keys_size(taos_counter_t *self); int taos_counter_delete(taos_counter_t *self, char *key); #endif // TAOS_COUNTER_H diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 8ec51b637b..cf0f38243e 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -120,25 +120,33 @@ void vmGetMonitorInfo(SVnodeMgmt *pMgmt, SMonVmInfo *pInfo) { taosArrayDestroy(pVloads); } -int vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { +void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { int list_size = taos_counter_get_keys_size(tsInsertCounter); - if (list_size == 0) return 0; + if (list_size == 0) return; int32_t *vgroup_ids; char **keys; - taos_counter_get_vgroup_ids(tsInsertCounter, &keys, &vgroup_ids); - int r = 0; - (void)taosThreadRwlockWrlock(&pMgmt->lock); + int r = 0; + r = taos_counter_get_vgroup_ids(tsInsertCounter, &keys, &vgroup_ids, &list_size); + if (r) { + dError("failed to get vgroup ids"); + return; + } + (void)taosThreadRwlockRdlock(&pMgmt->lock); for (int i = 0; i < list_size; i++) { int32_t vgroup_id = vgroup_ids[i]; void *vnode = taosHashGet(pMgmt->hash, &vgroup_id, sizeof(int32_t)); if (vnode == NULL) { r = taos_counter_delete(tsInsertCounter, keys[i]); + if (r) { + dError("failed to delete key:%s", keys[i]); + return; + } } } (void)taosThreadRwlockUnlock(&pMgmt->lock); taosMemoryFree(vgroup_ids); taosMemoryFree(keys); - return r; + return; } static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) { diff --git a/source/dnode/mgmt/node_mgmt/inc/dmNodes.h b/source/dnode/mgmt/node_mgmt/inc/dmNodes.h index c0ef92b537..2561a13b92 100644 --- a/source/dnode/mgmt/node_mgmt/inc/dmNodes.h +++ b/source/dnode/mgmt/node_mgmt/inc/dmNodes.h @@ -39,7 +39,7 @@ void vmGetVnodeLoadsLite(void *pMgmt, SMonVloadInfo *pInfo); void mmGetMnodeLoads(void *pMgmt, SMonMloadInfo *pInfo); void qmGetQnodeLoads(void *pMgmt, SQnodeLoad *pInfo); -int vmCleanExpriedSamples(void *pMgmt); +void vmCleanExpriedSamples(void *pMgmt); #ifdef __cplusplus } diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c index 61cdd5a272..68a851569c 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c @@ -14,9 +14,9 @@ */ #define _DEFAULT_SOURCE -#include "audit.h" #include "dmMgmt.h" #include "dmNodes.h" +#include "audit.h" static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) { pInfo->protocol = 1; @@ -52,14 +52,15 @@ static void dmGetDmMonitorInfo(SDnode *pDnode) { monSetDmInfo(&dmInfo); } -int dmCleanExpriedSamples(SDnode *pDnode) { +void dmCleanExpriedSamples(SDnode *pDnode) { SMgmtWrapper *pWrapper = &pDnode->wrappers[VNODE]; if (dmMarkWrapper(pWrapper) == 0) { if (pWrapper->pMgmt != NULL) { - return vmCleanExpriedSamples(pWrapper->pMgmt); + vmCleanExpriedSamples(pWrapper->pMgmt); } } - return 0; + dmReleaseWrapper(pWrapper); + return; } static void dmGetDmMonitorInfoBasic(SDnode *pDnode) { @@ -134,8 +135,8 @@ void dmSendMonitorReport() { } void dmMonitorCleanExpiredSamples() { - if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; - dTrace("send monitor report to %s:%u", tsMonitorFqdn, tsMonitorPort); + if (!tsEnableMonitor) return; + dTrace("clean monitor expired samples"); SDnode *pDnode = dmInstance(); (void)dmCleanExpriedSamples(pDnode); diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index 84e29b5f93..829a05aa4e 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -68,7 +68,7 @@ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_va int taos_counter_get_keys_size(taos_counter_t *self) { return self->samples->keys->size; } -int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids) { +int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids, int *list_size) { TAOS_TEST_PARA(self != NULL); if (self == NULL) return 1; if (self->type != TAOS_COUNTER) { @@ -77,9 +77,12 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg } if (self->samples == NULL) return 1; taos_linked_list_t *key_list = self->samples->keys; - int r = 0; - *vgroup_ids = (int32_t *)taos_malloc(key_list->size * sizeof(int32_t)); - *keys = (char **)taos_malloc(key_list->size * sizeof(char *)); + *list_size = key_list->size; + int r = 0; + *vgroup_ids = (int32_t *)taos_malloc(*list_size * sizeof(int32_t)); + if (vgroup_ids == NULL) return 1; + *keys = (char **)taos_malloc(*list_size * sizeof(char *)); + if (keys == NULL) return 1; int index = 0; for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) { char *key = (char *)current_key->item; From 6497290926f7e9ca8d9668be46a212abb81ca415 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Tue, 3 Sep 2024 20:22:26 +0800 Subject: [PATCH 13/38] add rd lock while range keys --- source/libs/monitorfw/src/taos_counter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index 829a05aa4e..be5e1f781f 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -84,6 +84,7 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg *keys = (char **)taos_malloc(*list_size * sizeof(char *)); if (keys == NULL) return 1; int index = 0; + pthread_rwlock_rdlock(self->rwlock); for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) { char *key = (char *)current_key->item; int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key); @@ -91,6 +92,7 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg (*keys)[index] = key; index++; } + pthread_rwlock_unlock(self->rwlock); return r; } From 2eb1f9522491bdf4b5d6cd54bc4046802a10d482 Mon Sep 17 00:00:00 2001 From: Jing Sima Date: Wed, 4 Sep 2024 11:33:13 +0800 Subject: [PATCH 14/38] fix:[TS-5349] fix wrong dbFName setted in mndPerfsInitMeta. --- source/dnode/mnode/impl/src/mndPerfSchema.c | 2 +- source/libs/qcom/src/querymsg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndPerfSchema.c b/source/dnode/mnode/impl/src/mndPerfSchema.c index 8ff9f8f27e..da5e201c05 100644 --- a/source/dnode/mnode/impl/src/mndPerfSchema.c +++ b/source/dnode/mnode/impl/src/mndPerfSchema.c @@ -42,7 +42,7 @@ int32_t mndPerfsInitMeta(SHashObj *hash) { int32_t code = 0; STableMetaRsp meta = {0}; - tstrncpy(meta.dbFName, TSDB_INFORMATION_SCHEMA_DB, sizeof(meta.dbFName)); + tstrncpy(meta.dbFName, TSDB_PERFORMANCE_SCHEMA_DB, sizeof(meta.dbFName)); meta.tableType = TSDB_SYSTEM_TABLE; meta.sversion = 1; meta.tversion = 1; diff --git a/source/libs/qcom/src/querymsg.c b/source/libs/qcom/src/querymsg.c index 207bd91bd9..b5b660a51b 100644 --- a/source/libs/qcom/src/querymsg.c +++ b/source/libs/qcom/src/querymsg.c @@ -574,7 +574,7 @@ int32_t queryProcessTableMetaRsp(void *output, char *msg, int32_t msgSize) { goto PROCESS_META_OVER; } - if (0 != strcmp(metaRsp.dbFName, TSDB_INFORMATION_SCHEMA_DB) && + if (!IS_SYS_DBNAME(metaRsp.dbFName) && !tIsValidSchema(metaRsp.pSchemas, metaRsp.numOfColumns, metaRsp.numOfTags)) { code = TSDB_CODE_TSC_INVALID_VALUE; goto PROCESS_META_OVER; From 87130db0e47d6a924c207eae7be0cf4e85512e7c Mon Sep 17 00:00:00 2001 From: Jing Sima Date: Wed, 4 Sep 2024 17:42:57 +0800 Subject: [PATCH 15/38] fix:[TD-31889] extend result buf size for percentile function to handle large double value. --- source/libs/function/src/builtins.c | 2 +- source/libs/function/src/builtinsimpl.c | 3 ++- tests/system-test/2-query/percentile.py | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c index 17ba430150..f7a6585800 100644 --- a/source/libs/function/src/builtins.c +++ b/source/libs/function/src/builtins.c @@ -678,7 +678,7 @@ static int32_t translatePercentile(SFunctionNode* pFunc, char* pErrBuf, int32_t // set result type if (numOfParams > 2) { - pFunc->node.resType = (SDataType){.bytes = 512, .type = TSDB_DATA_TYPE_VARCHAR}; + pFunc->node.resType = (SDataType){.bytes = 3200, .type = TSDB_DATA_TYPE_VARCHAR}; } else { pFunc->node.resType = (SDataType){.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes, .type = TSDB_DATA_TYPE_DOUBLE}; } diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index 84ab103456..2f75774149 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -2105,7 +2105,8 @@ int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) { tMemBucket* pMemBucket = ppInfo->pMemBucket; if (pMemBucket != NULL && pMemBucket->total > 0) { // check for null if (pCtx->numOfParams > 2) { - char buf[512] = {0}; + char buf[3200] = {0}; + // max length of double num is 317, e.g. use %.6lf to print -1.0e+308, consider the comma and bracket, 3200 is enough. size_t len = 1; varDataVal(buf)[0] = '['; diff --git a/tests/system-test/2-query/percentile.py b/tests/system-test/2-query/percentile.py index e01aae97c0..46fff0201e 100644 --- a/tests/system-test/2-query/percentile.py +++ b/tests/system-test/2-query/percentile.py @@ -124,6 +124,9 @@ class TDTestCase: tdSql.query(f'select percentile(col1, 9.9, 19.9, 29.9, 39.9, 49.9, 59.9, 69.9, 79.9, 89.9, 99.9) from {self.ntbname}') tdSql.checkData(0, 0, '[0.891000, 1.791000, 2.691000, 3.591000, 4.491000, 5.391000, 6.291000, 7.191000, 8.091000, 8.991000]') + tdSql.query(f'select percentile(col1 * 1e+200, 9.9, 19.9, 29.9, 39.9, 49.9, 59.9, 69.9, 79.9, 89.9, 99.9) from {self.ntbname}') + tdSql.checkRows(1); + tdSql.error(f'select percentile(col1) from {self.ntbname}') tdSql.error(f'select percentile(col1, -1) from {self.ntbname}') tdSql.error(f'select percentile(col1, 101) from {self.ntbname}') @@ -166,6 +169,9 @@ class TDTestCase: tdSql.query(f'select percentile(col1, 9.9, 19.9, 29.9, 39.9, 49.9, 59.9, 69.9, 79.9, 89.9, 99.9) from {self.stbname}_0') tdSql.checkData(0, 0, '[0.891000, 1.791000, 2.691000, 3.591000, 4.491000, 5.391000, 6.291000, 7.191000, 8.091000, 8.991000]') + tdSql.query(f'select percentile(col1 * 1e+200, 9.9, 19.9, 29.9, 39.9, 49.9, 59.9, 69.9, 79.9, 89.9, 99.9) from {self.stbname}_0') + tdSql.checkRows(1); + tdSql.error(f'select percentile(col1) from {self.stbname}_0') tdSql.error(f'select percentile(col1, -1) from {self.stbname}_0') tdSql.error(f'select percentile(col1, 101) from {self.stbname}_0') From 8a8ba407ba4cf53866103467891b2cfb0a46a2b0 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 11:01:38 +0800 Subject: [PATCH 16/38] fix ci --- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 3 +-- source/dnode/mgmt/node_mgmt/src/dmMonitor.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index cf0f38243e..35b25cb85a 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -138,8 +138,7 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { if (vnode == NULL) { r = taos_counter_delete(tsInsertCounter, keys[i]); if (r) { - dError("failed to delete key:%s", keys[i]); - return; + dError("failed to delete monitor sample key:%s", keys[i]); } } } diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c index 68a851569c..ce0b2b59e0 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c @@ -135,7 +135,7 @@ void dmSendMonitorReport() { } void dmMonitorCleanExpiredSamples() { - if (!tsEnableMonitor) return; + if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; dTrace("clean monitor expired samples"); SDnode *pDnode = dmInstance(); From e4f8485697731bd514217f38bb04781e8a7865df Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 11:12:50 +0800 Subject: [PATCH 17/38] fix thread mutex unlock and mem free --- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 4 ++-- source/libs/monitorfw/src/taos_counter.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 35b25cb85a..2abf292e73 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -143,8 +143,8 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) { } } (void)taosThreadRwlockUnlock(&pMgmt->lock); - taosMemoryFree(vgroup_ids); - taosMemoryFree(keys); + if (vgroup_ids) taosMemoryFree(vgroup_ids); + if (keys) taosMemoryFree(keys); return; } diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index be5e1f781f..e60e5a5f3f 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -76,15 +76,21 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg return 1; } if (self->samples == NULL) return 1; + pthread_rwlock_rdlock(self->rwlock); taos_linked_list_t *key_list = self->samples->keys; *list_size = key_list->size; int r = 0; *vgroup_ids = (int32_t *)taos_malloc(*list_size * sizeof(int32_t)); - if (vgroup_ids == NULL) return 1; + if (vgroup_ids == NULL) { + pthread_rwlock_unlock(self->rwlock); + return 1; + } *keys = (char **)taos_malloc(*list_size * sizeof(char *)); - if (keys == NULL) return 1; + if (keys == NULL) { + pthread_rwlock_unlock(self->rwlock); + return 1; + } int index = 0; - pthread_rwlock_rdlock(self->rwlock); for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) { char *key = (char *)current_key->item; int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key); From cbb1186e03a353d0db134a564452577b0dcd3b05 Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 5 Sep 2024 04:00:49 +0000 Subject: [PATCH 18/38] fix/TD-31891-remove-void-sdb --- source/dnode/mnode/sdb/src/sdb.c | 6 +++++- source/dnode/mnode/sdb/src/sdbFile.c | 29 +++++++++++++++++++++------- source/dnode/mnode/sdb/src/sdbHash.c | 8 ++++---- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/source/dnode/mnode/sdb/src/sdb.c b/source/dnode/mnode/sdb/src/sdb.c index 7244f2d7c9..576ba736b5 100644 --- a/source/dnode/mnode/sdb/src/sdb.c +++ b/source/dnode/mnode/sdb/src/sdb.c @@ -68,7 +68,11 @@ SSdb *sdbInit(SSdbOpt *pOption) { void sdbCleanup(SSdb *pSdb) { mInfo("start to cleanup sdb"); - (void)sdbWriteFile(pSdb, 0); + int32_t code = 0; + + if ((code = sdbWriteFile(pSdb, 0)) != 0) { + mError("failed to write sdb file since %s", tstrerror(code)); + } if (pSdb->currDir != NULL) { taosMemoryFreeClear(pSdb->currDir); diff --git a/source/dnode/mnode/sdb/src/sdbFile.c b/source/dnode/mnode/sdb/src/sdbFile.c index dec37bfbf1..cdd238904b 100644 --- a/source/dnode/mnode/sdb/src/sdbFile.c +++ b/source/dnode/mnode/sdb/src/sdbFile.c @@ -258,8 +258,11 @@ static int32_t sdbReadFileImp(SSdb *pSdb) { if (code != 0) { mError("failed to read sdb file:%s head since %s", file, tstrerror(code)); taosMemoryFree(pRaw); - (void)taosCloseFile(&pFile); - return -1; + int32_t ret = 0; + if ((ret = taosCloseFile(&pFile)) != 0) { + mError("failed to close sdb file:%s since %s", file, tstrerror(ret)); + } + return code; } int64_t tableVer[SDB_MAX] = {0}; @@ -361,7 +364,10 @@ static int32_t sdbReadFileImp(SSdb *pSdb) { pSdb->commitTerm, pSdb->commitConfig); _OVER: - (void)taosCloseFile(&pFile); + int32_t ret = 0; + if ((ret = taosCloseFile(&pFile)) != 0) { + mError("failed to close sdb file:%s since %s", file, tstrerror(ret)); + } sdbFreeRaw(pRaw); TAOS_RETURN(code); @@ -404,8 +410,11 @@ static int32_t sdbWriteFileImp(SSdb *pSdb, int32_t skip_type) { code = sdbWriteFileHead(pSdb, pFile); if (code != 0) { mError("failed to write sdb file:%s head since %s", tmpfile, tstrerror(code)); - (void)taosCloseFile(&pFile); - return -1; + int32_t ret = 0; + if ((ret = taosCloseFile(&pFile)) != 0) { + mError("failed to close sdb file:%s since %s", tmpfile, tstrerror(ret)); + } + return code; } for (int32_t i = SDB_MAX - 1; i >= 0; --i) { @@ -613,12 +622,18 @@ static void sdbCloseIter(SSdbIter *pIter) { if (pIter == NULL) return; if (pIter->file != NULL) { - (void)taosCloseFile(&pIter->file); + int32_t ret = 0; + if ((ret = taosCloseFile(&pIter->file)) != 0) { + mError("failed to close sdb file since %s", tstrerror(ret)); + } pIter->file = NULL; } if (pIter->name != NULL) { - (void)taosRemoveFile(pIter->name); + int32_t ret = 0; + if ((ret = taosRemoveFile(pIter->name)) != 0) { + mError("failed to remove sdb file:%s since %s", pIter->name, tstrerror(ret)); + } taosMemoryFree(pIter->name); pIter->name = NULL; } diff --git a/source/dnode/mnode/sdb/src/sdbHash.c b/source/dnode/mnode/sdb/src/sdbHash.c index 0e41e0732f..5a2d1c981c 100644 --- a/source/dnode/mnode/sdb/src/sdbHash.c +++ b/source/dnode/mnode/sdb/src/sdbHash.c @@ -174,12 +174,12 @@ static int32_t sdbInsertRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow * if (insertFp != NULL) { code = (*insertFp)(pSdb, pRow->pObj); if (code != 0) { - if (terrno == 0) terrno = TSDB_CODE_MND_TRANS_UNKNOW_ERROR; - code = terrno; - (void)taosHashRemove(hash, pRow->pObj, keySize); + if (taosHashRemove(hash, pRow->pObj, keySize) != 0) { + mError("failed to remove row from hash"); + } sdbFreeRow(pSdb, pRow, false); - terrno = code; sdbUnLock(pSdb, type); + terrno = code; return terrno; } } From ab2477510b479f892ff68611de7e14ff03fc37fa Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 13:38:51 +0800 Subject: [PATCH 19/38] thread lock result --- source/libs/monitorfw/src/taos_counter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/libs/monitorfw/src/taos_counter.c b/source/libs/monitorfw/src/taos_counter.c index e60e5a5f3f..096d19c190 100644 --- a/source/libs/monitorfw/src/taos_counter.c +++ b/source/libs/monitorfw/src/taos_counter.c @@ -76,18 +76,18 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg return 1; } if (self->samples == NULL) return 1; - pthread_rwlock_rdlock(self->rwlock); + (void)pthread_rwlock_rdlock(self->rwlock); taos_linked_list_t *key_list = self->samples->keys; *list_size = key_list->size; int r = 0; *vgroup_ids = (int32_t *)taos_malloc(*list_size * sizeof(int32_t)); if (vgroup_ids == NULL) { - pthread_rwlock_unlock(self->rwlock); + (void)pthread_rwlock_unlock(self->rwlock); return 1; } *keys = (char **)taos_malloc(*list_size * sizeof(char *)); if (keys == NULL) { - pthread_rwlock_unlock(self->rwlock); + (void)pthread_rwlock_unlock(self->rwlock); return 1; } int index = 0; @@ -98,7 +98,7 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg (*keys)[index] = key; index++; } - pthread_rwlock_unlock(self->rwlock); + (void)pthread_rwlock_unlock(self->rwlock); return r; } From 5e4c610142cd181db7d0d6e7d5055ce523e52498 Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 5 Sep 2024 05:55:46 +0000 Subject: [PATCH 20/38] fix/TD-31891-fix-case --- source/dnode/mnode/sdb/src/sdbFile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/dnode/mnode/sdb/src/sdbFile.c b/source/dnode/mnode/sdb/src/sdbFile.c index cdd238904b..94826405dc 100644 --- a/source/dnode/mnode/sdb/src/sdbFile.c +++ b/source/dnode/mnode/sdb/src/sdbFile.c @@ -364,7 +364,6 @@ static int32_t sdbReadFileImp(SSdb *pSdb) { pSdb->commitTerm, pSdb->commitConfig); _OVER: - int32_t ret = 0; if ((ret = taosCloseFile(&pFile)) != 0) { mError("failed to close sdb file:%s since %s", file, tstrerror(ret)); } From 9e3b093d001d6150b2bb136320ac7d0007a89407 Mon Sep 17 00:00:00 2001 From: Jing Sima Date: Thu, 5 Sep 2024 14:01:18 +0800 Subject: [PATCH 21/38] fix:[TD-31921] Free memory when error occurs in filterExecute. --- source/libs/scalar/src/filter.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 382b83012d..696222784e 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -5238,22 +5238,20 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, *pResultStatus = FILTER_RESULT_ALL_QUALIFIED; return TSDB_CODE_SUCCESS; } - + int32_t code = TSDB_CODE_SUCCESS; SScalarParam output = {0}; SDataType type = {.type = TSDB_DATA_TYPE_BOOL, .bytes = sizeof(bool)}; - int32_t code = sclCreateColumnInfoData(&type, pSrc->info.rows, &output); - if (code != TSDB_CODE_SUCCESS) { - return code; - } + FLT_ERR_JRET(sclCreateColumnInfoData(&type, pSrc->info.rows, &output)); if (info->scalarMode) { SArray *pList = taosArrayInit(1, POINTER_BYTES); if (NULL == pList) { - FLT_ERR_RET(terrno); + FLT_ERR_JRET(terrno); } if (NULL == taosArrayPush(pList, &pSrc)) { - FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + taosArrayDestroy(pList); + FLT_ERR_JRET(terrno); } code = scalarCalculate(info->sclCtx.node, pList, &output); @@ -5261,7 +5259,7 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, *p = output.columnData; - FLT_ERR_RET(code); + FLT_ERR_JRET(code); if (output.numOfQualified == output.numOfRows) { *pResultStatus = FILTER_RESULT_ALL_QUALIFIED; @@ -5277,11 +5275,12 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, output.numOfRows = pSrc->info.rows; if (*p == NULL) { - return TSDB_CODE_APP_ERROR; + fltError("filterExecute failed, column data is NULL"); + FLT_ERR_JRET(TSDB_CODE_APP_ERROR); } bool keepAll = false; - FLT_ERR_RET((info->func)(info, pSrc->info.rows, *p, statis, numOfCols, &output.numOfQualified, &keepAll)); + FLT_ERR_JRET((info->func)(info, pSrc->info.rows, *p, statis, numOfCols, &output.numOfQualified, &keepAll)); // todo this should be return during filter procedure if (keepAll) { @@ -5304,6 +5303,10 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, } return TSDB_CODE_SUCCESS; +_return: + sclFreeParam(&output); + *p = NULL; + return code; } typedef struct SClassifyConditionCxt { From 2e3e5d0a9913580a16f070396da2b896b6fdf52b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 5 Sep 2024 14:40:14 +0800 Subject: [PATCH 22/38] fix mem leak --- source/client/src/clientImpl.c | 8 ++--- source/client/src/clientMain.c | 28 ++++++++-------- source/client/src/clientMonitor.c | 39 +++++++++++----------- source/client/src/clientTmq.c | 28 +++++++--------- source/libs/executor/src/dataInserter.c | 27 +++++++-------- source/libs/executor/src/sysscanoperator.c | 9 +++-- 6 files changed, 68 insertions(+), 71 deletions(-) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index 78ff40bb4f..ca0e3cb998 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -339,8 +339,8 @@ int32_t execDdlQuery(SRequestObj* pRequest, SQuery* pQuery) { STscObj* pTscObj = pRequest->pTscObj; SMsgSendInfo* pSendMsg = buildMsgInfoImpl(pRequest); - int64_t transporterId = 0; - TSC_ERR_RET(asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &pMsgInfo->epSet, &transporterId, pSendMsg)); + // int64_t transporterId = 0; + TSC_ERR_RET(asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &pMsgInfo->epSet, NULL, pSendMsg)); (void)tsem_wait(&pRequest->body.rspSem); return TSDB_CODE_SUCCESS; } @@ -396,8 +396,8 @@ int32_t asyncExecDdlQuery(SRequestObj* pRequest, SQuery* pQuery) { SAppInstInfo* pAppInfo = getAppInfo(pRequest); SMsgSendInfo* pSendMsg = buildMsgInfoImpl(pRequest); - int64_t transporterId = 0; - int32_t code = asyncSendMsgToServer(pAppInfo->pTransporter, &pMsgInfo->epSet, &transporterId, pSendMsg); + // int64_t transporterId = 0; + int32_t code = asyncSendMsgToServer(pAppInfo->pTransporter, &pMsgInfo->epSet, NULL, pSendMsg); if (code) { doRequestCallback(pRequest, code); } diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c index 4a78ce957d..f4fb945f39 100644 --- a/source/client/src/clientMain.c +++ b/source/client/src/clientMain.c @@ -296,9 +296,9 @@ void taos_fetch_whitelist_a(TAOS *taos, __taos_async_whitelist_fn_t fp, void *pa pSendInfo->fp = fetchWhiteListCallbackFn; pSendInfo->msgType = TDMT_MND_GET_USER_WHITELIST; - int64_t transportId = 0; - SEpSet epSet = getEpSet_s(&pTsc->pAppInfo->mgmtEp); - if (TSDB_CODE_SUCCESS != asyncSendMsgToServer(pTsc->pAppInfo->pTransporter, &epSet, &transportId, pSendInfo)) { + // int64_t transportId = 0; + SEpSet epSet = getEpSet_s(&pTsc->pAppInfo->mgmtEp); + if (TSDB_CODE_SUCCESS != asyncSendMsgToServer(pTsc->pAppInfo->pTransporter, &epSet, NULL, pSendInfo)) { tscWarn("failed to async send msg to server"); } releaseTscObj(connId); @@ -860,9 +860,9 @@ int *taos_get_column_data_offset(TAOS_RES *res, int columnIndex) { return pResInfo->pCol[columnIndex].offset; } -int taos_is_null_by_column(TAOS_RES *res, int columnIndex, bool result[], int *rows){ - if (res == NULL || result == NULL || rows == NULL || *rows <= 0 || - columnIndex < 0 || TD_RES_TMQ_META(res) || TD_RES_TMQ_BATCH_META(res)) { +int taos_is_null_by_column(TAOS_RES *res, int columnIndex, bool result[], int *rows) { + if (res == NULL || result == NULL || rows == NULL || *rows <= 0 || columnIndex < 0 || TD_RES_TMQ_META(res) || + TD_RES_TMQ_BATCH_META(res)) { return TSDB_CODE_INVALID_PARA; } @@ -875,22 +875,22 @@ int taos_is_null_by_column(TAOS_RES *res, int columnIndex, bool result[], int *r TAOS_FIELD *pField = &pResInfo->userFields[columnIndex]; SResultColumn *pCol = &pResInfo->pCol[columnIndex]; - if (*rows > pResInfo->numOfRows){ + if (*rows > pResInfo->numOfRows) { *rows = pResInfo->numOfRows; } if (IS_VAR_DATA_TYPE(pField->type)) { - for(int i = 0; i < *rows; i++){ - if(pCol->offset[i] == -1){ + for (int i = 0; i < *rows; i++) { + if (pCol->offset[i] == -1) { result[i] = true; - }else{ + } else { result[i] = false; } } - }else{ - for(int i = 0; i < *rows; i++){ - if (colDataIsNull_f(pCol->nullbitmap, i)){ + } else { + for (int i = 0; i < *rows; i++) { + if (colDataIsNull_f(pCol->nullbitmap, i)) { result[i] = true; - }else{ + } else { result[i] = false; } } diff --git a/source/client/src/clientMonitor.c b/source/client/src/clientMonitor.c index 612f57ecdd..9ed6512352 100644 --- a/source/client/src/clientMonitor.c +++ b/source/client/src/clientMonitor.c @@ -113,15 +113,15 @@ static int32_t monitorReportAsyncCB(void* param, SDataBuf* pMsg, int32_t code) { tscError("failed to send slow log:%s, clusterId:%" PRIx64, p->data, p->clusterId); } MonitorSlowLogData tmp = {.clusterId = p->clusterId, - .type = p->type, - .fileName = p->fileName, - .pFile = p->pFile, - .offset = p->offset, - .data = NULL}; + .type = p->type, + .fileName = p->fileName, + .pFile = p->pFile, + .offset = p->offset, + .data = NULL}; if (monitorPutData2MonitorQueue(tmp) == 0) { p->fileName = NULL; } else { - if(taosCloseFile(&(p->pFile)) != 0) { + if (taosCloseFile(&(p->pFile)) != 0) { tscError("failed to close file:%p", p->pFile); } } @@ -165,8 +165,8 @@ static int32_t sendReport(void* pTransporter, SEpSet* epSet, char* pCont, MONITO pInfo->requestId = tGenIdPI64(); pInfo->requestObjRefId = 0; - int64_t transporterId = 0; - return asyncSendMsgToServer(pTransporter, epSet, &transporterId, pInfo); + // int64_t transporterId = 0; + return asyncSendMsgToServer(pTransporter, epSet, NULL, pInfo); FAILED: if (taosCloseFile(&(((MonitorSlowLogData*)param)->pFile)) != 0) { @@ -286,7 +286,7 @@ void monitorCreateClient(int64_t clusterId) { return; - fail: +fail: destroyMonitorClient(&pMonitor); taosWUnLockLatch(&monitorLock); } @@ -302,7 +302,7 @@ void monitorCreateClientCounter(int64_t clusterId, const char* name, const char* taos_counter_t* newCounter = taos_counter_new(name, help, label_key_count, label_keys); if (newCounter == NULL) return; MonitorClient* pMonitor = *ppMonitor; - if (taos_collector_add_metric(pMonitor->colector, newCounter) != 0){ + if (taos_collector_add_metric(pMonitor->colector, newCounter) != 0) { tscError("failed to add metric to collector"); (void)taos_counter_destroy(newCounter); goto end; @@ -315,7 +315,7 @@ void monitorCreateClientCounter(int64_t clusterId, const char* name, const char* tscInfo("[monitor] monitorCreateClientCounter %" PRIx64 "(%p):%s : %p.", pMonitor->clusterId, pMonitor, name, newCounter); - end: +end: taosWUnLockLatch(&monitorLock); } @@ -338,13 +338,13 @@ void monitorCounterInc(int64_t clusterId, const char* counterName, const char** tscError("monitorCounterInc not found pCounter %" PRIx64 ":%s.", clusterId, counterName); goto end; } - if (taos_counter_inc(*ppCounter, label_values) != 0){ + if (taos_counter_inc(*ppCounter, label_values) != 0) { tscError("monitorCounterInc failed to inc %" PRIx64 ":%s.", clusterId, counterName); goto end; } tscDebug("[monitor] monitorCounterInc %" PRIx64 "(%p):%s", pMonitor->clusterId, pMonitor, counterName); - end: +end: taosWUnLockLatch(&monitorLock); } @@ -413,7 +413,7 @@ static char* readFile(TdFilePtr pFile, int64_t* offset, int64_t size) { return NULL; } - if((size <= *offset)){ + if ((size <= *offset)) { tscError("invalid size:%" PRId64 ", offset:%" PRId64, size, *offset); terrno = TSDB_CODE_TSC_INTERNAL_ERROR; return NULL; @@ -510,13 +510,13 @@ static int32_t monitorReadSend(int64_t clusterId, TdFilePtr pFile, int64_t* offs } SEpSet ep = getEpSet_s(&pInst->mgmtEp); char* data = readFile(pFile, offset, size); - if(data == NULL) return terrno; + if (data == NULL) return terrno; return sendSlowLog(clusterId, data, (type == SLOW_LOG_READ_BEGINNIG ? pFile : NULL), *offset, type, fileName, pInst->pTransporter, &ep); } static void monitorSendSlowLogAtBeginning(int64_t clusterId, char** fileName, TdFilePtr pFile, int64_t offset) { - if (fileName == NULL){ + if (fileName == NULL) { return; } int64_t size = getFileSize(*fileName); @@ -525,10 +525,11 @@ static void monitorSendSlowLogAtBeginning(int64_t clusterId, char** fileName, Td tscDebug("[monitor] monitorSendSlowLogAtBeginning delete file:%s", *fileName); } else { int32_t code = monitorReadSend(clusterId, pFile, &offset, size, SLOW_LOG_READ_BEGINNIG, *fileName); - if (code == 0){ + if (code == 0) { tscDebug("[monitor] monitorSendSlowLogAtBeginning send slow log succ, clusterId:%" PRId64, clusterId); - }else{ - tscError("[monitor] monitorSendSlowLogAtBeginning send slow log failed, clusterId:%" PRId64 ",ret:%d", clusterId, code); + } else { + tscError("[monitor] monitorSendSlowLogAtBeginning send slow log failed, clusterId:%" PRId64 ",ret:%d", clusterId, + code); } *fileName = NULL; } diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c index 3927172b61..783815d97f 100644 --- a/source/client/src/clientTmq.c +++ b/source/client/src/clientTmq.c @@ -552,9 +552,9 @@ static int32_t doSendCommitMsg(tmq_t* tmq, int32_t vgId, SEpSet* epSet, STqOffse pMsgSendInfo->fp = tmqCommitCb; pMsgSendInfo->msgType = TDMT_VND_TMQ_COMMIT_OFFSET; - int64_t transporterId = 0; + // int64_t transporterId = 0; (void)atomic_add_fetch_32(&pParamSet->waitingRspNum, 1); - code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, epSet, &transporterId, pMsgSendInfo); + code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, epSet, NULL, pMsgSendInfo); if (code != 0) { (void)atomic_sub_fetch_32(&pParamSet->waitingRspNum, 1); return code; @@ -955,8 +955,7 @@ void tmqSendHbReq(void* param, void* tmrId) { SEpSet epSet = getEpSet_s(&tmq->pTscObj->pAppInfo->mgmtEp); - int64_t transporterId = 0; - int32_t code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, sendInfo); + int32_t code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, NULL, sendInfo); if (code != 0) { tscError("tmqSendHbReq asyncSendMsgToServer failed"); } @@ -1436,8 +1435,7 @@ int32_t tmq_subscribe(tmq_t* tmq, const tmq_list_t* topic_list) { SEpSet epSet = getEpSet_s(&tmq->pTscObj->pAppInfo->mgmtEp); - int64_t transporterId = 0; - code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, sendInfo); + code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, NULL, sendInfo); if (code != 0) { goto FAIL; } @@ -2044,10 +2042,10 @@ static int32_t doTmqPollImpl(tmq_t* pTmq, SMqClientTopic* pTopic, SMqClientVg* p sendInfo->fp = tmqPollCb; sendInfo->msgType = TDMT_VND_TMQ_CONSUME; - int64_t transporterId = 0; - char offsetFormatBuf[TSDB_OFFSET_LEN] = {0}; + // int64_t transporterId = 0; + char offsetFormatBuf[TSDB_OFFSET_LEN] = {0}; tFormatOffset(offsetFormatBuf, tListLen(offsetFormatBuf), &pVg->offsetInfo.endOffset); - code = asyncSendMsgToServer(pTmq->pTscObj->pAppInfo->pTransporter, &pVg->epSet, &transporterId, sendInfo); + code = asyncSendMsgToServer(pTmq->pTscObj->pAppInfo->pTransporter, &pVg->epSet, NULL, sendInfo); tscDebug("consumer:0x%" PRIx64 " send poll to %s vgId:%d, code:%d, epoch %d, req:%s,QID:0x%" PRIx64, pTmq->consumerId, pTopic->topicName, pVg->vgId, code, pTmq->epoch, offsetFormatBuf, req.reqId); if (code != 0) { @@ -3221,8 +3219,7 @@ int64_t getCommittedFromServer(tmq_t* tmq, char* tname, int32_t vgId, SEpSet* ep sendInfo->fp = tmCommittedCb; sendInfo->msgType = TDMT_VND_TMQ_VG_COMMITTEDINFO; - int64_t transporterId = 0; - code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, epSet, &transporterId, sendInfo); + code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, epSet, NULL, sendInfo); if (code != 0) { (void)tsem2_destroy(&pParam->sem); taosMemoryFree(pParam); @@ -3498,13 +3495,13 @@ int32_t tmq_get_topic_assignment(tmq_t* tmq, const char* pTopicName, tmq_topic_a sendInfo->fp = tmqGetWalInfoCb; sendInfo->msgType = TDMT_VND_TMQ_VG_WALINFO; - int64_t transporterId = 0; - char offsetFormatBuf[TSDB_OFFSET_LEN] = {0}; + // int64_t transporterId = 0; + char offsetFormatBuf[TSDB_OFFSET_LEN] = {0}; tFormatOffset(offsetFormatBuf, tListLen(offsetFormatBuf), &pClientVg->offsetInfo.beginOffset); tscInfo("consumer:0x%" PRIx64 " %s retrieve wal info vgId:%d, epoch %d, req:%s,QID:0x%" PRIx64, tmq->consumerId, pTopic->topicName, pClientVg->vgId, tmq->epoch, offsetFormatBuf, req.reqId); - code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &pClientVg->epSet, &transporterId, sendInfo); + code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &pClientVg->epSet, NULL, sendInfo); if (code != 0) { goto end; } @@ -3668,8 +3665,7 @@ int32_t tmq_offset_seek(tmq_t* tmq, const char* pTopicName, int32_t vgId, int64_ sendInfo->fp = tmqSeekCb; sendInfo->msgType = TDMT_VND_TMQ_SEEK; - int64_t transporterId = 0; - code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, sendInfo); + code = asyncSendMsgToServer(tmq->pTscObj->pAppInfo->pTransporter, &epSet, NULL, sendInfo); if (code != 0) { (void)tsem2_destroy(&pParam->sem); taosMemoryFree(pParam); diff --git a/source/libs/executor/src/dataInserter.c b/source/libs/executor/src/dataInserter.c index 44342b0ac9..5ed97c8db6 100644 --- a/source/libs/executor/src/dataInserter.c +++ b/source/libs/executor/src/dataInserter.c @@ -61,14 +61,14 @@ int32_t inserterCallback(void* param, SDataBuf* pMsg, int32_t code) { if (code) { pInserter->submitRes.code = code; } - + if (code == TSDB_CODE_SUCCESS) { pInserter->submitRes.pRsp = taosMemoryCalloc(1, sizeof(SSubmitRsp2)); if (NULL == pInserter->submitRes.pRsp) { pInserter->submitRes.code = terrno; goto _return; } - + SDecoder coder = {0}; tDecoderInit(&coder, pMsg->pData, pMsg->len); code = tDecodeSSubmitRsp2(&coder, pInserter->submitRes.pRsp); @@ -108,7 +108,7 @@ _return: (void)tsem_post(&pInserter->ready); taosMemoryFree(pMsg->pData); - + return TSDB_CODE_SUCCESS; } @@ -136,8 +136,7 @@ static int32_t sendSubmitRequest(SDataInserterHandle* pInserter, void* pMsg, int pMsgSendInfo->msgType = TDMT_VND_SUBMIT; pMsgSendInfo->fp = inserterCallback; - int64_t transporterId = 0; - return asyncSendMsgToServer(pTransporter, pEpset, &transporterId, pMsgSendInfo); + return asyncSendMsgToServer(pTransporter, pEpset, NULL, pMsgSendInfo); } static int32_t submitReqToMsg(int32_t vgId, SSubmitReq2* pReq, void** pData, int32_t* pLen) { @@ -166,7 +165,7 @@ static int32_t submitReqToMsg(int32_t vgId, SSubmitReq2* pReq, void** pData, int } else { taosMemoryFree(pBuf); } - + return code; } @@ -228,14 +227,15 @@ int32_t buildSubmitReqFromBlock(SDataInserterHandle* pInserter, SSubmitReq2** pp terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; goto _end; } - void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes); + void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes); switch (pColInfoData->info.type) { case TSDB_DATA_TYPE_NCHAR: case TSDB_DATA_TYPE_VARBINARY: case TSDB_DATA_TYPE_VARCHAR: { // TSDB_DATA_TYPE_BINARY if (pColInfoData->info.type != pCol->type) { - qError("column:%d type:%d in block dismatch with schema col:%d type:%d", colIdx, pColInfoData->info.type, k, pCol->type); + qError("column:%d type:%d in block dismatch with schema col:%d type:%d", colIdx, pColInfoData->info.type, k, + pCol->type); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; goto _end; } @@ -331,11 +331,11 @@ _end: tDestroySubmitReq(pReq, TSDB_MSG_FLG_ENCODE); taosMemoryFree(pReq); } - + return terrno; } *ppReq = pReq; - + return TSDB_CODE_SUCCESS; } @@ -462,7 +462,8 @@ int32_t createDataInserter(SDataSinkManager* pManager, const SDataSinkNode* pDat inserter->explain = pInserterNode->explain; int64_t suid = 0; - int32_t code = pManager->pAPI->metaFn.getTableSchema(inserter->pParam->readHandle->vnode, pInserterNode->tableId, &inserter->pSchema, &suid); + int32_t code = pManager->pAPI->metaFn.getTableSchema(inserter->pParam->readHandle->vnode, pInserterNode->tableId, + &inserter->pSchema, &suid); if (code) { terrno = code; goto _return; @@ -484,9 +485,9 @@ int32_t createDataInserter(SDataSinkManager* pManager, const SDataSinkNode* pDat inserter->pCols = taosHashInit(pInserterNode->pCols->length, taosGetDefaultHashFunction(TSDB_DATA_TYPE_SMALLINT), false, HASH_NO_LOCK); if (NULL == inserter->pCols) { - goto _return; + goto _return; } - + SNode* pNode = NULL; int32_t i = 0; FOREACH(pNode, pInserterNode->pCols) { diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c index 7e22e38c95..85a8b035da 100644 --- a/source/libs/executor/src/sysscanoperator.c +++ b/source/libs/executor/src/sysscanoperator.c @@ -1575,8 +1575,8 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) { SMetaReader mr = {0}; pAPI->metaReaderFn.initReader(&mr, pInfo->readHandle.vnode, META_READER_LOCK, &pAPI->metaFn); - code = doSetUserTableMetaInfo(&pAPI->metaReaderFn, &pAPI->metaFn, pInfo->readHandle.vnode, &mr, *uid, dbname, vgId, p, - numOfRows, GET_TASKID(pTaskInfo)); + code = doSetUserTableMetaInfo(&pAPI->metaReaderFn, &pAPI->metaFn, pInfo->readHandle.vnode, &mr, *uid, dbname, vgId, + p, numOfRows, GET_TASKID(pTaskInfo)); pAPI->metaReaderFn.clearReader(&mr); QUERY_CHECK_CODE(code, lino, _end); @@ -2170,8 +2170,7 @@ static SSDataBlock* sysTableScanFromMNode(SOperatorInfo* pOperator, SSysTableSca pMsgSendInfo->fp = loadSysTableCallback; pMsgSendInfo->requestId = pTaskInfo->id.queryId; - int64_t transporterId = 0; - code = asyncSendMsgToServer(pInfo->readHandle.pMsgCb->clientRpc, &pInfo->epSet, &transporterId, pMsgSendInfo); + code = asyncSendMsgToServer(pInfo->readHandle.pMsgCb->clientRpc, &pInfo->epSet, NULL, pMsgSendInfo); if (code != TSDB_CODE_SUCCESS) { qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code)); pTaskInfo->code = code; @@ -2880,7 +2879,7 @@ int32_t createDataBlockInfoScanOperator(SReadHandle* readHandle, SBlockDistScanP code = tableListGetSize(pTableListInfo, &num); QUERY_CHECK_CODE(code, lino, _error); - void* pList = tableListGetInfo(pTableListInfo, 0); + void* pList = tableListGetInfo(pTableListInfo, 0); code = readHandle->api.tsdReader.tsdReaderOpen(readHandle->vnode, &cond, pList, num, pInfo->pResBlock, (void**)&pInfo->pHandle, pTaskInfo->id.str, NULL); From cb8aa061098ab35fc01408d93ce275f7efdc9a3b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 5 Sep 2024 14:43:41 +0800 Subject: [PATCH 23/38] fix mem leakak --- source/client/src/clientMain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c index f4fb945f39..940752c41e 100644 --- a/source/client/src/clientMain.c +++ b/source/client/src/clientMain.c @@ -296,7 +296,6 @@ void taos_fetch_whitelist_a(TAOS *taos, __taos_async_whitelist_fn_t fp, void *pa pSendInfo->fp = fetchWhiteListCallbackFn; pSendInfo->msgType = TDMT_MND_GET_USER_WHITELIST; - // int64_t transportId = 0; SEpSet epSet = getEpSet_s(&pTsc->pAppInfo->mgmtEp); if (TSDB_CODE_SUCCESS != asyncSendMsgToServer(pTsc->pAppInfo->pTransporter, &epSet, NULL, pSendInfo)) { tscWarn("failed to async send msg to server"); From d5525293f6be68bd508d8903aef2b3d74b945562 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 14:56:41 +0800 Subject: [PATCH 24/38] fix windows make error --- include/libs/monitorfw/taos_counter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libs/monitorfw/taos_counter.h b/include/libs/monitorfw/taos_counter.h index 910f6e1aed..7797c695ab 100644 --- a/include/libs/monitorfw/taos_counter.h +++ b/include/libs/monitorfw/taos_counter.h @@ -15,8 +15,8 @@ #ifndef TAOS_COUNTER_H #define TAOS_COUNTER_H - #include +#include "os.h" #include "taos_metric.h" From ae530db81889a2e5954df328d3b8c2741ba12774 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 15:28:13 +0800 Subject: [PATCH 25/38] fix windows make error --- include/libs/monitorfw/taos_counter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libs/monitorfw/taos_counter.h b/include/libs/monitorfw/taos_counter.h index 7797c695ab..a9d196d8ec 100644 --- a/include/libs/monitorfw/taos_counter.h +++ b/include/libs/monitorfw/taos_counter.h @@ -15,8 +15,8 @@ #ifndef TAOS_COUNTER_H #define TAOS_COUNTER_H +#include #include -#include "os.h" #include "taos_metric.h" From 277528996eb5ebf0e4c217d021d4998196bfce5a Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 5 Sep 2024 16:04:36 +0800 Subject: [PATCH 26/38] fix(stream): handle continuous retrieve during checkpoint procedure. --- include/libs/stream/tstream.h | 3 +- source/dnode/mnode/impl/src/mndStreamUtil.c | 2 +- source/dnode/vnode/src/tq/tq.c | 2 +- source/dnode/vnode/src/tqCommon/tqCommon.c | 22 +++++-- source/libs/executor/src/executor.c | 2 +- source/libs/executor/src/querytask.c | 2 +- source/libs/stream/src/streamCheckStatus.c | 7 +- source/libs/stream/src/streamCheckpoint.c | 31 +++++---- source/libs/stream/src/streamDispatch.c | 71 +++++++++++++-------- source/libs/stream/src/streamExec.c | 47 ++++++++------ source/libs/stream/src/streamMeta.c | 11 +--- source/libs/stream/src/streamQueue.c | 4 +- source/libs/stream/src/streamTask.c | 5 +- 13 files changed, 117 insertions(+), 92 deletions(-) diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h index 20f91106a5..31b9f62346 100644 --- a/include/libs/stream/tstream.h +++ b/include/libs/stream/tstream.h @@ -705,7 +705,7 @@ int32_t streamTaskSetActiveCheckpointInfo(SStreamTask* pTask, int64_t activeChec void streamTaskSetFailedChkptInfo(SStreamTask* pTask, int32_t transId, int64_t checkpointId); bool streamTaskAlreadySendTrigger(SStreamTask* pTask, int32_t downstreamNodeId); void streamTaskGetTriggerRecvStatus(SStreamTask* pTask, int32_t* pRecved, int32_t* pTotal); -void streamTaskInitTriggerDispatchInfo(SStreamTask* pTask); +int32_t streamTaskInitTriggerDispatchInfo(SStreamTask* pTask); void streamTaskSetTriggerDispatchConfirmed(SStreamTask* pTask, int32_t vgId); int32_t streamTaskSendCheckpointTriggerMsg(SStreamTask* pTask, int32_t dstTaskId, int32_t downstreamNodeId, SRpcHandleInfo* pInfo, int32_t code); @@ -810,6 +810,7 @@ int32_t streamTaskBuildCheckpointSourceRsp(SStreamCheckpointSourceReq* pReq, SRp int32_t streamSendChkptReportMsg(SStreamTask* pTask, SCheckpointInfo* pCheckpointInfo, int8_t dropRelHTask); int32_t streamTaskUpdateTaskCheckpointInfo(SStreamTask* pTask, bool restored, SVUpdateCheckpointInfoReq* pReq); int32_t streamTaskCreateActiveChkptInfo(SActiveCheckpointInfo** pRes); +void streamTaskSetCheckpointFailed(SStreamTask* pTask); // stream task state machine, and event handling int32_t streamCreateStateMachine(SStreamTask* pTask); diff --git a/source/dnode/mnode/impl/src/mndStreamUtil.c b/source/dnode/mnode/impl/src/mndStreamUtil.c index ef91ccef34..d75713fd28 100644 --- a/source/dnode/mnode/impl/src/mndStreamUtil.c +++ b/source/dnode/mnode/impl/src/mndStreamUtil.c @@ -251,7 +251,7 @@ void mndKillTransImpl(SMnode *pMnode, int32_t transId, const char *pDbName) { int32_t code = mndKillTrans(pMnode, pTrans); mndReleaseTrans(pMnode, pTrans); if (code) { - mError("failed to kill trans:%d", pTrans->id); + mError("failed to kill transId:%d, code:%s", pTrans->id, tstrerror(code)); } } else { mError("failed to acquire trans in Db:%s, transId:%d", pDbName, transId); diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c index 07daab4459..de295f2611 100644 --- a/source/dnode/vnode/src/tq/tq.c +++ b/source/dnode/vnode/src/tq/tq.c @@ -1129,7 +1129,7 @@ int32_t tqProcessTaskCheckPointSourceReq(STQ* pTq, SRpcMsg* pMsg, SRpcMsg* pRsp) SStreamTask* pTask = NULL; code = streamMetaAcquireTask(pMeta, req.streamId, req.taskId, &pTask); - if (pTask == NULL) { + if (pTask == NULL || code != 0) { tqError("vgId:%d failed to find s-task:0x%x, ignore checkpoint msg. checkpointId:%" PRId64 " transId:%d it may have been destroyed", vgId, req.taskId, req.checkpointId, req.transId); diff --git a/source/dnode/vnode/src/tqCommon/tqCommon.c b/source/dnode/vnode/src/tqCommon/tqCommon.c index 44b3f75289..68f43d637b 100644 --- a/source/dnode/vnode/src/tqCommon/tqCommon.c +++ b/source/dnode/vnode/src/tqCommon/tqCommon.c @@ -410,7 +410,7 @@ int32_t tqStreamTaskProcessRetrieveReq(SStreamMeta* pMeta, SRpcMsg* pMsg) { tDecoderClear(&decoder); if (code) { - tqError("vgId:%d failed to decode retrieve msg, quit handling it", pMeta->vgId); + tqError("vgId:%d failed to decode retrieve msg, discard it", pMeta->vgId); return code; } @@ -420,9 +420,16 @@ int32_t tqStreamTaskProcessRetrieveReq(SStreamMeta* pMeta, SRpcMsg* pMsg) { tqError("vgId:%d process retrieve req, failed to acquire task:0x%x, it may have been dropped already", pMeta->vgId, req.dstTaskId); tCleanupStreamRetrieveReq(&req); - return -1; + return code; } + // enqueue + tqDebug("s-task:%s (vgId:%d level:%d) recv retrieve req from task:0x%x(vgId:%d),QID:0x%" PRIx64, pTask->id.idStr, + pTask->pMeta->vgId, pTask->info.taskLevel, req.srcTaskId, req.srcNodeId, req.reqId); + + // if task is in ck status, set current ck failed + streamTaskSetCheckpointFailed(pTask); + if (pTask->info.taskLevel == TASK_LEVEL__SOURCE) { code = streamProcessRetrieveReq(pTask, &req); } else { @@ -431,14 +438,19 @@ int32_t tqStreamTaskProcessRetrieveReq(SStreamMeta* pMeta, SRpcMsg* pMsg) { code = streamTaskBroadcastRetrieveReq(pTask, &req); } - SRpcMsg rsp = {.info = pMsg->info, .code = 0}; - streamTaskSendRetrieveRsp(&req, &rsp); + if (code != TSDB_CODE_SUCCESS) { // return error not send rsp manually + tqError("s-task:0x%x vgId:%d failed to process retrieve request from 0x%x, code:%s", req.dstTaskId, req.dstNodeId, + req.srcTaskId, tstrerror(code)); + } else { // send rsp manually only on success. + SRpcMsg rsp = {.info = pMsg->info, .code = 0}; + streamTaskSendRetrieveRsp(&req, &rsp); + } streamMetaReleaseTask(pMeta, pTask); tCleanupStreamRetrieveReq(&req); // always return success, to disable the auto rsp - return TSDB_CODE_SUCCESS; + return code; } int32_t tqStreamTaskProcessCheckReq(SStreamMeta* pMeta, SRpcMsg* pMsg) { diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index c13104fc07..6620e2b934 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -601,7 +601,7 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, SExecTaskInfo** pTask = (SExecTaskInfo**)pTaskInfo; (void)taosThreadOnce(&initPoolOnce, initRefPool); - qDebug("start to create task, TID:0x%" PRIx64 "QID:0x%" PRIx64 ", vgId:%d", taskId, pSubplan->id.queryId, vgId); + qDebug("start to create task, TID:0x%" PRIx64 " QID:0x%" PRIx64 ", vgId:%d", taskId, pSubplan->id.queryId, vgId); int32_t code = createExecTaskInfo(pSubplan, pTask, readHandle, taskId, vgId, sql, model); if (code != TSDB_CODE_SUCCESS || NULL == *pTask) { diff --git a/source/libs/executor/src/querytask.c b/source/libs/executor/src/querytask.c index b050143ac0..fc6c9f2861 100644 --- a/source/libs/executor/src/querytask.c +++ b/source/libs/executor/src/querytask.c @@ -287,7 +287,7 @@ void buildTaskId(uint64_t taskId, uint64_t queryId, char* dst) { memcpy(p, "TID:0x", offset); offset += tintToHex(taskId, &p[offset]); - memcpy(&p[offset], "QID:0x", 7); + memcpy(&p[offset], " QID:0x", 7); offset += 7; offset += tintToHex(queryId, &p[offset]); diff --git a/source/libs/stream/src/streamCheckStatus.c b/source/libs/stream/src/streamCheckStatus.c index 91196f31e0..41124d8543 100644 --- a/source/libs/stream/src/streamCheckStatus.c +++ b/source/libs/stream/src/streamCheckStatus.c @@ -65,12 +65,7 @@ int32_t streamTaskCheckStatus(SStreamTask* pTask, int32_t upstreamTaskId, int32_ ", prev:%" PRId64, id, upstreamTaskId, vgId, stage, pInfo->stage); // record the checkpoint failure id and sent to mnode - streamMutexLock(&pTask->lock); - ETaskStatus status = streamTaskGetStatus(pTask).state; - if (status == TASK_STATUS__CK) { - streamTaskSetFailedCheckpointId(pTask); - } - streamMutexUnlock(&pTask->lock); + streamTaskSetCheckpointFailed(pTask); } if (pInfo->stage != stage) { diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c index d0bf24bd03..916aee4e6e 100644 --- a/source/libs/stream/src/streamCheckpoint.c +++ b/source/libs/stream/src/streamCheckpoint.c @@ -673,6 +673,15 @@ void streamTaskSetFailedCheckpointId(SStreamTask* pTask) { } } +void streamTaskSetCheckpointFailed(SStreamTask* pTask) { + streamMutexLock(&pTask->lock); + ETaskStatus status = streamTaskGetStatus(pTask).state; + if (status == TASK_STATUS__CK) { + streamTaskSetFailedCheckpointId(pTask); + } + streamMutexUnlock(&pTask->lock); +} + static int32_t getCheckpointDataMeta(const char* id, const char* path, SArray* list) { int32_t code = 0; int32_t cap = strlen(path) + 64; @@ -1111,26 +1120,20 @@ void streamTaskGetTriggerRecvStatus(SStreamTask* pTask, int32_t* pRecved, int32_ // record the dispatch checkpoint trigger info in the list // memory insufficient may cause the stream computing stopped -void streamTaskInitTriggerDispatchInfo(SStreamTask* pTask) { +int32_t streamTaskInitTriggerDispatchInfo(SStreamTask* pTask) { SActiveCheckpointInfo* pInfo = pTask->chkInfo.pActiveInfo; + int64_t now = taosGetTimestampMs(); - int64_t now = taosGetTimestampMs(); streamMutexLock(&pInfo->lock); - - // outputQ should be empty here - if (streamQueueGetNumOfUnAccessedItems(pTask->outputq.queue) > 0) { - stFatal("s-task:%s items are still in outputQ, failed to init trigger dispatch info", pTask->id.idStr); - return; - } - pInfo->dispatchTrigger = true; if (pTask->outputInfo.type == TASK_OUTPUT__FIXED_DISPATCH) { STaskDispatcherFixed* pDispatch = &pTask->outputInfo.fixedDispatcher; STaskTriggerSendInfo p = {.sendTs = now, .recved = false, .nodeId = pDispatch->nodeId, .taskId = pDispatch->taskId}; void* px = taosArrayPush(pInfo->pDispatchTriggerList, &p); - if (px == NULL) { - // pause the stream task, if memory not enough + if (px == NULL) { // pause the stream task, if memory not enough + streamMutexUnlock(&pInfo->lock); + return terrno; } } else { for (int32_t i = 0; i < streamTaskGetNumOfDownstream(pTask); ++i) { @@ -1141,13 +1144,15 @@ void streamTaskInitTriggerDispatchInfo(SStreamTask* pTask) { STaskTriggerSendInfo p = {.sendTs = now, .recved = false, .nodeId = pVgInfo->vgId, .taskId = pVgInfo->taskId}; void* px = taosArrayPush(pInfo->pDispatchTriggerList, &p); - if (px == NULL) { - // pause the stream task, if memory not enough + if (px == NULL) { // pause the stream task, if memory not enough + streamMutexUnlock(&pInfo->lock); + return terrno; } } } streamMutexUnlock(&pInfo->lock); + return 0; } int32_t streamTaskGetNumOfConfirmed(SActiveCheckpointInfo* pInfo) { diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c index 0bc090cdfe..36b35bd3f6 100644 --- a/source/libs/stream/src/streamDispatch.c +++ b/source/libs/stream/src/streamDispatch.c @@ -726,8 +726,11 @@ int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, S } int32_t streamDispatchStreamBlock(SStreamTask* pTask) { - const char* id = pTask->id.idStr; - int32_t numOfElems = streamQueueGetNumOfItems(pTask->outputq.queue); + const char* id = pTask->id.idStr; + int32_t code = 0; + SStreamDataBlock* pBlock = NULL; + + int32_t numOfElems = streamQueueGetNumOfItems(pTask->outputq.queue); if (numOfElems > 0) { double size = SIZE_IN_MiB(taosQueueMemorySize(pTask->outputq.queue->pQueue)); int32_t numOfUnAccessed = streamQueueGetNumOfUnAccessedItems(pTask->outputq.queue); @@ -749,41 +752,57 @@ int32_t streamDispatchStreamBlock(SStreamTask* pTask) { return 0; } + ASSERT(pTask->msgInfo.pData == NULL); + if (pTask->msgInfo.pData != NULL) { stFatal("s-task:%s not rsp data:%p exist, should not dispatch msg now", id, pTask->msgInfo.pData); } else { stDebug("s-task:%s start to dispatch msg, set output status:%d", id, pTask->outputq.status); } - SStreamDataBlock* pBlock = NULL; - streamQueueNextItem(pTask->outputq.queue, (SStreamQueueItem**)&pBlock); - if (pBlock == NULL) { - atomic_store_8(&pTask->outputq.status, TASK_OUTPUT_STATUS__NORMAL); - stDebug("s-task:%s not dispatch since no elems in outputQ, output status:%d", id, pTask->outputq.status); - return 0; - } + while (1) { + streamQueueNextItem(pTask->outputq.queue, (SStreamQueueItem**)&pBlock); + if (pBlock == NULL) { + atomic_store_8(&pTask->outputq.status, TASK_OUTPUT_STATUS__NORMAL); + stDebug("s-task:%s not dispatch since no elems in outputQ, output status:%d", id, pTask->outputq.status); + return 0; + } - int32_t type = pBlock->type; - if (!(type == STREAM_INPUT__DATA_BLOCK || type == STREAM_INPUT__CHECKPOINT_TRIGGER || - type == STREAM_INPUT__TRANS_STATE)) { - stError("s-task:%s invalid dispatch block type:%d", id, type); - return TSDB_CODE_INTERNAL_ERROR; - } + int32_t type = pBlock->type; + if (!(type == STREAM_INPUT__DATA_BLOCK || type == STREAM_INPUT__CHECKPOINT_TRIGGER || + type == STREAM_INPUT__TRANS_STATE)) { + stError("s-task:%s invalid dispatch block type:%d", id, type); + return TSDB_CODE_INTERNAL_ERROR; + } - pTask->execInfo.dispatch += 1; + pTask->execInfo.dispatch += 1; - streamMutexLock(&pTask->msgInfo.lock); - initDispatchInfo(&pTask->msgInfo, pTask->execInfo.dispatch); - streamMutexUnlock(&pTask->msgInfo.lock); + streamMutexLock(&pTask->msgInfo.lock); + initDispatchInfo(&pTask->msgInfo, pTask->execInfo.dispatch); + streamMutexUnlock(&pTask->msgInfo.lock); - int32_t code = doBuildDispatchMsg(pTask, pBlock); - if (code == 0) { - destroyStreamDataBlock(pBlock); - } else { // todo handle build dispatch msg failed - } + code = doBuildDispatchMsg(pTask, pBlock); + if (code == 0) { + destroyStreamDataBlock(pBlock); + } else { // todo handle build dispatch msg failed + } - if (type == STREAM_INPUT__CHECKPOINT_TRIGGER) { - streamTaskInitTriggerDispatchInfo(pTask); + if (type == STREAM_INPUT__CHECKPOINT_TRIGGER) { + // outputQ should be empty here, otherwise, set the checkpoint failed due to the retrieve req happens + if (streamQueueGetNumOfUnAccessedItems(pTask->outputq.queue) > 0) { + stError("s-task:%s items are still in outputQ due to downstream retrieve, failed to init trigger dispatch", + pTask->id.idStr); + streamTaskSetCheckpointFailed(pTask); + clearBufferedDispatchMsg(pTask); + continue; + } + + code = streamTaskInitTriggerDispatchInfo(pTask); + if (code != TSDB_CODE_SUCCESS) { // todo handle error + } + } + + break; } code = sendDispatchMsg(pTask, pTask->msgInfo.pData); diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index fca0bf403f..0ac37fd2b9 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -98,14 +98,13 @@ static int32_t doDumpResult(SStreamTask* pTask, SStreamQueueItem* pItem, SArray* void streamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pItem, int64_t* totalSize, int32_t* totalBlocks) { int32_t code = TSDB_CODE_SUCCESS; void* pExecutor = pTask->exec.pExecutor; - - *totalBlocks = 0; - *totalSize = 0; - int32_t size = 0; int32_t numOfBlocks = 0; SArray* pRes = NULL; + *totalBlocks = 0; + *totalSize = 0; + while (1) { if (pRes == NULL) { pRes = taosArrayInit(4, sizeof(SSDataBlock)); @@ -131,7 +130,8 @@ void streamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pItem, int64_t* to if (pItem->type == STREAM_INPUT__DATA_RETRIEVE) { SSDataBlock block = {0}; const SStreamDataBlock* pRetrieveBlock = (const SStreamDataBlock*)pItem; - int32_t num = taosArrayGetSize(pRetrieveBlock->blocks); + + int32_t num = taosArrayGetSize(pRetrieveBlock->blocks); if (num != 1) { stError("s-task:%s invalid retrieve block number:%d, ignore", pTask->id.idStr, num); continue; @@ -596,12 +596,32 @@ void streamProcessTransstateBlock(SStreamTask* pTask, SStreamDataBlock* pBlock) // static void streamTaskSetIdleInfo(SStreamTask* pTask, int32_t idleTime) { pTask->status.schedIdleTime = idleTime; } static void setLastExecTs(SStreamTask* pTask, int64_t ts) { pTask->status.lastExecTs = ts; } +static void doRecordThroughput(STaskExecStatisInfo* pInfo, int64_t totalBlocks, int64_t totalSize, int64_t blockSize, + double st, const char* id) { + double el = (taosGetTimestampMs() - st) / 1000.0; + + stDebug("s-task:%s batch of input blocks exec end, elapsed time:%.2fs, result size:%.2fMiB, numOfBlocks:%d", id, el, + SIZE_IN_MiB(totalSize), totalBlocks); + + pInfo->outputDataBlocks += totalBlocks; + pInfo->outputDataSize += totalSize; + if (fabs(el - 0.0) <= DBL_EPSILON) { + pInfo->procsThroughput = 0; + pInfo->outputThroughput = 0; + } else { + pInfo->outputThroughput = (totalSize / el); + pInfo->procsThroughput = (blockSize / el); + } +} + static void doStreamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pBlock, int32_t num) { const char* id = pTask->id.idStr; int32_t blockSize = 0; int64_t st = taosGetTimestampMs(); SCheckpointInfo* pInfo = &pTask->chkInfo; int64_t ver = pInfo->processedVer; + int64_t totalSize = 0; + int32_t totalBlocks = 0; stDebug("s-task:%s start to process batch blocks, num:%d, type:%s", id, num, streamQueueItemGetTypeStr(pBlock->type)); @@ -611,23 +631,8 @@ static void doStreamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pBlock, i return; } - int64_t totalSize = 0; - int32_t totalBlocks = 0; streamTaskExecImpl(pTask, pBlock, &totalSize, &totalBlocks); - - double el = (taosGetTimestampMs() - st) / 1000.0; - stDebug("s-task:%s batch of input blocks exec end, elapsed time:%.2fs, result size:%.2fMiB, numOfBlocks:%d", id, el, - SIZE_IN_MiB(totalSize), totalBlocks); - - pTask->execInfo.outputDataBlocks += totalBlocks; - pTask->execInfo.outputDataSize += totalSize; - if (fabs(el - 0.0) <= DBL_EPSILON) { - pTask->execInfo.procsThroughput = 0; - pTask->execInfo.outputThroughput = 0; - } else { - pTask->execInfo.outputThroughput = (totalSize / el); - pTask->execInfo.procsThroughput = (blockSize / el); - } + doRecordThroughput(&pTask->execInfo, totalBlocks, totalSize, blockSize, st, pTask->id.idStr); // update the currentVer if processing the submit blocks. if (!(pInfo->checkpointVer <= pInfo->nextProcessVer && ver >= pInfo->checkpointVer)) { diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c index 084eb7b827..81061cd06d 100644 --- a/source/libs/stream/src/streamMeta.c +++ b/source/libs/stream/src/streamMeta.c @@ -1254,16 +1254,7 @@ int32_t streamMetaSendMsgBeforeCloseTasks(SStreamMeta* pMeta, SArray** pList) { continue; } - streamMutexLock(&pTask->lock); - - SStreamTaskState pState = streamTaskGetStatus(pTask); - if (pState.state == TASK_STATUS__CK) { - streamTaskSetFailedCheckpointId(pTask); - } else { - stDebug("s-task:%s status:%s not reset the checkpoint", pTask->id.idStr, pState.name); - } - - streamMutexUnlock(&pTask->lock); + streamTaskSetCheckpointFailed(pTask); streamMetaReleaseTask(pMeta, pTask); } diff --git a/source/libs/stream/src/streamQueue.c b/source/libs/stream/src/streamQueue.c index eca728b2d5..3765d0f9d3 100644 --- a/source/libs/stream/src/streamQueue.c +++ b/source/libs/stream/src/streamQueue.c @@ -287,7 +287,7 @@ int32_t streamTaskPutDataIntoInputQ(SStreamTask* pTask, SStreamQueueItem* pItem) "s-task:%s inputQ is full, capacity(size:%d num:%dMiB), current(blocks:%d, size:%.2fMiB) stop to push data", pTask->id.idStr, STREAM_TASK_QUEUE_CAPACITY, STREAM_TASK_QUEUE_CAPACITY_IN_SIZE, total, size); streamDataSubmitDestroy(px); - return -1; + return TSDB_CODE_OUT_OF_MEMORY; } int32_t msgLen = px->submit.msgLen; @@ -312,7 +312,7 @@ int32_t streamTaskPutDataIntoInputQ(SStreamTask* pTask, SStreamQueueItem* pItem) stTrace("s-task:%s input queue is full, capacity:%d size:%d MiB, current(blocks:%d, size:%.2fMiB) abort", pTask->id.idStr, STREAM_TASK_QUEUE_CAPACITY, STREAM_TASK_QUEUE_CAPACITY_IN_SIZE, total, size); streamFreeQitem(pItem); - return -1; + return TSDB_CODE_OUT_OF_MEMORY; } int32_t code = taosWriteQitem(pQueue, pItem); diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c index 0791784656..2acfd64b2a 100644 --- a/source/libs/stream/src/streamTask.c +++ b/source/libs/stream/src/streamTask.c @@ -1098,15 +1098,12 @@ static int32_t streamTaskEnqueueRetrieve(SStreamTask* pTask, SStreamRetrieveReq* return terrno = code; } - // enqueue - stDebug("s-task:%s (vgId:%d level:%d) recv retrieve req from task:0x%x(vgId:%d),QID:0x%" PRIx64, pTask->id.idStr, - pTask->pMeta->vgId, pTask->info.taskLevel, pReq->srcTaskId, pReq->srcNodeId, pReq->reqId); - pData->type = STREAM_INPUT__DATA_RETRIEVE; pData->srcVgId = 0; code = streamRetrieveReqToData(pReq, pData, pTask->id.idStr); if (code != TSDB_CODE_SUCCESS) { + stError("s-task:%s failed to convert retrieve-data to block, code:%s", pTask->id.idStr, tstrerror(code)); taosFreeQitem(pData); return code; } From 84a54f88f62187567140baf5c9d94437e0a0e5e7 Mon Sep 17 00:00:00 2001 From: xiao77 Date: Thu, 5 Sep 2024 16:09:44 +0800 Subject: [PATCH 27/38] fix windows make error --- source/libs/monitorfw/inc/taos_metric_formatter_i.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libs/monitorfw/inc/taos_metric_formatter_i.h b/source/libs/monitorfw/inc/taos_metric_formatter_i.h index 5c330b50e7..54e683fa91 100644 --- a/source/libs/monitorfw/inc/taos_metric_formatter_i.h +++ b/source/libs/monitorfw/inc/taos_metric_formatter_i.h @@ -16,6 +16,7 @@ #ifndef TAOS_METRIC_FORMATTER_I_H #define TAOS_METRIC_FORMATTER_I_H +#include // Private #include "taos_metric_formatter_t.h" From af57f81a865e40775fa55aef93da5ad426a33f90 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 5 Sep 2024 16:12:35 +0800 Subject: [PATCH 28/38] more code --- source/common/src/tmsg.c | 809 ++++++++++++++++++++------------------- 1 file changed, 412 insertions(+), 397 deletions(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 5f8a0e99aa..349a928b41 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -10012,100 +10012,30 @@ int32_t tDecodeSVDropStbReq(SDecoder *pCoder, SVDropStbReq *pReq) { } static int32_t tEncodeSSubmitBlkRsp(SEncoder *pEncoder, const SSubmitBlkRsp *pBlock) { - if (tStartEncode(pEncoder) < 0) return -1; + int32_t code = 0; + int32_t lino; + TAOS_CHECK_EXIT(tStartEncode(pEncoder)); - if (tEncodeI32(pEncoder, pBlock->code) < 0) return -1; - if (tEncodeI64(pEncoder, pBlock->uid) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pBlock->code)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pBlock->uid)); if (pBlock->tblFName) { - if (tEncodeCStr(pEncoder, pBlock->tblFName) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pBlock->tblFName)); } else { - if (tEncodeCStr(pEncoder, "") < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, "")); } - if (tEncodeI32v(pEncoder, pBlock->numOfRows) < 0) return -1; - if (tEncodeI32v(pEncoder, pBlock->affectedRows) < 0) return -1; - if (tEncodeI64v(pEncoder, pBlock->sver) < 0) return -1; - if (tEncodeI32(pEncoder, pBlock->pMeta ? 1 : 0) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pBlock->numOfRows)); + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pBlock->affectedRows)); + TAOS_CHECK_EXIT(tEncodeI64v(pEncoder, pBlock->sver)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pBlock->pMeta ? 1 : 0)); if (pBlock->pMeta) { - if (tEncodeSTableMetaRsp(pEncoder, pBlock->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSTableMetaRsp(pEncoder, pBlock->pMeta)); } tEndEncode(pEncoder); - return 0; +_exit: + return code; } -// static int32_t tDecodeSSubmitBlkRsp(SDecoder *pDecoder, SSubmitBlkRsp *pBlock) { -// if (tStartDecode(pDecoder) < 0) return -1; - -// if (tDecodeI32(pDecoder, &pBlock->code) < 0) return -1; -// if (tDecodeI64(pDecoder, &pBlock->uid) < 0) return -1; -// pBlock->tblFName = taosMemoryCalloc(TSDB_TABLE_FNAME_LEN, 1); -// if (NULL == pBlock->tblFName) return -1; -// if (tDecodeCStrTo(pDecoder, pBlock->tblFName) < 0) return -1; -// if (tDecodeI32v(pDecoder, &pBlock->numOfRows) < 0) return -1; -// if (tDecodeI32v(pDecoder, &pBlock->affectedRows) < 0) return -1; -// if (tDecodeI64v(pDecoder, &pBlock->sver) < 0) return -1; - -// int32_t meta = 0; -// if (tDecodeI32(pDecoder, &meta) < 0) return -1; -// if (meta) { -// pBlock->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); -// if (NULL == pBlock->pMeta) return -1; -// if (tDecodeSTableMetaRsp(pDecoder, pBlock->pMeta) < 0) return -1; -// } else { -// pBlock->pMeta = NULL; -// } - -// tEndDecode(pDecoder); -// return 0; -// } - -// int32_t tEncodeSSubmitRsp(SEncoder *pEncoder, const SSubmitRsp *pRsp) { -// int32_t nBlocks = taosArrayGetSize(pRsp->pArray); - -// if (tStartEncode(pEncoder) < 0) return -1; - -// if (tEncodeI32v(pEncoder, pRsp->numOfRows) < 0) return -1; -// if (tEncodeI32v(pEncoder, pRsp->affectedRows) < 0) return -1; -// if (tEncodeI32v(pEncoder, nBlocks) < 0) return -1; -// for (int32_t iBlock = 0; iBlock < nBlocks; iBlock++) { -// if (tEncodeSSubmitBlkRsp(pEncoder, (SSubmitBlkRsp *)taosArrayGet(pRsp->pArray, iBlock)) < 0) return -1; -// } - -// tEndEncode(pEncoder); -// return 0; -// } - -// int32_t tDecodeSSubmitRsp(SDecoder *pDecoder, SSubmitRsp *pRsp) { -// if (tStartDecode(pDecoder) < 0) return -1; - -// if (tDecodeI32v(pDecoder, &pRsp->numOfRows) < 0) return -1; -// if (tDecodeI32v(pDecoder, &pRsp->affectedRows) < 0) return -1; -// if (tDecodeI32v(pDecoder, &pRsp->nBlocks) < 0) return -1; -// pRsp->pBlocks = taosMemoryCalloc(pRsp->nBlocks, sizeof(*pRsp->pBlocks)); -// if (pRsp->pBlocks == NULL) return -1; -// for (int32_t iBlock = 0; iBlock < pRsp->nBlocks; iBlock++) { -// if (tDecodeSSubmitBlkRsp(pDecoder, pRsp->pBlocks + iBlock) < 0) return -1; -// } - -// tEndDecode(pDecoder); -// tDecoderClear(pDecoder); -// return 0; -// } - -// void tFreeSSubmitBlkRsp(void *param) { -// if (NULL == param) { -// return; -// } - -// SSubmitBlkRsp *pRsp = (SSubmitBlkRsp *)param; - -// taosMemoryFree(pRsp->tblFName); -// if (pRsp->pMeta) { -// taosMemoryFree(pRsp->pMeta->pSchemas); -// taosMemoryFree(pRsp->pMeta); -// } -// } - void tFreeSSubmitRsp(SSubmitRsp *pRsp) { if (NULL == pRsp) return; @@ -10124,239 +10054,235 @@ void tFreeSSubmitRsp(SSubmitRsp *pRsp) { } int32_t tEncodeSVAlterTbReq(SEncoder *pEncoder, const SVAlterTbReq *pReq) { - if (tStartEncode(pEncoder) < 0) return -1; + int32_t code = 0; + int32_t lino; - if (tEncodeCStr(pEncoder, pReq->tbName) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->action) < 0) return -1; - if (tEncodeI32(pEncoder, pReq->colId) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(pEncoder)); + + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->tbName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->action)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pReq->colId)); switch (pReq->action) { case TSDB_ALTER_TABLE_ADD_COLUMN: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->type) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->flags) < 0) return -1; - if (tEncodeI32v(pEncoder, pReq->bytes) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->type)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->flags)); + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pReq->bytes)); break; case TSDB_ALTER_TABLE_DROP_COLUMN: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->colModType) < 0) return -1; - if (tEncodeI32v(pEncoder, pReq->colModBytes) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->colModType)); + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pReq->colModBytes)); break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; - if (tEncodeCStr(pEncoder, pReq->colNewName) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colNewName)); break; case TSDB_ALTER_TABLE_UPDATE_TAG_VAL: - if (tEncodeCStr(pEncoder, pReq->tagName) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->isNull) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->tagType) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->tagName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->isNull)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->tagType)); if (!pReq->isNull) { - if (tEncodeBinary(pEncoder, pReq->pTagVal, pReq->nTagVal) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeBinary(pEncoder, pReq->pTagVal, pReq->nTagVal)); } break; case TSDB_ALTER_TABLE_UPDATE_OPTIONS: - if (tEncodeI8(pEncoder, pReq->updateTTL) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->updateTTL)); if (pReq->updateTTL) { - if (tEncodeI32v(pEncoder, pReq->newTTL) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pReq->newTTL)); } - if (tEncodeI32v(pEncoder, pReq->newCommentLen) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pReq->newCommentLen)); if (pReq->newCommentLen > 0) { - if (tEncodeCStr(pEncoder, pReq->newComment) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->newComment)); } break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_COMPRESS: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; - if (tEncodeU32(pEncoder, pReq->compress) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); + TAOS_CHECK_EXIT(tEncodeU32(pEncoder, pReq->compress)); break; case TSDB_ALTER_TABLE_ADD_COLUMN_WITH_COMPRESS_OPTION: - if (tEncodeCStr(pEncoder, pReq->colName) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->type) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->flags) < 0) return -1; - if (tEncodeI32v(pEncoder, pReq->bytes) < 0) return -1; - if (tEncodeU32(pEncoder, pReq->compress) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pReq->colName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->type)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->flags)); + TAOS_CHECK_EXIT(tEncodeI32v(pEncoder, pReq->bytes)); + TAOS_CHECK_EXIT(tEncodeU32(pEncoder, pReq->compress)); break; default: break; } - if (tEncodeI64(pEncoder, pReq->ctimeMs) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->source) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pReq->ctimeMs)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->source)); tEndEncode(pEncoder); - return 0; +_exit: + return code; } static int32_t tDecodeSVAlterTbReqCommon(SDecoder *pDecoder, SVAlterTbReq *pReq) { - if (tDecodeCStr(pDecoder, &pReq->tbName) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->action) < 0) return -1; - if (tDecodeI32(pDecoder, &pReq->colId) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->tbName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->action)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->colId)); switch (pReq->action) { case TSDB_ALTER_TABLE_ADD_COLUMN: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->type) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->flags) < 0) return -1; - if (tDecodeI32v(pDecoder, &pReq->bytes) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->type)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->flags)); + TAOS_CHECK_EXIT(tDecodeI32v(pDecoder, &pReq->bytes)); break; case TSDB_ALTER_TABLE_DROP_COLUMN: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->colModType) < 0) return -1; - if (tDecodeI32v(pDecoder, &pReq->colModBytes) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->colModType)); + TAOS_CHECK_EXIT(tDecodeI32v(pDecoder, &pReq->colModBytes)); break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; - if (tDecodeCStr(pDecoder, &pReq->colNewName) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colNewName)); break; case TSDB_ALTER_TABLE_UPDATE_TAG_VAL: - if (tDecodeCStr(pDecoder, &pReq->tagName) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->isNull) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->tagType) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->tagName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->isNull)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->tagType)); if (!pReq->isNull) { - if (tDecodeBinary(pDecoder, &pReq->pTagVal, &pReq->nTagVal) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeBinary(pDecoder, &pReq->pTagVal, &pReq->nTagVal)); } break; case TSDB_ALTER_TABLE_UPDATE_OPTIONS: - if (tDecodeI8(pDecoder, &pReq->updateTTL) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->updateTTL)); if (pReq->updateTTL) { - if (tDecodeI32v(pDecoder, &pReq->newTTL) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32v(pDecoder, &pReq->newTTL)); } - if (tDecodeI32v(pDecoder, &pReq->newCommentLen) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32v(pDecoder, &pReq->newCommentLen)); if (pReq->newCommentLen > 0) { - if (tDecodeCStr(pDecoder, &pReq->newComment) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->newComment)); } break; case TSDB_ALTER_TABLE_UPDATE_COLUMN_COMPRESS: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; - if (tDecodeU32(pDecoder, &pReq->compress) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); + TAOS_CHECK_EXIT(tDecodeU32(pDecoder, &pReq->compress)); break; case TSDB_ALTER_TABLE_ADD_COLUMN_WITH_COMPRESS_OPTION: - if (tDecodeCStr(pDecoder, &pReq->colName) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->type) < 0) return -1; - if (tDecodeI8(pDecoder, &pReq->flags) < 0) return -1; - if (tDecodeI32v(pDecoder, &pReq->bytes) < 0) return -1; - if (tDecodeU32(pDecoder, &pReq->compress) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pDecoder, &pReq->colName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->type)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->flags)); + TAOS_CHECK_EXIT(tDecodeI32v(pDecoder, &pReq->bytes)); + TAOS_CHECK_EXIT(tDecodeU32(pDecoder, &pReq->compress)); default: break; } - return 0; +_exit: + return code; } int32_t tDecodeSVAlterTbReq(SDecoder *pDecoder, SVAlterTbReq *pReq) { - if (tStartDecode(pDecoder) < 0) return -1; - if (tDecodeSVAlterTbReqCommon(pDecoder, pReq) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartDecode(pDecoder)); + TAOS_CHECK_EXIT(tDecodeSVAlterTbReqCommon(pDecoder, pReq)); pReq->ctimeMs = 0; if (!tDecodeIsEnd(pDecoder)) { - if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->ctimeMs)); } if (!tDecodeIsEnd(pDecoder)) { - if (tDecodeI8(pDecoder, &pReq->source) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->source)); } tEndDecode(pDecoder); - return 0; +_exit: + return code; } int32_t tDecodeSVAlterTbReqSetCtime(SDecoder *pDecoder, SVAlterTbReq *pReq, int64_t ctimeMs) { - if (tStartDecode(pDecoder) < 0) return -1; - if (tDecodeSVAlterTbReqCommon(pDecoder, pReq) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartDecode(pDecoder)); + TAOS_CHECK_EXIT(tDecodeSVAlterTbReqCommon(pDecoder, pReq)); pReq->ctimeMs = 0; if (!tDecodeIsEnd(pDecoder)) { *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs; - if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->ctimeMs)); } tEndDecode(pDecoder); - return 0; +_exit: + return code; } int32_t tEncodeSVAlterTbRsp(SEncoder *pEncoder, const SVAlterTbRsp *pRsp) { - if (tStartEncode(pEncoder) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->code) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->pMeta ? 1 : 0) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartEncode(pEncoder)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->code)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->pMeta ? 1 : 0)); if (pRsp->pMeta) { - if (tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta)); } tEndEncode(pEncoder); - return 0; +_exit: + return code; } int32_t tDecodeSVAlterTbRsp(SDecoder *pDecoder, SVAlterTbRsp *pRsp) { int32_t meta = 0; - if (tStartDecode(pDecoder) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->code) < 0) return -1; - if (tDecodeI32(pDecoder, &meta) < 0) return -1; + int32_t code = 0; + int32_t lino; + TAOS_CHECK_EXIT(tStartDecode(pDecoder)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->code)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &meta)); if (meta) { pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); if (NULL == pRsp->pMeta) return -1; - if (tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta)); } tEndDecode(pDecoder); - return 0; +_exit: + return code; } -// int32_t tDeserializeSVAlterTbRsp(void *buf, int32_t bufLen, SVAlterTbRsp *pRsp) { -// int32_t meta = 0; -// SDecoder decoder = {0}; -// tDecoderInit(&decoder, buf, bufLen); - -// if (tStartDecode(&decoder) < 0) return -1; -// if (tDecodeI32(&decoder, &pRsp->code) < 0) return -1; -// if (tDecodeI32(&decoder, &meta) < 0) return -1; -// if (meta) { -// pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); -// if (NULL == pRsp->pMeta) return -1; -// if (tDecodeSTableMetaRsp(&decoder, pRsp->pMeta) < 0) return -1; -// } -// tEndDecode(&decoder); -// tDecoderClear(&decoder); -// return 0; -// } - int32_t tEncodeSMAlterStbRsp(SEncoder *pEncoder, const SMAlterStbRsp *pRsp) { - if (tStartEncode(pEncoder) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->pMeta->pSchemas ? 1 : 0) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartEncode(pEncoder)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->pMeta->pSchemas ? 1 : 0)); if (pRsp->pMeta->pSchemas) { - if (tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta)); } tEndEncode(pEncoder); - return 0; +_exit: + return code; } int32_t tDecodeSMAlterStbRsp(SDecoder *pDecoder, SMAlterStbRsp *pRsp) { int32_t meta = 0; - if (tStartDecode(pDecoder) < 0) return -1; - if (tDecodeI32(pDecoder, &meta) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartDecode(pDecoder)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &meta)); if (meta) { pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); if (NULL == pRsp->pMeta) return -1; - if (tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta)); } tEndDecode(pDecoder); - return 0; +_exit: + return code; } -// int32_t tDeserializeSMAlterStbRsp(void *buf, int32_t bufLen, SMAlterStbRsp *pRsp) { -// int32_t meta = 0; -// SDecoder decoder = {0}; -// tDecoderInit(&decoder, buf, bufLen); - -// if (tStartDecode(&decoder) < 0) return -1; -// if (tDecodeI32(&decoder, &meta) < 0) return -1; -// if (meta) { -// pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); -// if (NULL == pRsp->pMeta) return -1; -// if (tDecodeSTableMetaRsp(&decoder, pRsp->pMeta) < 0) return -1; -// } -// tEndDecode(&decoder); -// tDecoderClear(&decoder); -// return 0; -// } - void tFreeSMAlterStbRsp(SMAlterStbRsp *pRsp) { if (NULL == pRsp) { return; @@ -10370,45 +10296,40 @@ void tFreeSMAlterStbRsp(SMAlterStbRsp *pRsp) { } int32_t tEncodeSMCreateStbRsp(SEncoder *pEncoder, const SMCreateStbRsp *pRsp) { - if (tStartEncode(pEncoder) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->pMeta->pSchemas ? 1 : 0) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartEncode(pEncoder)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->pMeta->pSchemas ? 1 : 0)); if (pRsp->pMeta->pSchemas) { - if (tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSTableMetaRsp(pEncoder, pRsp->pMeta)); } tEndEncode(pEncoder); - return 0; + +_exit: + return code; } int32_t tDecodeSMCreateStbRsp(SDecoder *pDecoder, SMCreateStbRsp *pRsp) { int32_t meta = 0; - if (tStartDecode(pDecoder) < 0) return -1; - if (tDecodeI32(pDecoder, &meta) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartDecode(pDecoder)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &meta)); if (meta) { pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); - if (NULL == pRsp->pMeta) return -1; - if (tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta) < 0) return -1; + if (NULL == pRsp->pMeta) { + TAOS_CHECK_EXIT(terrno); + } + TAOS_CHECK_EXIT(tDecodeSTableMetaRsp(pDecoder, pRsp->pMeta)); } tEndDecode(pDecoder); - return 0; + +_exit: + return code; } -// int32_t tDeserializeSMCreateStbRsp(void *buf, int32_t bufLen, SMCreateStbRsp *pRsp) { -// int32_t meta = 0; -// SDecoder decoder = {0}; -// tDecoderInit(&decoder, buf, bufLen); - -// if (tStartDecode(&decoder) < 0) return -1; -// if (tDecodeI32(&decoder, &meta) < 0) return -1; -// if (meta) { -// pRsp->pMeta = taosMemoryCalloc(1, sizeof(STableMetaRsp)); -// if (NULL == pRsp->pMeta) return -1; -// if (tDecodeSTableMetaRsp(&decoder, pRsp->pMeta) < 0) return -1; -// } -// tEndDecode(&decoder); -// tDecoderClear(&decoder); -// return 0; -// } - void tFreeSMCreateStbRsp(SMCreateStbRsp *pRsp) { if (NULL == pRsp) { return; @@ -10422,51 +10343,59 @@ void tFreeSMCreateStbRsp(SMCreateStbRsp *pRsp) { } int32_t tEncodeSTqOffsetVal(SEncoder *pEncoder, const STqOffsetVal *pOffsetVal) { + int32_t code = 0; + int32_t lino; + int8_t type = pOffsetVal->type < 0 ? pOffsetVal->type : (TQ_OFFSET_VERSION << 4) | pOffsetVal->type; - if (tEncodeI8(pEncoder, type) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, type)); if (pOffsetVal->type == TMQ_OFFSET__SNAPSHOT_DATA || pOffsetVal->type == TMQ_OFFSET__SNAPSHOT_META) { - if (tEncodeI64(pEncoder, pOffsetVal->uid) < 0) return -1; - if (tEncodeI64(pEncoder, pOffsetVal->ts) < 0) return -1; - if (tEncodeI8(pEncoder, pOffsetVal->primaryKey.type) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pOffsetVal->uid)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pOffsetVal->ts)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pOffsetVal->primaryKey.type)); if (IS_VAR_DATA_TYPE(pOffsetVal->primaryKey.type)) { - if (tEncodeBinary(pEncoder, pOffsetVal->primaryKey.pData, pOffsetVal->primaryKey.nData) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeBinary(pEncoder, pOffsetVal->primaryKey.pData, pOffsetVal->primaryKey.nData)); } else { - if (tEncodeI64(pEncoder, pOffsetVal->primaryKey.val) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pOffsetVal->primaryKey.val)); } } else if (pOffsetVal->type == TMQ_OFFSET__LOG) { - if (tEncodeI64(pEncoder, pOffsetVal->version) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pOffsetVal->version)); } else { // do nothing } - return 0; +_exit: + return code; } int32_t tDecodeSTqOffsetVal(SDecoder *pDecoder, STqOffsetVal *pOffsetVal) { - if (tDecodeI8(pDecoder, &pOffsetVal->type) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pOffsetVal->type)); int8_t offsetVersion = 0; if (pOffsetVal->type > 0) { offsetVersion = (pOffsetVal->type >> 4); pOffsetVal->type = pOffsetVal->type & 0x0F; } if (pOffsetVal->type == TMQ_OFFSET__SNAPSHOT_DATA || pOffsetVal->type == TMQ_OFFSET__SNAPSHOT_META) { - if (tDecodeI64(pDecoder, &pOffsetVal->uid) < 0) return -1; - if (tDecodeI64(pDecoder, &pOffsetVal->ts) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pOffsetVal->uid)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pOffsetVal->ts)); if (offsetVersion >= TQ_OFFSET_VERSION) { - if (tDecodeI8(pDecoder, &pOffsetVal->primaryKey.type) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pOffsetVal->primaryKey.type)); if (IS_VAR_DATA_TYPE(pOffsetVal->primaryKey.type)) { if (tDecodeBinaryAlloc32(pDecoder, (void **)&pOffsetVal->primaryKey.pData, &pOffsetVal->primaryKey.nData) < 0) return -1; } else { - if (tDecodeI64(pDecoder, &pOffsetVal->primaryKey.val) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pOffsetVal->primaryKey.val)); } } } else if (pOffsetVal->type == TMQ_OFFSET__LOG) { - if (tDecodeI64(pDecoder, &pOffsetVal->version) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pOffsetVal->version)); } else { // do nothing } - return 0; +_exit: + return code; } void tFormatOffset(char *buf, int32_t maxLen, const STqOffsetVal *pVal) { @@ -10538,250 +10467,294 @@ void tDeleteSTqOffset(void *param) { } int32_t tEncodeSTqOffset(SEncoder *pEncoder, const STqOffset *pOffset) { - if (tEncodeSTqOffsetVal(pEncoder, &pOffset->val) < 0) return -1; - if (tEncodeCStr(pEncoder, pOffset->subKey) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeSTqOffsetVal(pEncoder, &pOffset->val)); + TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pOffset->subKey)); return 0; } int32_t tDecodeSTqOffset(SDecoder *pDecoder, STqOffset *pOffset) { - if (tDecodeSTqOffsetVal(pDecoder, &pOffset->val) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pOffset->subKey) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeSTqOffsetVal(pDecoder, &pOffset->val)); + TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pOffset->subKey)); return 0; } int32_t tEncodeMqVgOffset(SEncoder *pEncoder, const SMqVgOffset *pOffset) { - if (tEncodeSTqOffset(pEncoder, &pOffset->offset) < 0) return -1; - if (tEncodeI64(pEncoder, pOffset->consumerId) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeSTqOffset(pEncoder, &pOffset->offset)); + TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pOffset->consumerId)); return 0; } int32_t tDecodeMqVgOffset(SDecoder *pDecoder, SMqVgOffset *pOffset) { - if (tDecodeSTqOffset(pDecoder, &pOffset->offset) < 0) return -1; - if (tDecodeI64(pDecoder, &pOffset->consumerId) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeSTqOffset(pDecoder, &pOffset->offset)); + TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pOffset->consumerId)); return 0; } int32_t tEncodeSTqCheckInfo(SEncoder *pEncoder, const STqCheckInfo *pInfo) { - if (tEncodeCStr(pEncoder, pInfo->topic) < 0) return -1; - if (tEncodeI64(pEncoder, pInfo->ntbUid) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pInfo->topic)); + TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pInfo->ntbUid)); int32_t sz = taosArrayGetSize(pInfo->colIdList); - if (tEncodeI32(pEncoder, sz) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeI32(pEncoder, sz)); for (int32_t i = 0; i < sz; i++) { int16_t colId = *(int16_t *)taosArrayGet(pInfo->colIdList, i); - if (tEncodeI16(pEncoder, colId) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeI16(pEncoder, colId)); } return pEncoder->pos; } int32_t tDecodeSTqCheckInfo(SDecoder *pDecoder, STqCheckInfo *pInfo) { - if (tDecodeCStrTo(pDecoder, pInfo->topic) < 0) return -1; - if (tDecodeI64(pDecoder, &pInfo->ntbUid) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pInfo->topic)); + TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pInfo->ntbUid)); int32_t sz = 0; - if (tDecodeI32(pDecoder, &sz) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &sz)); pInfo->colIdList = taosArrayInit(sz, sizeof(int16_t)); - if (pInfo->colIdList == NULL) return -1; + if (pInfo->colIdList == NULL) { + TAOS_CHECK_RETURN(terrno); + } for (int32_t i = 0; i < sz; i++) { int16_t colId = 0; - if (tDecodeI16(pDecoder, &colId) < 0) return -1; - if (taosArrayPush(pInfo->colIdList, &colId) == NULL) return -1; + TAOS_CHECK_RETURN(tDecodeI16(pDecoder, &colId)); + if (taosArrayPush(pInfo->colIdList, &colId) == NULL) { + TAOS_CHECK_RETURN(terrno); + } } return 0; } void tDeleteSTqCheckInfo(STqCheckInfo *pInfo) { taosArrayDestroy(pInfo->colIdList); } int32_t tEncodeSMqRebVgReq(SEncoder *pCoder, const SMqRebVgReq *pReq) { - if (tStartEncode(pCoder) < 0) return -1; - if (tEncodeI64(pCoder, pReq->leftForVer) < 0) return -1; - if (tEncodeI32(pCoder, pReq->vgId) < 0) return -1; - if (tEncodeI64(pCoder, pReq->oldConsumerId) < 0) return -1; - if (tEncodeI64(pCoder, pReq->newConsumerId) < 0) return -1; - if (tEncodeCStr(pCoder, pReq->subKey) < 0) return -1; - if (tEncodeI8(pCoder, pReq->subType) < 0) return -1; - if (tEncodeI8(pCoder, pReq->withMeta) < 0) return -1; + TAOS_CHECK_RETURN(tStartEncode(pCoder)); + TAOS_CHECK_RETURN(tEncodeI64(pCoder, pReq->leftForVer)); + TAOS_CHECK_RETURN(tEncodeI32(pCoder, pReq->vgId)); + TAOS_CHECK_RETURN(tEncodeI64(pCoder, pReq->oldConsumerId)); + TAOS_CHECK_RETURN(tEncodeI64(pCoder, pReq->newConsumerId)); + TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pReq->subKey)); + TAOS_CHECK_RETURN(tEncodeI8(pCoder, pReq->subType)); + TAOS_CHECK_RETURN(tEncodeI8(pCoder, pReq->withMeta)); if (pReq->subType == TOPIC_SUB_TYPE__COLUMN) { - if (tEncodeCStr(pCoder, pReq->qmsg) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pReq->qmsg)); } else if (pReq->subType == TOPIC_SUB_TYPE__TABLE) { - if (tEncodeI64(pCoder, pReq->suid) < 0) return -1; - if (tEncodeCStr(pCoder, pReq->qmsg) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeI64(pCoder, pReq->suid)); + TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pReq->qmsg)); } tEndEncode(pCoder); return 0; } int32_t tDecodeSMqRebVgReq(SDecoder *pCoder, SMqRebVgReq *pReq) { - if (tStartDecode(pCoder) < 0) return -1; + int32_t code = 0; + int32_t lino; - if (tDecodeI64(pCoder, &pReq->leftForVer) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(pCoder)); - if (tDecodeI32(pCoder, &pReq->vgId) < 0) return -1; - if (tDecodeI64(pCoder, &pReq->oldConsumerId) < 0) return -1; - if (tDecodeI64(pCoder, &pReq->newConsumerId) < 0) return -1; - if (tDecodeCStrTo(pCoder, pReq->subKey) < 0) return -1; - if (tDecodeI8(pCoder, &pReq->subType) < 0) return -1; - if (tDecodeI8(pCoder, &pReq->withMeta) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pReq->leftForVer)); + + TAOS_CHECK_EXIT(tDecodeI32(pCoder, &pReq->vgId)); + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pReq->oldConsumerId)); + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pReq->newConsumerId)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pCoder, pReq->subKey)); + TAOS_CHECK_EXIT(tDecodeI8(pCoder, &pReq->subType)); + TAOS_CHECK_EXIT(tDecodeI8(pCoder, &pReq->withMeta)); if (pReq->subType == TOPIC_SUB_TYPE__COLUMN) { - if (tDecodeCStr(pCoder, &pReq->qmsg) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pCoder, &pReq->qmsg)); } else if (pReq->subType == TOPIC_SUB_TYPE__TABLE) { - if (tDecodeI64(pCoder, &pReq->suid) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pReq->suid)); if (!tDecodeIsEnd(pCoder)) { - if (tDecodeCStr(pCoder, &pReq->qmsg) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStr(pCoder, &pReq->qmsg)); } } tEndDecode(pCoder); - return 0; +_exit: + return code; } int32_t tEncodeDeleteRes(SEncoder *pCoder, const SDeleteRes *pRes) { int32_t nUid = taosArrayGetSize(pRes->uidList); + int32_t code = 0; + int32_t lino; - if (tEncodeU64(pCoder, pRes->suid) < 0) return -1; - if (tEncodeI32v(pCoder, nUid) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeU64(pCoder, pRes->suid)); + TAOS_CHECK_EXIT(tEncodeI32v(pCoder, nUid)); for (int32_t iUid = 0; iUid < nUid; iUid++) { - if (tEncodeU64(pCoder, *(uint64_t *)taosArrayGet(pRes->uidList, iUid)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeU64(pCoder, *(uint64_t *)taosArrayGet(pRes->uidList, iUid))); } - if (tEncodeI64(pCoder, pRes->skey) < 0) return -1; - if (tEncodeI64(pCoder, pRes->ekey) < 0) return -1; - if (tEncodeI64v(pCoder, pRes->affectedRows) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pRes->skey)); + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pRes->ekey)); + TAOS_CHECK_EXIT(tEncodeI64v(pCoder, pRes->affectedRows)); - if (tEncodeCStr(pCoder, pRes->tableFName) < 0) return -1; - if (tEncodeCStr(pCoder, pRes->tsColName) < 0) return -1; - if (tEncodeI64(pCoder, pRes->ctimeMs) < 0) return -1; - if (tEncodeI8(pCoder, pRes->source) < 0) return -1; - return 0; + TAOS_CHECK_EXIT(tEncodeCStr(pCoder, pRes->tableFName)); + TAOS_CHECK_EXIT(tEncodeCStr(pCoder, pRes->tsColName)); + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pRes->ctimeMs)); + TAOS_CHECK_EXIT(tEncodeI8(pCoder, pRes->source)); + +_exit: + return code; } int32_t tDecodeDeleteRes(SDecoder *pCoder, SDeleteRes *pRes) { int32_t nUid; uint64_t uid; + int32_t code = 0; + int32_t lino; - if (tDecodeU64(pCoder, &pRes->suid) < 0) return -1; - if (tDecodeI32v(pCoder, &nUid) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeU64(pCoder, &pRes->suid)); + TAOS_CHECK_EXIT(tDecodeI32v(pCoder, &nUid)); for (int32_t iUid = 0; iUid < nUid; iUid++) { - if (tDecodeU64(pCoder, &uid) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeU64(pCoder, &uid)); if (pRes->uidList) { - if (taosArrayPush(pRes->uidList, &uid) == NULL) return -1; + if (taosArrayPush(pRes->uidList, &uid) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - if (tDecodeI64(pCoder, &pRes->skey) < 0) return -1; - if (tDecodeI64(pCoder, &pRes->ekey) < 0) return -1; - if (tDecodeI64v(pCoder, &pRes->affectedRows) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pRes->skey)); + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pRes->ekey)); + TAOS_CHECK_EXIT(tDecodeI64v(pCoder, &pRes->affectedRows)); - if (tDecodeCStrTo(pCoder, pRes->tableFName) < 0) return -1; - if (tDecodeCStrTo(pCoder, pRes->tsColName) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeCStrTo(pCoder, pRes->tableFName)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pCoder, pRes->tsColName)); pRes->ctimeMs = 0; if (!tDecodeIsEnd(pCoder)) { - if (tDecodeI64(pCoder, &pRes->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pRes->ctimeMs)); } if (!tDecodeIsEnd(pCoder)) { - if (tDecodeI8(pCoder, &pRes->source) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI8(pCoder, &pRes->source)); } - return 0; + +_exit: + return code; } int32_t tEncodeMqMetaRsp(SEncoder *pEncoder, const SMqMetaRsp *pRsp) { - if (tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset) < 0) return -1; - if (tEncodeI16(pEncoder, pRsp->resMsgType)) return -1; - if (tEncodeBinary(pEncoder, pRsp->metaRsp, pRsp->metaRspLen)) return -1; + TAOS_CHECK_RETURN(tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset)); + TAOS_CHECK_RETURN(tEncodeI16(pEncoder, pRsp->resMsgType)); + TAOS_CHECK_RETURN(tEncodeBinary(pEncoder, pRsp->metaRsp, pRsp->metaRspLen)); return 0; } int32_t tDecodeMqMetaRsp(SDecoder *pDecoder, SMqMetaRsp *pRsp) { - if (tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset) < 0) return -1; - if (tDecodeI16(pDecoder, &pRsp->resMsgType) < 0) return -1; - if (tDecodeBinaryAlloc(pDecoder, &pRsp->metaRsp, (uint64_t *)&pRsp->metaRspLen) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset)); + TAOS_CHECK_RETURN(tDecodeI16(pDecoder, &pRsp->resMsgType)); + TAOS_CHECK_RETURN(tDecodeBinaryAlloc(pDecoder, &pRsp->metaRsp, (uint64_t *)&pRsp->metaRspLen)); return 0; } void tDeleteMqMetaRsp(SMqMetaRsp *pRsp) { taosMemoryFree(pRsp->metaRsp); } int32_t tEncodeMqDataRspCommon(SEncoder *pEncoder, const SMqDataRspCommon *pRsp) { - if (tEncodeSTqOffsetVal(pEncoder, &pRsp->reqOffset) < 0) return -1; - if (tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->blockNum) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeSTqOffsetVal(pEncoder, &pRsp->reqOffset)); + TAOS_CHECK_EXIT(tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->blockNum)); if (pRsp->blockNum != 0) { - if (tEncodeI8(pEncoder, pRsp->withTbName) < 0) return -1; - if (tEncodeI8(pEncoder, pRsp->withSchema) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pRsp->withTbName)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pRsp->withSchema)); for (int32_t i = 0; i < pRsp->blockNum; i++) { int32_t bLen = *(int32_t *)taosArrayGet(pRsp->blockDataLen, i); void *data = taosArrayGetP(pRsp->blockData, i); - if (tEncodeBinary(pEncoder, (const uint8_t *)data, bLen) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeBinary(pEncoder, (const uint8_t *)data, bLen)); if (pRsp->withSchema) { SSchemaWrapper *pSW = (SSchemaWrapper *)taosArrayGetP(pRsp->blockSchema, i); - if (tEncodeSSchemaWrapper(pEncoder, pSW) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSchemaWrapper(pEncoder, pSW)); } if (pRsp->withTbName) { char *tbName = (char *)taosArrayGetP(pRsp->blockTbName, i); - if (tEncodeCStr(pEncoder, tbName) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, tbName)); } } } - return 0; + +_exit: + return code; } int32_t tEncodeMqDataRsp(SEncoder *pEncoder, const void *pRsp) { - if (tEncodeMqDataRspCommon(pEncoder, pRsp) < 0) return -1; - if (tEncodeI64(pEncoder, ((SMqDataRsp *)pRsp)->sleepTime) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeMqDataRspCommon(pEncoder, pRsp)); + TAOS_CHECK_RETURN(tEncodeI64(pEncoder, ((SMqDataRsp *)pRsp)->sleepTime)); return 0; } int32_t tDecodeMqDataRspCommon(SDecoder *pDecoder, SMqDataRspCommon *pRsp) { - if (tDecodeSTqOffsetVal(pDecoder, &pRsp->reqOffset) < 0) return -1; - if (tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->blockNum) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeSTqOffsetVal(pDecoder, &pRsp->reqOffset)); + TAOS_CHECK_EXIT(tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->blockNum)); if (pRsp->blockNum != 0) { - if ((pRsp->blockData = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) return -1; - if ((pRsp->blockDataLen = taosArrayInit(pRsp->blockNum, sizeof(int32_t))) == NULL) return -1; - if (tDecodeI8(pDecoder, &pRsp->withTbName) < 0) return -1; - if (tDecodeI8(pDecoder, &pRsp->withSchema) < 0) return -1; + if ((pRsp->blockData = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + if ((pRsp->blockDataLen = taosArrayInit(pRsp->blockNum, sizeof(int32_t))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pRsp->withTbName)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pRsp->withSchema)); if (pRsp->withTbName) { - if ((pRsp->blockTbName = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) return -1; + if ((pRsp->blockTbName = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } if (pRsp->withSchema) { - if ((pRsp->blockSchema = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) return -1; + if ((pRsp->blockSchema = taosArrayInit(pRsp->blockNum, sizeof(void *))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } for (int32_t i = 0; i < pRsp->blockNum; i++) { void *data; uint64_t bLen; - if (tDecodeBinaryAlloc(pDecoder, &data, &bLen) < 0) return -1; - if (taosArrayPush(pRsp->blockData, &data) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeBinaryAlloc(pDecoder, &data, &bLen)); + if (taosArrayPush(pRsp->blockData, &data) == NULL) { + TAOS_CHECK_EXIT(terrno); + } int32_t len = bLen; - if (taosArrayPush(pRsp->blockDataLen, &len) == NULL) return -1; + if (taosArrayPush(pRsp->blockDataLen, &len) == NULL) { + TAOS_CHECK_EXIT(terrno); + } if (pRsp->withSchema) { SSchemaWrapper *pSW = (SSchemaWrapper *)taosMemoryCalloc(1, sizeof(SSchemaWrapper)); - if (pSW == NULL) return -1; - if (tDecodeSSchemaWrapper(pDecoder, pSW) < 0) { + if (pSW == NULL) { + TAOS_CHECK_EXIT(terrno); + } + + if ((code = tDecodeSSchemaWrapper(pDecoder, pSW))) { taosMemoryFree(pSW); - return -1; + goto _exit; } if (taosArrayPush(pRsp->blockSchema, &pSW) == NULL) { taosMemoryFree(pSW); - return -1; + TAOS_CHECK_EXIT(terrno); } } if (pRsp->withTbName) { char *tbName; - if (tDecodeCStrAlloc(pDecoder, &tbName) < 0) return -1; - if (taosArrayPush(pRsp->blockTbName, &tbName) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeCStrAlloc(pDecoder, &tbName)); + if (taosArrayPush(pRsp->blockTbName, &tbName) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } } - return 0; +_exit: + return code; } int32_t tDecodeMqDataRsp(SDecoder *pDecoder, void *pRsp) { - if (tDecodeMqDataRspCommon(pDecoder, pRsp) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeMqDataRspCommon(pDecoder, pRsp)); if (!tDecodeIsEnd(pDecoder)) { - if (tDecodeI64(pDecoder, &((SMqDataRsp *)pRsp)->sleepTime) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &((SMqDataRsp *)pRsp)->sleepTime)); } return 0; @@ -10804,39 +10777,55 @@ static void tDeleteMqDataRspCommon(void *rsp) { void tDeleteMqDataRsp(void *rsp) { tDeleteMqDataRspCommon(rsp); } int32_t tEncodeSTaosxRsp(SEncoder *pEncoder, const void *rsp) { - if (tEncodeMqDataRspCommon(pEncoder, rsp) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeMqDataRspCommon(pEncoder, rsp)); const STaosxRsp *pRsp = (const STaosxRsp *)rsp; - if (tEncodeI32(pEncoder, pRsp->createTableNum) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->createTableNum)); if (pRsp->createTableNum) { for (int32_t i = 0; i < pRsp->createTableNum; i++) { void *createTableReq = taosArrayGetP(pRsp->createTableReq, i); int32_t createTableLen = *(int32_t *)taosArrayGet(pRsp->createTableLen, i); - if (tEncodeBinary(pEncoder, createTableReq, createTableLen) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeBinary(pEncoder, createTableReq, createTableLen)); } } - return 0; +_exit: + return code; } int32_t tDecodeSTaosxRsp(SDecoder *pDecoder, void *rsp) { - if (tDecodeMqDataRspCommon(pDecoder, rsp) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeMqDataRspCommon(pDecoder, rsp)); STaosxRsp *pRsp = (STaosxRsp *)rsp; - if (tDecodeI32(pDecoder, &pRsp->createTableNum) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->createTableNum)); if (pRsp->createTableNum) { - if ((pRsp->createTableLen = taosArrayInit(pRsp->createTableNum, sizeof(int32_t))) == NULL) return -1; - if ((pRsp->createTableReq = taosArrayInit(pRsp->createTableNum, sizeof(void *))) == NULL) return -1; + if ((pRsp->createTableLen = taosArrayInit(pRsp->createTableNum, sizeof(int32_t))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + if ((pRsp->createTableReq = taosArrayInit(pRsp->createTableNum, sizeof(void *))) == NULL) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < pRsp->createTableNum; i++) { void *pCreate = NULL; uint64_t len = 0; - if (tDecodeBinaryAlloc(pDecoder, &pCreate, &len) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeBinaryAlloc(pDecoder, &pCreate, &len)); int32_t l = (int32_t)len; - if (taosArrayPush(pRsp->createTableLen, &l) == NULL) return -1; - if (taosArrayPush(pRsp->createTableReq, &pCreate) == NULL) return -1; + if (taosArrayPush(pRsp->createTableLen, &l) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + if (taosArrayPush(pRsp->createTableReq, &pCreate) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - return 0; +_exit: + return code; } void tDeleteSTaosxRsp(void *rsp) { @@ -10850,101 +10839,126 @@ void tDeleteSTaosxRsp(void *rsp) { } int32_t tEncodeSSingleDeleteReq(SEncoder *pEncoder, const SSingleDeleteReq *pReq) { - if (tEncodeCStr(pEncoder, pReq->tbname) < 0) return -1; - if (tEncodeI64(pEncoder, pReq->startTs) < 0) return -1; - if (tEncodeI64(pEncoder, pReq->endTs) < 0) return -1; + TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pReq->tbname)); + TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pReq->startTs)); + TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pReq->endTs)); return 0; } int32_t tDecodeSSingleDeleteReq(SDecoder *pDecoder, SSingleDeleteReq *pReq) { - if (tDecodeCStrTo(pDecoder, pReq->tbname) < 0) return -1; - if (tDecodeI64(pDecoder, &pReq->startTs) < 0) return -1; - if (tDecodeI64(pDecoder, &pReq->endTs) < 0) return -1; + TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pReq->tbname)); + TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pReq->startTs)); + TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pReq->endTs)); return 0; } int32_t tEncodeSBatchDeleteReq(SEncoder *pEncoder, const SBatchDeleteReq *pReq) { - if (tEncodeI64(pEncoder, pReq->suid) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pReq->suid)); int32_t sz = taosArrayGetSize(pReq->deleteReqs); - if (tEncodeI32(pEncoder, sz) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, sz)); for (int32_t i = 0; i < sz; i++) { SSingleDeleteReq *pOneReq = taosArrayGet(pReq->deleteReqs, i); - if (tEncodeSSingleDeleteReq(pEncoder, pOneReq) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSingleDeleteReq(pEncoder, pOneReq)); } - if (tEncodeI64(pEncoder, pReq->ctimeMs) < 0) return -1; - if (tEncodeI8(pEncoder, pReq->level) < 0) return -1; - return 0; + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pReq->ctimeMs)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pReq->level)); +_exit: + return code; } static int32_t tDecodeSBatchDeleteReqCommon(SDecoder *pDecoder, SBatchDeleteReq *pReq) { - if (tDecodeI64(pDecoder, &pReq->suid) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->suid)); int32_t sz; - if (tDecodeI32(pDecoder, &sz) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &sz)); pReq->deleteReqs = taosArrayInit(0, sizeof(SSingleDeleteReq)); - if (pReq->deleteReqs == NULL) return -1; + if (pReq->deleteReqs == NULL) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < sz; i++) { SSingleDeleteReq deleteReq; - if (tDecodeSSingleDeleteReq(pDecoder, &deleteReq) < 0) return -1; - if (taosArrayPush(pReq->deleteReqs, &deleteReq) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSSingleDeleteReq(pDecoder, &deleteReq)); + if (taosArrayPush(pReq->deleteReqs, &deleteReq) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } - return 0; +_exit: + return code; } int32_t tDecodeSBatchDeleteReq(SDecoder *pDecoder, SBatchDeleteReq *pReq) { - if (tDecodeSBatchDeleteReqCommon(pDecoder, pReq)) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeSBatchDeleteReqCommon(pDecoder, pReq)); pReq->ctimeMs = 0; if (!tDecodeIsEnd(pDecoder)) { - if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->ctimeMs)); } if (!tDecodeIsEnd(pDecoder)) { - if (tDecodeI8(pDecoder, &pReq->level) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pReq->level)); } - return 0; + +_exit: + return code; } int32_t tDecodeSBatchDeleteReqSetCtime(SDecoder *pDecoder, SBatchDeleteReq *pReq, int64_t ctimeMs) { - if (tDecodeSBatchDeleteReqCommon(pDecoder, pReq)) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeSBatchDeleteReqCommon(pDecoder, pReq)); pReq->ctimeMs = 0; if (!tDecodeIsEnd(pDecoder)) { *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs; - if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->ctimeMs)); } - return 0; + +_exit: + return code; } static int32_t tEncodeSSubmitTbData(SEncoder *pCoder, const SSubmitTbData *pSubmitTbData) { - if (tStartEncode(pCoder) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tStartEncode(pCoder)); int32_t flags = pSubmitTbData->flags | ((SUBMIT_REQUEST_VERSION) << 8); - if (tEncodeI32v(pCoder, flags) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32v(pCoder, flags)); // auto create table if (pSubmitTbData->flags & SUBMIT_REQ_AUTO_CREATE_TABLE) { if (!(pSubmitTbData->pCreateTbReq)) { return TSDB_CODE_INVALID_MSG; } - if (tEncodeSVCreateTbReq(pCoder, pSubmitTbData->pCreateTbReq) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSVCreateTbReq(pCoder, pSubmitTbData->pCreateTbReq)); } // submit data - if (tEncodeI64(pCoder, pSubmitTbData->suid) < 0) return -1; - if (tEncodeI64(pCoder, pSubmitTbData->uid) < 0) return -1; - if (tEncodeI32v(pCoder, pSubmitTbData->sver) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pSubmitTbData->suid)); + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pSubmitTbData->uid)); + TAOS_CHECK_EXIT(tEncodeI32v(pCoder, pSubmitTbData->sver)); if (pSubmitTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) { uint64_t nColData = TARRAY_SIZE(pSubmitTbData->aCol); SColData *aColData = (SColData *)TARRAY_DATA(pSubmitTbData->aCol); - if (tEncodeU64v(pCoder, nColData) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeU64v(pCoder, nColData)); for (uint64_t i = 0; i < nColData; i++) { pCoder->pos += tPutColData(SUBMIT_REQUEST_VERSION, pCoder->data ? pCoder->data + pCoder->pos : NULL, &aColData[i]); } } else { - if (tEncodeU64v(pCoder, TARRAY_SIZE(pSubmitTbData->aRowP)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeU64v(pCoder, TARRAY_SIZE(pSubmitTbData->aRowP))); SRow **rows = (SRow **)TARRAY_DATA(pSubmitTbData->aRowP); for (int32_t iRow = 0; iRow < TARRAY_SIZE(pSubmitTbData->aRowP); ++iRow) { @@ -10952,10 +10966,11 @@ static int32_t tEncodeSSubmitTbData(SEncoder *pCoder, const SSubmitTbData *pSubm pCoder->pos += rows[iRow]->len; } } - if (tEncodeI64(pCoder, pSubmitTbData->ctimeMs) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI64(pCoder, pSubmitTbData->ctimeMs)); tEndEncode(pCoder); - return 0; +_exit: + return code; } static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbData) { From df0f71a31c8db9aca3fc4cc991c8f7313af38a03 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 5 Sep 2024 16:12:39 +0800 Subject: [PATCH 29/38] refactor: remove assert. --- source/libs/stream/src/streamDispatch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c index 36b35bd3f6..ad1866807a 100644 --- a/source/libs/stream/src/streamDispatch.c +++ b/source/libs/stream/src/streamDispatch.c @@ -752,8 +752,6 @@ int32_t streamDispatchStreamBlock(SStreamTask* pTask) { return 0; } - ASSERT(pTask->msgInfo.pData == NULL); - if (pTask->msgInfo.pData != NULL) { stFatal("s-task:%s not rsp data:%p exist, should not dispatch msg now", id, pTask->msgInfo.pData); } else { From ad5aa4b032a633c4efd2e9f71ae175a6588785e4 Mon Sep 17 00:00:00 2001 From: Jinqing Kuang Date: Thu, 5 Sep 2024 16:58:20 +0800 Subject: [PATCH 30/38] fix(query)[TD-31929]. Fix mem-leak caused by redundant allocations --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 34280326a0..0c61366513 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -1743,8 +1743,6 @@ static int32_t initRowMergeIfNeeded(STsdbReader* pReader, int64_t uid) { if (ps == NULL) { return terrno; } - - code = tsdbRowMergerInit(pMerger, ps); } return code; From 6fdc3d63f7a062d68e97f9ac81e7fcf4ffe6a88f Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Thu, 5 Sep 2024 17:11:38 +0800 Subject: [PATCH 31/38] fix: add debug assert --- source/common/src/tdatablock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 816bf3a757..34beb38879 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3011,6 +3011,7 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) { if (colSizes[col] <= 0 && !colDataIsNull_s(pColRes, 0) && pColRes->info.type != TSDB_DATA_TYPE_NULL) { uError("Invalid colSize:%d colIdx:%d colType:%d while encoding block", colSizes[col], col, pColRes->info.type); + ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return -1; } From 6b945732319bc88128b2214e4bbfb80b3088907e Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 5 Sep 2024 17:17:26 +0800 Subject: [PATCH 32/38] fix(stream): fix syntax error. --- source/libs/stream/src/streamExec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index 0ac37fd2b9..5bb9c993de 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -600,8 +600,8 @@ static void doRecordThroughput(STaskExecStatisInfo* pInfo, int64_t totalBlocks, double st, const char* id) { double el = (taosGetTimestampMs() - st) / 1000.0; - stDebug("s-task:%s batch of input blocks exec end, elapsed time:%.2fs, result size:%.2fMiB, numOfBlocks:%d", id, el, - SIZE_IN_MiB(totalSize), totalBlocks); + stDebug("s-task:%s batch of input blocks exec end, elapsed time:%.2fs, result size:%.2fMiB, numOfBlocks:%" PRId64, id, + el, SIZE_IN_MiB(totalSize), totalBlocks); pInfo->outputDataBlocks += totalBlocks; pInfo->outputDataSize += totalSize; From ff3db4cd9e537f3d1ab38b6f1e81e456f34f1a14 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Thu, 5 Sep 2024 17:32:27 +0800 Subject: [PATCH 33/38] fix(stream):set null for invalid column --- source/libs/executor/src/streamtimewindowoperator.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/libs/executor/src/streamtimewindowoperator.c b/source/libs/executor/src/streamtimewindowoperator.c index 8d5aa7104f..bedbdfa299 100644 --- a/source/libs/executor/src/streamtimewindowoperator.c +++ b/source/libs/executor/src/streamtimewindowoperator.c @@ -718,6 +718,11 @@ static void doBuildPullDataBlock(SArray* array, int32_t* pIndex, SSDataBlock* pB SColumnInfoData* pGroupId = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, GROUPID_COLUMN_INDEX); SColumnInfoData* pCalStartTs = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, CALCULATE_START_TS_COLUMN_INDEX); SColumnInfoData* pCalEndTs = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, CALCULATE_END_TS_COLUMN_INDEX); + SColumnInfoData* pTbName = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, TABLE_NAME_COLUMN_INDEX); + SColumnInfoData* pPrimaryKey = NULL; + if (taosArrayGetSize(pBlock->pDataBlock) > PRIMARY_KEY_COLUMN_INDEX) { + pPrimaryKey = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, PRIMARY_KEY_COLUMN_INDEX); + } for (; (*pIndex) < size; (*pIndex)++) { SPullWindowInfo* pWin = taosArrayGet(array, (*pIndex)); code = colDataSetVal(pStartTs, pBlock->info.rows, (const char*)&pWin->window.skey, false); @@ -735,6 +740,11 @@ static void doBuildPullDataBlock(SArray* array, int32_t* pIndex, SSDataBlock* pB code = colDataSetVal(pCalEndTs, pBlock->info.rows, (const char*)&pWin->calWin.ekey, false); QUERY_CHECK_CODE(code, lino, _end); + colDataSetNULL(pTbName, pBlock->info.rows); + if (pPrimaryKey != NULL) { + colDataSetNULL(pPrimaryKey, pBlock->info.rows); + } + pBlock->info.rows++; } if ((*pIndex) == size) { From 87eccf2e2cac28f3e171ad4c9d55ebf789a72acb Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 5 Sep 2024 17:43:23 +0800 Subject: [PATCH 34/38] fix(stmt/scalar): no regex checking for stmt placeholder --- source/libs/scalar/src/scalar.c | 46 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index ee79c9a66e..84f5e1de0a 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -74,7 +74,7 @@ int32_t sclConvertValueToSclParam(SValueNode *pValueNode, SScalarParam *out, int code = colDataSetVal(in.columnData, 0, nodesGetValueFromNode(pValueNode), false); if (code != TSDB_CODE_SUCCESS) { - goto _exit; + goto _exit; } code = colInfoDataEnsureCapacity(out->columnData, 1, true); @@ -91,7 +91,7 @@ _exit: } int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockList) { - SSDataBlock *pb = taosArrayGetP(pBlockList, 0); + SSDataBlock *pb = taosArrayGetP(pBlockList, 0); if (NULL == pb) { SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE); } @@ -839,8 +839,8 @@ int32_t sclExecLogic(SLogicConditionNode *node, SScalarCtx *ctx, SScalarParam *o } // 1=1 and tag_column = 1 - int32_t ind = (i >= params[m].numOfRows)? (params[m].numOfRows - 1):i; - char* p = colDataGetData(params[m].columnData, ind); + int32_t ind = (i >= params[m].numOfRows) ? (params[m].numOfRows - 1) : i; + char *p = colDataGetData(params[m].columnData, ind); GET_TYPED_DATA(value, bool, params[m].columnData->info.type, p); @@ -1029,7 +1029,7 @@ _return: EDealRes sclRewriteNullInOptr(SNode **pNode, SScalarCtx *ctx, EOperatorType opType) { if (opType <= OP_TYPE_CALC_MAX) { SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); return DEAL_RES_ERROR; @@ -1041,7 +1041,7 @@ EDealRes sclRewriteNullInOptr(SNode **pNode, SScalarCtx *ctx, EOperatorType opTy *pNode = (SNode *)res; } else { SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); return DEAL_RES_ERROR; @@ -1094,7 +1094,6 @@ static uint8_t sclGetOpValueNodeTsPrecision(SNode *pLeft, SNode *pRight) { return 0; } - int32_t sclConvertOpValueNodeTs(SOperatorNode *node) { if (node->pLeft && SCL_IS_VAR_VALUE_NODE(node->pLeft)) { if (node->pRight && (TSDB_DATA_TYPE_TIMESTAMP == ((SExprNode *)node->pRight)->resType.type)) { @@ -1105,13 +1104,12 @@ int32_t sclConvertOpValueNodeTs(SOperatorNode *node) { if (node->pLeft && (TSDB_DATA_TYPE_TIMESTAMP == ((SExprNode *)node->pLeft)->resType.type)) { if (SCL_IS_VAR_VALUE_NODE(node->pRight)) { SCL_ERR_RET(sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, node->pRight), - (SValueNode *)node->pRight)); + (SValueNode *)node->pRight)); } else if (QUERY_NODE_NODE_LIST == node->pRight->type) { SNode *pNode; FOREACH(pNode, ((SNodeListNode *)node->pRight)->pNodeList) { if (SCL_IS_VAR_VALUE_NODE(pNode)) { - SCL_ERR_RET( - sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, pNode), (SValueNode *)pNode)); + SCL_ERR_RET(sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, pNode), (SValueNode *)pNode)); } } } @@ -1120,7 +1118,6 @@ int32_t sclConvertOpValueNodeTs(SOperatorNode *node) { return TSDB_CODE_SUCCESS; } - int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node) { if (NULL == node->pCase) { return TSDB_CODE_SUCCESS; @@ -1140,7 +1137,7 @@ int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node) { FOREACH(pNode, node->pWhenThenList) { if (SCL_IS_VAR_VALUE_NODE(((SWhenThenNode *)pNode)->pWhen)) { SCL_ERR_RET(sclConvertToTsValueNode(((SExprNode *)node->pCase)->resType.precision, - (SValueNode *)((SWhenThenNode *)pNode)->pWhen)); + (SValueNode *)((SWhenThenNode *)pNode)->pWhen)); } } } @@ -1201,7 +1198,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { } SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); sclFreeParam(&output); @@ -1275,7 +1272,7 @@ EDealRes sclRewriteLogic(SNode **pNode, SScalarCtx *ctx) { } SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); sclFreeParam(&output); @@ -1346,7 +1343,7 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) { } SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); sclFreeParam(&output); @@ -1409,7 +1406,7 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { } SValueNode *res = NULL; - ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&res); + ctx->code = nodesMakeNode(QUERY_NODE_VALUE, (SNode **)&res); if (NULL == res) { sclError("make value node failed"); sclFreeParam(&output); @@ -1426,7 +1423,8 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { } else { int32_t type = output.columnData->info.type; if (IS_VAR_DATA_TYPE(type)) { // todo refactor - res->datum.p = taosMemoryCalloc(varDataTLen(output.columnData->pData) + 1, sizeof(char)); // add \0 to the end for print json value + res->datum.p = taosMemoryCalloc(varDataTLen(output.columnData->pData) + 1, + sizeof(char)); // add \0 to the end for print json value if (NULL == res->datum.p) { sclError("calloc %d failed", (int)(varDataTLen(output.columnData->pData) + 1)); sclFreeParam(&output); @@ -1683,8 +1681,7 @@ static int32_t sclGetMathOperatorResType(SOperatorNode *pOp) { SDataType rdt = ((SExprNode *)(pOp->pRight))->resType; if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) || - TSDB_DATA_TYPE_VARBINARY == ldt.type || - TSDB_DATA_TYPE_VARBINARY == rdt.type || + TSDB_DATA_TYPE_VARBINARY == ldt.type || TSDB_DATA_TYPE_VARBINARY == rdt.type || (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && (IS_VAR_DATA_TYPE(rdt.type) || IS_FLOAT_TYPE(rdt.type))) || (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && (IS_VAR_DATA_TYPE(ldt.type) || IS_FLOAT_TYPE(ldt.type)))) { return TSDB_CODE_TSC_INVALID_OPERATION; @@ -1720,13 +1717,14 @@ static int32_t sclGetCompOperatorResType(SOperatorNode *pOp) { return TSDB_CODE_TSC_INVALID_OPERATION; } SDataType rdt = ((SExprNode *)(pOp->pRight))->resType; - if (ldt.type == TSDB_DATA_TYPE_VARBINARY || !IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) || + if (ldt.type == TSDB_DATA_TYPE_VARBINARY || !IS_VAR_DATA_TYPE(ldt.type) || + QUERY_NODE_VALUE != nodeType(pOp->pRight) || (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) { return TSDB_CODE_TSC_INVALID_OPERATION; } - if (nodesIsMatchRegularOp(pOp)) { - SValueNode* node = (SValueNode*)(pOp->pRight); - if(checkRegexPattern(node->literal) != TSDB_CODE_SUCCESS){ + SValueNode *node = (SValueNode *)(pOp->pRight); + if (!node->placeholderNo && nodesIsMatchRegularOp(pOp)) { + if (checkRegexPattern(node->literal) != TSDB_CODE_SUCCESS) { return TSDB_CODE_PAR_REGULAR_EXPRESSION_ERROR; } } @@ -1762,7 +1760,7 @@ static int32_t sclGetBitwiseOperatorResType(SOperatorNode *pOp) { } SDataType ldt = ((SExprNode *)(pOp->pLeft))->resType; SDataType rdt = ((SExprNode *)(pOp->pRight))->resType; - if(TSDB_DATA_TYPE_VARBINARY == ldt.type || TSDB_DATA_TYPE_VARBINARY == rdt.type){ + if (TSDB_DATA_TYPE_VARBINARY == ldt.type || TSDB_DATA_TYPE_VARBINARY == rdt.type) { return TSDB_CODE_TSC_INVALID_OPERATION; } pOp->node.resType.type = TSDB_DATA_TYPE_BIGINT; From fc74db1c858f81695fb49a2620652c423bc30bf7 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 5 Sep 2024 18:39:54 +0800 Subject: [PATCH 35/38] more code --- source/common/src/tmsg.c | 889 +++++++++++++++++++++++++-------------- 1 file changed, 564 insertions(+), 325 deletions(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 349a928b41..1b10ba3226 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -10975,15 +10975,12 @@ _exit: static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbData) { int32_t code = 0; + int32_t lino; int32_t flags; uint8_t version; - if (tStartDecode(pCoder) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } - - if (tDecodeI32v(pCoder, &flags) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(pCoder)); + TAOS_CHECK_EXIT(tDecodeI32v(pCoder, &flags)); pSubmitTbData->flags = flags & 0xff; version = (flags >> 8) & 0xff; @@ -10991,41 +10988,25 @@ static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbDa if (pSubmitTbData->flags & SUBMIT_REQ_AUTO_CREATE_TABLE) { pSubmitTbData->pCreateTbReq = taosMemoryCalloc(1, sizeof(SVCreateTbReq)); if (pSubmitTbData->pCreateTbReq == NULL) { - goto _exit; + TAOS_CHECK_EXIT(terrno); } - if (tDecodeSVCreateTbReq(pCoder, pSubmitTbData->pCreateTbReq) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } + TAOS_CHECK_EXIT(tDecodeSVCreateTbReq(pCoder, pSubmitTbData->pCreateTbReq)); } // submit data - if (tDecodeI64(pCoder, &pSubmitTbData->suid) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } - if (tDecodeI64(pCoder, &pSubmitTbData->uid) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } - if (tDecodeI32v(pCoder, &pSubmitTbData->sver) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pSubmitTbData->suid)); + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pSubmitTbData->uid)); + TAOS_CHECK_EXIT(tDecodeI32v(pCoder, &pSubmitTbData->sver)); if (pSubmitTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) { uint64_t nColData; - if (tDecodeU64v(pCoder, &nColData) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } + TAOS_CHECK_EXIT(tDecodeU64v(pCoder, &nColData)); pSubmitTbData->aCol = taosArrayInit(nColData, sizeof(SColData)); if (pSubmitTbData->aCol == NULL) { - code = terrno; - goto _exit; + TAOS_CHECK_EXIT(terrno); } for (int32_t i = 0; i < nColData; ++i) { @@ -11033,19 +11014,18 @@ static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbDa } } else { uint64_t nRow; - if (tDecodeU64v(pCoder, &nRow) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } + TAOS_CHECK_EXIT(tDecodeU64v(pCoder, &nRow)); pSubmitTbData->aRowP = taosArrayInit(nRow, sizeof(SRow *)); if (pSubmitTbData->aRowP == NULL) { - code = terrno; - goto _exit; + TAOS_CHECK_EXIT(terrno); } for (int32_t iRow = 0; iRow < nRow; ++iRow) { SRow **ppRow = taosArrayReserve(pSubmitTbData->aRowP, 1); + if (ppRow == NULL) { + TAOS_CHECK_EXIT(terrno); + } *ppRow = (SRow *)(pCoder->data + pCoder->pos); pCoder->pos += (*ppRow)->len; @@ -11054,31 +11034,27 @@ static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbDa pSubmitTbData->ctimeMs = 0; if (!tDecodeIsEnd(pCoder)) { - if (tDecodeI64(pCoder, &pSubmitTbData->ctimeMs) < 0) { - code = TSDB_CODE_INVALID_MSG; - goto _exit; - } + TAOS_CHECK_EXIT(tDecodeI64(pCoder, &pSubmitTbData->ctimeMs)); } tEndDecode(pCoder); _exit: - if (code) { - // TODO: clear - } - return 0; + return code; } int32_t tEncodeSubmitReq(SEncoder *pCoder, const SSubmitReq2 *pReq) { - if (tStartEncode(pCoder) < 0) return -1; + int32_t code = 0; + int32_t lino; - if (tEncodeU64v(pCoder, taosArrayGetSize(pReq->aSubmitTbData)) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(pCoder)); + TAOS_CHECK_EXIT(tEncodeU64v(pCoder, taosArrayGetSize(pReq->aSubmitTbData))); for (uint64_t i = 0; i < taosArrayGetSize(pReq->aSubmitTbData); i++) { - if (tEncodeSSubmitTbData(pCoder, taosArrayGet(pReq->aSubmitTbData, i)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSubmitTbData(pCoder, taosArrayGet(pReq->aSubmitTbData, i))); } - tEndEncode(pCoder); - return 0; +_exit: + return code; } int32_t tDecodeSubmitReq(SDecoder *pCoder, SSubmitReq2 *pReq) { @@ -11187,17 +11163,21 @@ void tDestroySubmitReq(SSubmitReq2 *pReq, int32_t flag) { } int32_t tEncodeSSubmitRsp2(SEncoder *pCoder, const SSubmitRsp2 *pRsp) { - if (tStartEncode(pCoder) < 0) return -1; + int32_t code = 0; + int32_t lino; - if (tEncodeI32v(pCoder, pRsp->affectedRows) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(pCoder)); - if (tEncodeU64v(pCoder, taosArrayGetSize(pRsp->aCreateTbRsp)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32v(pCoder, pRsp->affectedRows)); + + TAOS_CHECK_EXIT(tEncodeU64v(pCoder, taosArrayGetSize(pRsp->aCreateTbRsp))); for (int32_t i = 0; i < taosArrayGetSize(pRsp->aCreateTbRsp); ++i) { - if (tEncodeSVCreateTbRsp(pCoder, taosArrayGet(pRsp->aCreateTbRsp, i)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSVCreateTbRsp(pCoder, taosArrayGet(pRsp->aCreateTbRsp, i))); } tEndEncode(pCoder); - return 0; +_exit: + return code; } int32_t tDecodeSSubmitRsp2(SDecoder *pCoder, SSubmitRsp2 *pRsp) { @@ -11280,55 +11260,79 @@ void tDestroySSubmitRsp2(SSubmitRsp2 *pRsp, int32_t flag) { } int32_t tSerializeSMPauseStreamReq(void *buf, int32_t bufLen, const SMPauseStreamReq *pReq) { + int32_t code = 0; + int32_t lino; + int32_t tlen; SEncoder encoder = {0}; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->name) < 0) return -1; - if (tEncodeI8(&encoder, pReq->igNotExists) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->name)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->igNotExists)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSMPauseStreamReq(void *buf, int32_t bufLen, SMPauseStreamReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->name) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->igNotExists) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->name)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->igNotExists)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } int32_t tSerializeSMResumeStreamReq(void *buf, int32_t bufLen, const SMResumeStreamReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->name) < 0) return -1; - if (tEncodeI8(&encoder, pReq->igNotExists) < 0) return -1; - if (tEncodeI8(&encoder, pReq->igUntreated) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->name)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->igNotExists)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->igUntreated)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSMResumeStreamReq(void *buf, int32_t bufLen, SMResumeStreamReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->name) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->igNotExists) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->igUntreated) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->name)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->igNotExists)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->igUntreated)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } int32_t tEncodeMqSubTopicEp(void **buf, const SMqSubTopicEp *pTopicEp) { @@ -11375,59 +11379,71 @@ void tDeleteMqSubTopicEp(SMqSubTopicEp *pSubTopicEp) { int32_t tSerializeSCMCreateViewReq(void *buf, int32_t bufLen, const SCMCreateViewReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->fullname) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->name) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->dbFName) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->querySql) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->sql) < 0) return -1; - if (tEncodeI8(&encoder, pReq->orReplace) < 0) return -1; - if (tEncodeI8(&encoder, pReq->precision) < 0) return -1; - if (tEncodeI32(&encoder, pReq->numOfCols) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->fullname)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->name)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->dbFName)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->querySql)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->sql)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->orReplace)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->precision)); + TAOS_CHECK_EXIT(tEncodeI32(&encoder, pReq->numOfCols)); for (int32_t i = 0; i < pReq->numOfCols; ++i) { SSchema *pSchema = &pReq->pSchema[i]; - if (tEncodeSSchema(&encoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSchema(&encoder, pSchema)); } tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSCMCreateViewReq(void *buf, int32_t bufLen, SCMCreateViewReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->fullname) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->name) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->dbFName) < 0) return -1; - if (tDecodeCStrAlloc(&decoder, &pReq->querySql) < 0) return -1; - if (tDecodeCStrAlloc(&decoder, &pReq->sql) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->orReplace) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->precision) < 0) return -1; - if (tDecodeI32(&decoder, &pReq->numOfCols) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->fullname)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->name)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->dbFName)); + TAOS_CHECK_EXIT(tDecodeCStrAlloc(&decoder, &pReq->querySql)); + TAOS_CHECK_EXIT(tDecodeCStrAlloc(&decoder, &pReq->sql)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->orReplace)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->precision)); + TAOS_CHECK_EXIT(tDecodeI32(&decoder, &pReq->numOfCols)); if (pReq->numOfCols > 0) { pReq->pSchema = taosMemoryCalloc(pReq->numOfCols, sizeof(SSchema)); if (pReq->pSchema == NULL) { - return -1; + TAOS_CHECK_EXIT(terrno); } for (int32_t i = 0; i < pReq->numOfCols; ++i) { SSchema *pSchema = pReq->pSchema + i; - if (tDecodeSSchema(&decoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeSSchema(&decoder, pSchema)); } } tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeSCMCreateViewReq(SCMCreateViewReq *pReq) { @@ -11442,37 +11458,49 @@ void tFreeSCMCreateViewReq(SCMCreateViewReq *pReq) { int32_t tSerializeSCMDropViewReq(void *buf, int32_t bufLen, const SCMDropViewReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->fullname) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->name) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->dbFName) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->sql) < 0) return -1; - if (tEncodeI8(&encoder, pReq->igNotExists) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->fullname)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->name)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->dbFName)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->sql)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->igNotExists)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSCMDropViewReq(void *buf, int32_t bufLen, SCMDropViewReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->fullname) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->name) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->dbFName) < 0) return -1; - if (tDecodeCStrAlloc(&decoder, &pReq->sql) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->igNotExists) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->fullname)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->name)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->dbFName)); + TAOS_CHECK_EXIT(tDecodeCStrAlloc(&decoder, &pReq->sql)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->igNotExists)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeSCMDropViewReq(SCMDropViewReq *pReq) { if (NULL == pReq) { @@ -11484,101 +11512,133 @@ void tFreeSCMDropViewReq(SCMDropViewReq *pReq) { int32_t tSerializeSViewMetaReq(void *buf, int32_t bufLen, const SViewMetaReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->fullname) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->fullname)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSViewMetaReq(void *buf, int32_t bufLen, SViewMetaReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->fullname) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->fullname)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } static int32_t tEncodeSViewMetaRsp(SEncoder *pEncoder, const SViewMetaRsp *pRsp) { - if (tEncodeCStr(pEncoder, pRsp->name) < 0) return -1; - if (tEncodeCStr(pEncoder, pRsp->dbFName) < 0) return -1; - if (tEncodeCStr(pEncoder, pRsp->user) < 0) return -1; - if (tEncodeU64(pEncoder, pRsp->dbId) < 0) return -1; - if (tEncodeU64(pEncoder, pRsp->viewId) < 0) return -1; - if (tEncodeCStr(pEncoder, pRsp->querySql) < 0) return -1; - if (tEncodeI8(pEncoder, pRsp->precision) < 0) return -1; - if (tEncodeI8(pEncoder, pRsp->type) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->version) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->numOfCols) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pRsp->name)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pRsp->dbFName)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pRsp->user)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pRsp->dbId)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pRsp->viewId)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pRsp->querySql)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pRsp->precision)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pRsp->type)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->version)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->numOfCols)); for (int32_t i = 0; i < pRsp->numOfCols; ++i) { SSchema *pSchema = &pRsp->pSchema[i]; - if (tEncodeSSchema(pEncoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSchema(pEncoder, pSchema)); } - return 0; +_exit: + return code; } int32_t tSerializeSViewMetaRsp(void *buf, int32_t bufLen, const SViewMetaRsp *pRsp) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeSViewMetaRsp(&encoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeSViewMetaRsp(&encoder, pRsp)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } static int32_t tDecodeSViewMetaRsp(SDecoder *pDecoder, SViewMetaRsp *pRsp) { - if (tDecodeCStrTo(pDecoder, pRsp->name) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pRsp->dbFName) < 0) return -1; - if (tDecodeCStrAlloc(pDecoder, &pRsp->user) < 0) return -1; - if (tDecodeU64(pDecoder, &pRsp->dbId) < 0) return -1; - if (tDecodeU64(pDecoder, &pRsp->viewId) < 0) return -1; - if (tDecodeCStrAlloc(pDecoder, &pRsp->querySql) < 0) return -1; - if (tDecodeI8(pDecoder, &pRsp->precision) < 0) return -1; - if (tDecodeI8(pDecoder, &pRsp->type) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->version) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->numOfCols) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pRsp->name)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pRsp->dbFName)); + TAOS_CHECK_EXIT(tDecodeCStrAlloc(pDecoder, &pRsp->user)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pRsp->dbId)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pRsp->viewId)); + TAOS_CHECK_EXIT(tDecodeCStrAlloc(pDecoder, &pRsp->querySql)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pRsp->precision)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pRsp->type)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->version)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->numOfCols)); if (pRsp->numOfCols > 0) { pRsp->pSchema = taosMemoryCalloc(pRsp->numOfCols, sizeof(SSchema)); if (pRsp->pSchema == NULL) { - return -1; + TAOS_CHECK_EXIT(terrno); } for (int32_t i = 0; i < pRsp->numOfCols; ++i) { SSchema *pSchema = pRsp->pSchema + i; - if (tDecodeSSchema(pDecoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeSSchema(pDecoder, pSchema)); } } - return 0; +_exit: + return code; } int32_t tDeserializeSViewMetaRsp(void *buf, int32_t bufLen, SViewMetaRsp *pRsp) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeSViewMetaRsp(&decoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeSViewMetaRsp(&decoder, pRsp)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeSViewMetaRsp(SViewMetaRsp *pRsp) { @@ -11593,48 +11653,62 @@ void tFreeSViewMetaRsp(SViewMetaRsp *pRsp) { int32_t tSerializeSViewHbRsp(void *buf, int32_t bufLen, SViewHbRsp *pRsp) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); int32_t numOfMeta = taosArrayGetSize(pRsp->pViewRsp); - if (tEncodeI32(&encoder, numOfMeta) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(&encoder, numOfMeta)); for (int32_t i = 0; i < numOfMeta; ++i) { SViewMetaRsp *pMetaRsp = taosArrayGetP(pRsp->pViewRsp, i); - if (tEncodeSViewMetaRsp(&encoder, pMetaRsp) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSViewMetaRsp(&encoder, pMetaRsp)); } tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSViewHbRsp(void *buf, int32_t bufLen, SViewHbRsp *pRsp) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); int32_t numOfMeta = 0; - if (tDecodeI32(&decoder, &numOfMeta) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(&decoder, &numOfMeta)); pRsp->pViewRsp = taosArrayInit(numOfMeta, POINTER_BYTES); if (pRsp->pViewRsp == NULL) { - return -1; + TAOS_CHECK_EXIT(terrno); } for (int32_t i = 0; i < numOfMeta; ++i) { SViewMetaRsp *metaRsp = taosMemoryCalloc(1, sizeof(SViewMetaRsp)); if (NULL == metaRsp) return -1; - if (tDecodeSViewMetaRsp(&decoder, metaRsp) < 0) return -1; - if (taosArrayPush(pRsp->pViewRsp, &metaRsp) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSViewMetaRsp(&decoder, metaRsp)); + if (taosArrayPush(pRsp->pViewRsp, &metaRsp) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeSViewHbRsp(SViewHbRsp *pRsp) { @@ -11662,183 +11736,243 @@ void setFieldWithOptions(SFieldWithOptions *fieldWithOptions, SField *field) { } int32_t tSerializeTableTSMAInfoReq(void *buf, int32_t bufLen, const STableTSMAInfoReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeCStr(&encoder, pReq->name) < 0) return -1; - if (tEncodeI8(&encoder, pReq->fetchingWithTsmaName) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->name)); + TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->fetchingWithTsmaName)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeTableTSMAInfoReq(void *buf, int32_t bufLen, STableTSMAInfoReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeCStrTo(&decoder, pReq->name) < 0) return -1; - if (tDecodeI8(&decoder, (uint8_t *)&pReq->fetchingWithTsmaName) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->name)); + TAOS_CHECK_EXIT(tDecodeI8(&decoder, (uint8_t *)&pReq->fetchingWithTsmaName)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } static int32_t tEncodeTableTSMAInfo(SEncoder *pEncoder, const STableTSMAInfo *pTsmaInfo) { - if (tEncodeCStr(pEncoder, pTsmaInfo->name) < 0) return -1; - if (tEncodeU64(pEncoder, pTsmaInfo->tsmaId) < 0) return -1; - if (tEncodeCStr(pEncoder, pTsmaInfo->tb) < 0) return -1; - if (tEncodeCStr(pEncoder, pTsmaInfo->dbFName) < 0) return -1; - if (tEncodeU64(pEncoder, pTsmaInfo->suid) < 0) return -1; - if (tEncodeU64(pEncoder, pTsmaInfo->destTbUid) < 0) return -1; - if (tEncodeU64(pEncoder, pTsmaInfo->dbId) < 0) return -1; - if (tEncodeI32(pEncoder, pTsmaInfo->version) < 0) return -1; - if (tEncodeCStr(pEncoder, pTsmaInfo->targetTb) < 0) return -1; - if (tEncodeCStr(pEncoder, pTsmaInfo->targetDbFName) < 0) return -1; - if (tEncodeI64(pEncoder, pTsmaInfo->interval) < 0) return -1; - if (tEncodeI8(pEncoder, pTsmaInfo->unit) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->name)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pTsmaInfo->tsmaId)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->tb)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->dbFName)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pTsmaInfo->suid)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pTsmaInfo->destTbUid)); + TAOS_CHECK_EXIT(tEncodeU64(pEncoder, pTsmaInfo->dbId)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pTsmaInfo->version)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->targetTb)); + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->targetDbFName)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pTsmaInfo->interval)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pTsmaInfo->unit)); int32_t size = pTsmaInfo->pFuncs ? pTsmaInfo->pFuncs->size : 0; - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); for (int32_t i = 0; i < size; ++i) { STableTSMAFuncInfo *pFuncInfo = taosArrayGet(pTsmaInfo->pFuncs, i); - if (tEncodeI32(pEncoder, pFuncInfo->funcId) < 0) return -1; - if (tEncodeI16(pEncoder, pFuncInfo->colId) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pFuncInfo->funcId)); + TAOS_CHECK_EXIT(tEncodeI16(pEncoder, pFuncInfo->colId)); } size = pTsmaInfo->pTags ? pTsmaInfo->pTags->size : 0; - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); for (int32_t i = 0; i < size; ++i) { const SSchema *pSchema = taosArrayGet(pTsmaInfo->pTags, i); - if (tEncodeSSchema(pEncoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSchema(pEncoder, pSchema)); } size = pTsmaInfo->pUsedCols ? pTsmaInfo->pUsedCols->size : 0; - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); for (int32_t i = 0; i < size; ++i) { const SSchema *pSchema = taosArrayGet(pTsmaInfo->pUsedCols, i); - if (tEncodeSSchema(pEncoder, pSchema) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSSchema(pEncoder, pSchema)); } - if (tEncodeCStr(pEncoder, pTsmaInfo->ast) < 0) return -1; - if (tEncodeI64(pEncoder, pTsmaInfo->streamUid) < 0) return -1; - if (tEncodeI64(pEncoder, pTsmaInfo->reqTs) < 0) return -1; - if (tEncodeI64(pEncoder, pTsmaInfo->rspTs) < 0) return -1; - if (tEncodeI64(pEncoder, pTsmaInfo->delayDuration) < 0) return -1; - if (tEncodeI8(pEncoder, pTsmaInfo->fillHistoryFinished) < 0) return -1; - return 0; + TAOS_CHECK_EXIT(tEncodeCStr(pEncoder, pTsmaInfo->ast)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pTsmaInfo->streamUid)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pTsmaInfo->reqTs)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pTsmaInfo->rspTs)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pTsmaInfo->delayDuration)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pTsmaInfo->fillHistoryFinished)); + +_exit: + return code; } static int32_t tDecodeTableTSMAInfo(SDecoder *pDecoder, STableTSMAInfo *pTsmaInfo) { - if (tDecodeCStrTo(pDecoder, pTsmaInfo->name) < 0) return -1; - if (tDecodeU64(pDecoder, &pTsmaInfo->tsmaId) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pTsmaInfo->tb) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pTsmaInfo->dbFName) < 0) return -1; - if (tDecodeU64(pDecoder, &pTsmaInfo->suid) < 0) return -1; - if (tDecodeU64(pDecoder, &pTsmaInfo->destTbUid) < 0) return -1; - if (tDecodeU64(pDecoder, &pTsmaInfo->dbId) < 0) return -1; - if (tDecodeI32(pDecoder, &pTsmaInfo->version) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pTsmaInfo->targetTb) < 0) return -1; - if (tDecodeCStrTo(pDecoder, pTsmaInfo->targetDbFName) < 0) return -1; - if (tDecodeI64(pDecoder, &pTsmaInfo->interval) < 0) return -1; - if (tDecodeI8(pDecoder, &pTsmaInfo->unit) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pTsmaInfo->name)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pTsmaInfo->tsmaId)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pTsmaInfo->tb)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pTsmaInfo->dbFName)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pTsmaInfo->suid)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pTsmaInfo->destTbUid)); + TAOS_CHECK_EXIT(tDecodeU64(pDecoder, &pTsmaInfo->dbId)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pTsmaInfo->version)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pTsmaInfo->targetTb)); + TAOS_CHECK_EXIT(tDecodeCStrTo(pDecoder, pTsmaInfo->targetDbFName)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pTsmaInfo->interval)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, &pTsmaInfo->unit)); int32_t size = 0; - if (tDecodeI32(pDecoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); if (size > 0) { pTsmaInfo->pFuncs = taosArrayInit(size, sizeof(STableTSMAFuncInfo)); - if (!pTsmaInfo->pFuncs) return -1; + if (!pTsmaInfo->pFuncs) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < size; ++i) { STableTSMAFuncInfo funcInfo = {0}; - if (tDecodeI32(pDecoder, &funcInfo.funcId) < 0) return -1; - if (tDecodeI16(pDecoder, &funcInfo.colId) < 0) return -1; - if (!taosArrayPush(pTsmaInfo->pFuncs, &funcInfo)) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &funcInfo.funcId)); + TAOS_CHECK_EXIT(tDecodeI16(pDecoder, &funcInfo.colId)); + if (!taosArrayPush(pTsmaInfo->pFuncs, &funcInfo)) { + TAOS_CHECK_EXIT(terrno); + } } } - if (tDecodeI32(pDecoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); if (size > 0) { pTsmaInfo->pTags = taosArrayInit(size, sizeof(SSchema)); - if (!pTsmaInfo->pTags) return -1; + if (!pTsmaInfo->pTags) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < size; ++i) { SSchema schema = {0}; - if (tDecodeSSchema(pDecoder, &schema) < 0) return -1; - if (taosArrayPush(pTsmaInfo->pTags, &schema) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSSchema(pDecoder, &schema)); + if (taosArrayPush(pTsmaInfo->pTags, &schema) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - if (tDecodeI32(pDecoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); if (size > 0) { pTsmaInfo->pUsedCols = taosArrayInit(size, sizeof(SSchema)); - if (!pTsmaInfo->pUsedCols) return -1; + if (!pTsmaInfo->pUsedCols) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < size; ++i) { SSchema schema = {0}; - if (tDecodeSSchema(pDecoder, &schema) < 0) return -1; - if (taosArrayPush(pTsmaInfo->pUsedCols, &schema) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSSchema(pDecoder, &schema)); + if (taosArrayPush(pTsmaInfo->pUsedCols, &schema) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - if (tDecodeCStrAlloc(pDecoder, &pTsmaInfo->ast) < 0) return -1; - if (tDecodeI64(pDecoder, &pTsmaInfo->streamUid) < 0) return -1; - if (tDecodeI64(pDecoder, &pTsmaInfo->reqTs) < 0) return -1; - if (tDecodeI64(pDecoder, &pTsmaInfo->rspTs) < 0) return -1; - if (tDecodeI64(pDecoder, &pTsmaInfo->delayDuration) < 0) return -1; - if (tDecodeI8(pDecoder, (int8_t *)&pTsmaInfo->fillHistoryFinished) < 0) return -1; - return 0; + TAOS_CHECK_EXIT(tDecodeCStrAlloc(pDecoder, &pTsmaInfo->ast)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pTsmaInfo->streamUid)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pTsmaInfo->reqTs)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pTsmaInfo->rspTs)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pTsmaInfo->delayDuration)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, (int8_t *)&pTsmaInfo->fillHistoryFinished)); + +_exit: + return code; } static int32_t tEncodeTableTSMAInfoRsp(SEncoder *pEncoder, const STableTSMAInfoRsp *pRsp) { + int32_t code = 0; + int32_t lino; + int32_t size = pRsp->pTsmas ? pRsp->pTsmas->size : 0; - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); for (int32_t i = 0; i < size; ++i) { STableTSMAInfo *pInfo = taosArrayGetP(pRsp->pTsmas, i); - if (tEncodeTableTSMAInfo(pEncoder, pInfo) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeTableTSMAInfo(pEncoder, pInfo)); } - return 0; +_exit: + return code; } static int32_t tDecodeTableTSMAInfoRsp(SDecoder *pDecoder, STableTSMAInfoRsp *pRsp) { int32_t size = 0; - if (tDecodeI32(pDecoder, &size) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); if (size <= 0) return 0; pRsp->pTsmas = taosArrayInit(size, POINTER_BYTES); - if (!pRsp->pTsmas) return -1; + if (!pRsp->pTsmas) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < size; ++i) { STableTSMAInfo *pTsma = taosMemoryCalloc(1, sizeof(STableTSMAInfo)); - if (!pTsma) return -1; - if (taosArrayPush(pRsp->pTsmas, &pTsma) == NULL) return -1; - if (tDecodeTableTSMAInfo(pDecoder, pTsma) < 0) return -1; + if (!pTsma) { + TAOS_CHECK_EXIT(terrno); + } + if (taosArrayPush(pRsp->pTsmas, &pTsma) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + TAOS_CHECK_EXIT(tDecodeTableTSMAInfo(pDecoder, pTsma)); } - return 0; +_exit: + return code; } int32_t tSerializeTableTSMAInfoRsp(void *buf, int32_t bufLen, const STableTSMAInfoRsp *pRsp) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeTableTSMAInfoRsp(&encoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeTableTSMAInfoRsp(&encoder, pRsp)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeTableTSMAInfoRsp(void *buf, int32_t bufLen, STableTSMAInfoRsp *pRsp) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeTableTSMAInfoRsp(&decoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeTableTSMAInfoRsp(&decoder, pRsp)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeTableTSMAInfo(void *p) { @@ -11899,129 +12033,184 @@ void tFreeTableTSMAInfoRsp(STableTSMAInfoRsp *pRsp) { } static int32_t tEncodeStreamProgressReq(SEncoder *pEncoder, const SStreamProgressReq *pReq) { - if (tEncodeI64(pEncoder, pReq->streamId) < 0) return -1; - if (tEncodeI32(pEncoder, pReq->vgId) < 0) return -1; - if (tEncodeI32(pEncoder, pReq->fetchIdx) < 0) return -1; - if (tEncodeI32(pEncoder, pReq->subFetchIdx) < 0) return -1; - return 0; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pReq->streamId)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pReq->vgId)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pReq->fetchIdx)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pReq->subFetchIdx)); + +_exit: + return code; } int32_t tSerializeStreamProgressReq(void *buf, int32_t bufLen, const SStreamProgressReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeStreamProgressReq(&encoder, pReq) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeStreamProgressReq(&encoder, pReq)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } static int32_t tDecodeStreamProgressReq(SDecoder *pDecoder, SStreamProgressReq *pReq) { - if (tDecodeI64(pDecoder, &pReq->streamId) < 0) return -1; - if (tDecodeI32(pDecoder, &pReq->vgId) < 0) return -1; - if (tDecodeI32(pDecoder, &pReq->fetchIdx) < 0) return -1; - if (tDecodeI32(pDecoder, &pReq->subFetchIdx) < 0) return -1; - return 0; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pReq->streamId)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->vgId)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->fetchIdx)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->subFetchIdx)); + +_exit: + return code; } int32_t tDeserializeStreamProgressReq(void *buf, int32_t bufLen, SStreamProgressReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, (char *)buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeStreamProgressReq(&decoder, pReq) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeStreamProgressReq(&decoder, pReq)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } static int32_t tEncodeStreamProgressRsp(SEncoder *pEncoder, const SStreamProgressRsp *pRsp) { - if (tEncodeI64(pEncoder, pRsp->streamId) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->vgId) < 0) return -1; - if (tEncodeI8(pEncoder, pRsp->fillHisFinished) < 0) return -1; - if (tEncodeI64(pEncoder, pRsp->progressDelay) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->fetchIdx) < 0) return -1; - if (tEncodeI32(pEncoder, pRsp->subFetchIdx) < 0) return -1; - return 0; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pRsp->streamId)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->vgId)); + TAOS_CHECK_EXIT(tEncodeI8(pEncoder, pRsp->fillHisFinished)); + TAOS_CHECK_EXIT(tEncodeI64(pEncoder, pRsp->progressDelay)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->fetchIdx)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pRsp->subFetchIdx)); + +_exit: + return code; } int32_t tSerializeStreamProgressRsp(void *buf, int32_t bufLen, const SStreamProgressRsp *pRsp) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; - if (tEncodeStreamProgressRsp(&encoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); + TAOS_CHECK_EXIT(tEncodeStreamProgressRsp(&encoder, pRsp)); tEndEncode(&encoder); - int32_t tlen = encoder.pos; +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } static int32_t tDecodeStreamProgressRsp(SDecoder *pDecoder, SStreamProgressRsp *pRsp) { - if (tDecodeI64(pDecoder, &pRsp->streamId) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->vgId) < 0) return -1; - if (tDecodeI8(pDecoder, (int8_t *)&pRsp->fillHisFinished) < 0) return -1; - if (tDecodeI64(pDecoder, &pRsp->progressDelay) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->fetchIdx) < 0) return -1; - if (tDecodeI32(pDecoder, &pRsp->subFetchIdx) < 0) return -1; - return 0; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pRsp->streamId)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->vgId)); + TAOS_CHECK_EXIT(tDecodeI8(pDecoder, (int8_t *)&pRsp->fillHisFinished)); + TAOS_CHECK_EXIT(tDecodeI64(pDecoder, &pRsp->progressDelay)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->fetchIdx)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pRsp->subFetchIdx)); + +_exit: + return code; } int32_t tDeserializeSStreamProgressRsp(void *buf, int32_t bufLen, SStreamProgressRsp *pRsp) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; - if (tDecodeStreamProgressRsp(&decoder, pRsp) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); + TAOS_CHECK_EXIT(tDecodeStreamProgressRsp(&decoder, pRsp)); tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } int32_t tEncodeSMDropTbReqOnSingleVg(SEncoder *pEncoder, const SMDropTbReqsOnSingleVg *pReq) { const SVgroupInfo *pVgInfo = &pReq->vgInfo; - if (tEncodeI32(pEncoder, pVgInfo->vgId) < 0) return -1; - if (tEncodeU32(pEncoder, pVgInfo->hashBegin) < 0) return -1; - if (tEncodeU32(pEncoder, pVgInfo->hashEnd) < 0) return -1; - if (tEncodeSEpSet(pEncoder, &pVgInfo->epSet) < 0) return -1; - if (tEncodeI32(pEncoder, pVgInfo->numOfTable) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pVgInfo->vgId)); + TAOS_CHECK_EXIT(tEncodeU32(pEncoder, pVgInfo->hashBegin)); + TAOS_CHECK_EXIT(tEncodeU32(pEncoder, pVgInfo->hashEnd)); + TAOS_CHECK_EXIT(tEncodeSEpSet(pEncoder, &pVgInfo->epSet)); + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, pVgInfo->numOfTable)); int32_t size = pReq->pTbs ? pReq->pTbs->size : 0; - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); for (int32_t i = 0; i < size; ++i) { const SVDropTbReq *pInfo = taosArrayGet(pReq->pTbs, i); - if (tEncodeSVDropTbReq(pEncoder, pInfo) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSVDropTbReq(pEncoder, pInfo)); } - return 0; +_exit: + return code; } int32_t tDecodeSMDropTbReqOnSingleVg(SDecoder *pDecoder, SMDropTbReqsOnSingleVg *pReq) { - if (tDecodeI32(pDecoder, &pReq->vgInfo.vgId) < 0) return -1; - if (tDecodeU32(pDecoder, &pReq->vgInfo.hashBegin) < 0) return -1; - if (tDecodeU32(pDecoder, &pReq->vgInfo.hashEnd) < 0) return -1; - if (tDecodeSEpSet(pDecoder, &pReq->vgInfo.epSet) < 0) return -1; - if (tDecodeI32(pDecoder, &pReq->vgInfo.numOfTable) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->vgInfo.vgId)); + TAOS_CHECK_EXIT(tDecodeU32(pDecoder, &pReq->vgInfo.hashBegin)); + TAOS_CHECK_EXIT(tDecodeU32(pDecoder, &pReq->vgInfo.hashEnd)); + TAOS_CHECK_EXIT(tDecodeSEpSet(pDecoder, &pReq->vgInfo.epSet)); + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &pReq->vgInfo.numOfTable)); int32_t size = 0; - if (tDecodeI32(pDecoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); pReq->pTbs = taosArrayInit(size, sizeof(SVDropTbReq)); if (!pReq->pTbs) { - return -1; + TAOS_CHECK_EXIT(terrno); } SVDropTbReq pTbReq = {0}; for (int32_t i = 0; i < size; ++i) { - if (tDecodeSVDropTbReq(pDecoder, &pTbReq) < 0) return -1; - if (taosArrayPush(pReq->pTbs, &pTbReq) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSVDropTbReq(pDecoder, &pTbReq)); + if (taosArrayPush(pReq->pTbs, &pTbReq) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } - return 0; + +_exit: + return code; } void tFreeSMDropTbReqOnSingleVg(void *p) { @@ -12031,38 +12220,54 @@ void tFreeSMDropTbReqOnSingleVg(void *p) { int32_t tSerializeSMDropTbsReq(void *buf, int32_t bufLen, const SMDropTbsReq *pReq) { SEncoder encoder = {0}; + int32_t code = 0; + int32_t lino; + int32_t tlen; + tEncoderInit(&encoder, buf, bufLen); - if (tStartEncode(&encoder) < 0) return -1; + TAOS_CHECK_EXIT(tStartEncode(&encoder)); int32_t size = pReq->pVgReqs ? pReq->pVgReqs->size : 0; - if (tEncodeI32(&encoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(&encoder, size)); for (int32_t i = 0; i < size; ++i) { SMDropTbReqsOnSingleVg *pVgReq = taosArrayGet(pReq->pVgReqs, i); - if (tEncodeSMDropTbReqOnSingleVg(&encoder, pVgReq) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSMDropTbReqOnSingleVg(&encoder, pVgReq)); } tEndEncode(&encoder); - int32_t tlen = encoder.pos; + +_exit: + if (code) { + tlen = code; + } else { + tlen = encoder.pos; + } tEncoderClear(&encoder); return tlen; } int32_t tDeserializeSMDropTbsReq(void *buf, int32_t bufLen, SMDropTbsReq *pReq) { SDecoder decoder = {0}; + int32_t code = 0; + int32_t lino; + tDecoderInit(&decoder, buf, bufLen); - if (tStartDecode(&decoder) < 0) return -1; + TAOS_CHECK_EXIT(tStartDecode(&decoder)); int32_t size = 0; - if (tDecodeI32(&decoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(&decoder, &size)); pReq->pVgReqs = taosArrayInit(size, sizeof(SMDropTbReqsOnSingleVg)); if (!pReq->pVgReqs) { - return -1; + TAOS_CHECK_EXIT(terrno); } for (int32_t i = 0; i < size; ++i) { SMDropTbReqsOnSingleVg vgReq = {0}; - if (tDecodeSMDropTbReqOnSingleVg(&decoder, &vgReq) < 0) return -1; - if (taosArrayPush(pReq->pVgReqs, &vgReq) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSMDropTbReqOnSingleVg(&decoder, &vgReq)); + if (taosArrayPush(pReq->pVgReqs, &vgReq) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } tEndDecode(&decoder); +_exit: tDecoderClear(&decoder); - return 0; + return code; } void tFreeSMDropTbsReq(void *p) { @@ -12071,29 +12276,42 @@ void tFreeSMDropTbsReq(void *p) { } int32_t tEncodeVFetchTtlExpiredTbsRsp(SEncoder *pCoder, const SVFetchTtlExpiredTbsRsp *pRsp) { - if (tEncodeI32(pCoder, pRsp->vgId) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeI32(pCoder, pRsp->vgId)); int32_t size = pRsp->pExpiredTbs ? pRsp->pExpiredTbs->size : 0; - if (tEncodeI32(pCoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pCoder, size)); for (int32_t i = 0; i < size; ++i) { - if (tEncodeSVDropTbReq(pCoder, taosArrayGet(pRsp->pExpiredTbs, i)) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeSVDropTbReq(pCoder, taosArrayGet(pRsp->pExpiredTbs, i))); } - return 0; + +_exit: + return code; } int32_t tDecodeVFetchTtlExpiredTbsRsp(SDecoder *pCoder, SVFetchTtlExpiredTbsRsp *pRsp) { - if (tDecodeI32(pCoder, &pRsp->vgId) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI32(pCoder, &pRsp->vgId)); int32_t size = 0; - if (tDecodeI32(pCoder, &size) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeI32(pCoder, &size)); if (size > 0) { pRsp->pExpiredTbs = taosArrayInit(size, sizeof(SVDropTbReq)); - if (!pRsp->pExpiredTbs) return terrno; + if (!pRsp->pExpiredTbs) { + TAOS_CHECK_EXIT(terrno); + } SVDropTbReq tb = {0}; for (int32_t i = 0; i < size; ++i) { - if (tDecodeSVDropTbReq(pCoder, &tb) < 0) return -1; - if (taosArrayPush(pRsp->pExpiredTbs, &tb) == NULL) return -1; + TAOS_CHECK_EXIT(tDecodeSVDropTbReq(pCoder, &tb)); + if (taosArrayPush(pRsp->pExpiredTbs, &tb) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - return 0; +_exit: + return code; } void tFreeFetchTtlExpiredTbsRsp(void *p) { @@ -12102,52 +12320,73 @@ void tFreeFetchTtlExpiredTbsRsp(void *p) { } int32_t tEncodeMqBatchMetaRsp(SEncoder *pEncoder, const SMqBatchMetaRsp *pRsp) { - if (tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tEncodeSTqOffsetVal(pEncoder, &pRsp->rspOffset)); int32_t size = taosArrayGetSize(pRsp->batchMetaReq); - if (tEncodeI32(pEncoder, size) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeI32(pEncoder, size)); if (size > 0) { for (int32_t i = 0; i < size; i++) { void *pMetaReq = taosArrayGetP(pRsp->batchMetaReq, i); int32_t metaLen = *(int32_t *)taosArrayGet(pRsp->batchMetaLen, i); - if (tEncodeBinary(pEncoder, pMetaReq, metaLen) < 0) return -1; + TAOS_CHECK_EXIT(tEncodeBinary(pEncoder, pMetaReq, metaLen)); } } - return 0; +_exit: + return code; } int32_t tDecodeMqBatchMetaRsp(SDecoder *pDecoder, SMqBatchMetaRsp *pRsp) { int32_t size = 0; - if (tDecodeI32(pDecoder, &size) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeI32(pDecoder, &size)); if (size > 0) { pRsp->batchMetaReq = taosArrayInit(size, POINTER_BYTES); - if (!pRsp->batchMetaReq) return -1; + if (!pRsp->batchMetaReq) { + TAOS_CHECK_EXIT(terrno); + } pRsp->batchMetaLen = taosArrayInit(size, sizeof(int32_t)); - if (!pRsp->batchMetaLen) return -1; + if (!pRsp->batchMetaLen) { + TAOS_CHECK_EXIT(terrno); + } for (int32_t i = 0; i < size; i++) { void *pCreate = NULL; uint64_t len = 0; - if (tDecodeBinaryAlloc(pDecoder, &pCreate, &len) < 0) return -1; + TAOS_CHECK_EXIT(tDecodeBinaryAlloc(pDecoder, &pCreate, &len)); int32_t l = (int32_t)len; - if (taosArrayPush(pRsp->batchMetaReq, &pCreate) == NULL) return -1; - if (taosArrayPush(pRsp->batchMetaLen, &l) == NULL) return -1; + if (taosArrayPush(pRsp->batchMetaReq, &pCreate) == NULL) { + TAOS_CHECK_EXIT(terrno); + } + if (taosArrayPush(pRsp->batchMetaLen, &l) == NULL) { + TAOS_CHECK_EXIT(terrno); + } } } - return 0; +_exit: + return code; } int32_t tSemiDecodeMqBatchMetaRsp(SDecoder *pDecoder, SMqBatchMetaRsp *pRsp) { - if (tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset) < 0) return -1; + int32_t code = 0; + int32_t lino; + + TAOS_CHECK_EXIT(tDecodeSTqOffsetVal(pDecoder, &pRsp->rspOffset)); if (pDecoder->size < pDecoder->pos) { - return -1; + return TSDB_CODE_INVALID_PARA; } pRsp->metaBuffLen = TD_CODER_REMAIN_CAPACITY(pDecoder); pRsp->pMetaBuff = taosMemoryCalloc(1, pRsp->metaBuffLen); if (pRsp->pMetaBuff == NULL) { - return -1; + TAOS_CHECK_EXIT(terrno); } memcpy(pRsp->pMetaBuff, TD_CODER_CURRENT(pDecoder), pRsp->metaBuffLen); - return 0; + +_exit: + return code; } void tDeleteMqBatchMetaRsp(SMqBatchMetaRsp *pRsp) { From 54a2c139376c871c796592a8fe62f3988671499a Mon Sep 17 00:00:00 2001 From: Pan Wei <72057773+dapan1121@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:42:57 +0800 Subject: [PATCH 36/38] Update tdatablock.c --- source/common/src/tdatablock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 34beb38879..816bf3a757 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -3011,7 +3011,6 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) { if (colSizes[col] <= 0 && !colDataIsNull_s(pColRes, 0) && pColRes->info.type != TSDB_DATA_TYPE_NULL) { uError("Invalid colSize:%d colIdx:%d colType:%d while encoding block", colSizes[col], col, pColRes->info.type); - ASSERT(0); terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return -1; } From 3189d0f0bdbdaf2b2fee0e3768baef6aba91ddf4 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Thu, 5 Sep 2024 23:00:01 +0800 Subject: [PATCH 37/38] docs: recommend show cluster alive --- docs/en/14-reference/03-taos-sql/10-function.md | 2 +- docs/zh/14-reference/03-taos-sql/10-function.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/14-reference/03-taos-sql/10-function.md b/docs/en/14-reference/03-taos-sql/10-function.md index 72ca878ce8..2ba3c416fd 100644 --- a/docs/en/14-reference/03-taos-sql/10-function.md +++ b/docs/en/14-reference/03-taos-sql/10-function.md @@ -1384,7 +1384,7 @@ SELECT SERVER_VERSION(); SELECT SERVER_STATUS(); ``` -**Description**: The server status. +**Description**: The server status. When checking the status of a cluster, the recommended way is to use `SHOW CLUSTER ALIVE;`. Unlike `SELECT SERVER_STATUS();`, it does not return an error when some nodes in the cluster are unavailable; instead, it returns different status codes. Plese check [SHOW CLUSTER ALIVE](https://docs.tdengine.com/reference/taos-sql/show/#show-cluster-alive) for details. ### CURRENT_USER diff --git a/docs/zh/14-reference/03-taos-sql/10-function.md b/docs/zh/14-reference/03-taos-sql/10-function.md index ac9311184e..ee71abbdec 100644 --- a/docs/zh/14-reference/03-taos-sql/10-function.md +++ b/docs/zh/14-reference/03-taos-sql/10-function.md @@ -1374,7 +1374,7 @@ SELECT SERVER_VERSION(); SELECT SERVER_STATUS(); ``` -**说明**：检测服务端是否所有 dnode 都在线，如果是则返回成功，否则返回无法建立连接的错误。 +**说明**：检测服务端是否所有 dnode 都在线，如果是则返回成功，否则返回无法建立连接的错误。如果想要查询集群的状态，推荐使用 `SHOW CLUSTER ALIVE;`, 与 `SELECT SERVER_STATUS();` 不同，当集群中的部分节点不可用时，它不会返回错误，而是返回不同的状态码，详见：[SHOW CLUSTER ALIVE](https://docs.taosdata.com/reference/taos-sql/show/#show-cluster-alive) ### CURRENT_USER From 109f03d3d384b8554b28c96c68e0340de722743c Mon Sep 17 00:00:00 2001 From: sheyanjie-qq <249478495@qq.com> Date: Fri, 6 Sep 2024 09:44:57 +0800 Subject: [PATCH 38/38] jdbc upgrade to 3.3.2 --- docs/en/08-develop/01-connect/index.md | 2 +- docs/en/14-reference/05-connectors/14-java.mdx | 3 ++- docs/examples/JDBC/JDBCDemo/pom.xml | 2 +- docs/examples/JDBC/connectionPools/pom.xml | 2 +- docs/examples/JDBC/consumer-demo/pom.xml | 4 ++-- docs/examples/JDBC/taosdemo/pom.xml | 2 +- docs/examples/java/pom.xml | 2 +- docs/zh/08-develop/01-connect/index.md | 2 +- docs/zh/14-reference/05-connector/14-java.mdx | 1 + 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/en/08-develop/01-connect/index.md b/docs/en/08-develop/01-connect/index.md index 916d5e1e09..ab35f6ad63 100644 --- a/docs/en/08-develop/01-connect/index.md +++ b/docs/en/08-develop/01-connect/index.md @@ -90,7 +90,7 @@ If `maven` is used to manage the projects, what needs to be done is only adding com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 ``` diff --git a/docs/en/14-reference/05-connectors/14-java.mdx b/docs/en/14-reference/05-connectors/14-java.mdx index aa7e91b7fa..1f4cf9895f 100644 --- a/docs/en/14-reference/05-connectors/14-java.mdx +++ b/docs/en/14-reference/05-connectors/14-java.mdx @@ -42,6 +42,7 @@ REST connection supports all platforms that can run Java. | taos-jdbcdriver version | major changes | TDengine version | | :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------: | +| 3.3.2 | 1. Optimized websocket prepareStatement performance; 2. Improved mybatis support| - | | 3.3.0 | 1. Optimized data transmission performance under Websocket connection; 2. SSL validation skipping is supported but disabled by default| 3.3.2.0 or later | | 3.2.11 | Fixed the result set closing bug when using a native connection.| - | | 3.2.10 | 1. Automatic compression/decompression for data transmission, disabled by default; 2.Automatic reconnection for websocket with configurable parameter, disabled by default; 3. A new method for schemaless writing is added in the connection class; 4. Optimized performance for data fetching on native connection; 5. Fixing for some known issues; 6. The list of supported functions can be returned by the API for retrieving metadata| - | @@ -179,7 +180,7 @@ Add following dependency in the `pom.xml` file of your Maven project: com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 ``` diff --git a/docs/examples/JDBC/JDBCDemo/pom.xml b/docs/examples/JDBC/JDBCDemo/pom.xml index 763be51aff..a9b981a026 100644 --- a/docs/examples/JDBC/JDBCDemo/pom.xml +++ b/docs/examples/JDBC/JDBCDemo/pom.xml @@ -19,7 +19,7 @@ com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 org.locationtech.jts diff --git a/docs/examples/JDBC/connectionPools/pom.xml b/docs/examples/JDBC/connectionPools/pom.xml index 855d531f4c..a3705e6834 100644 --- a/docs/examples/JDBC/connectionPools/pom.xml +++ b/docs/examples/JDBC/connectionPools/pom.xml @@ -18,7 +18,7 @@ com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 diff --git a/docs/examples/JDBC/consumer-demo/pom.xml b/docs/examples/JDBC/consumer-demo/pom.xml index ad0f6cd6a1..0db41bc33f 100644 --- a/docs/examples/JDBC/consumer-demo/pom.xml +++ b/docs/examples/JDBC/consumer-demo/pom.xml @@ -17,7 +17,7 @@ com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 com.google.guava @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/docs/examples/JDBC/taosdemo/pom.xml b/docs/examples/JDBC/taosdemo/pom.xml index c73614948b..8e61cbecdf 100644 --- a/docs/examples/JDBC/taosdemo/pom.xml +++ b/docs/examples/JDBC/taosdemo/pom.xml @@ -67,7 +67,7 @@ com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 diff --git a/docs/examples/java/pom.xml b/docs/examples/java/pom.xml index 35fe5f280c..c44be4704d 100644 --- a/docs/examples/java/pom.xml +++ b/docs/examples/java/pom.xml @@ -22,7 +22,7 @@ com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 diff --git a/docs/zh/08-develop/01-connect/index.md b/docs/zh/08-develop/01-connect/index.md index d1aeb0ed8b..5cecd245e5 100644 --- a/docs/zh/08-develop/01-connect/index.md +++ b/docs/zh/08-develop/01-connect/index.md @@ -89,7 +89,7 @@ TDengine 提供了丰富的应用程序开发接口，为了便于用户快速 com.taosdata.jdbc taos-jdbcdriver - 3.3.0 + 3.3.2 ``` diff --git a/docs/zh/14-reference/05-connector/14-java.mdx b/docs/zh/14-reference/05-connector/14-java.mdx index 5f95233163..ec24f1329d 100644 --- a/docs/zh/14-reference/05-connector/14-java.mdx +++ b/docs/zh/14-reference/05-connector/14-java.mdx @@ -33,6 +33,7 @@ REST 连接支持所有能运行 Java 的平台。 | taos-jdbcdriver 版本 | 主要变化 | TDengine 版本 | | :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------: | +| 3.3.2 | 1. 优化 Websocket 连接下的参数绑定性能；2. 优化了对 mybatis 的支持 | - | | 3.3.0 | 1. 优化 Websocket 连接下的数据传输性能；2. 支持跳过 SSL 验证，默认关闭 | 3.3.2.0 及更高版本 | | 3.2.11 | 解决了 Native 连接关闭结果集 bug | - | | 3.2.10 | 1. REST/WebSocket 连接支持传输中的数据压缩；2. Websocket 自动重连机制，默认关闭；3. Connection 类提供无模式写入的方法；4. 优化了原生连接的数据拉取性能；5. 修复了一些已知问题；6.元数据获取函数可以返回支持的函数列表。 | - |