From 84e675c24862bd44c20aee73d742271bb9b0e720 Mon Sep 17 00:00:00 2001 From: Shungang Li Date: Wed, 11 Sep 2024 17:39:24 +0800 Subject: [PATCH 01/20] fix: memleak in taos (create table) --- source/client/src/clientImpl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index d77b8dcbb7..ac5866401e 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1163,6 +1163,9 @@ void schedulerExecCb(SExecResult* pResult, void* param, int32_t code) { (void)atomic_add_fetch_64((int64_t*)&pActivity->numOfInsertRows, pResult->numOfRows); } } + if (TSDB_CODE_SUCCESS == code) { + schedulerFreeJob(&pRequest->body.queryJob, 0); + } } taosMemoryFree(pResult); From 8af5e89d4e0a77414e15b6afb774582d3157e638 Mon Sep 17 00:00:00 2001 From: Shungang Li Date: Wed, 11 Sep 2024 17:46:53 +0800 Subject: [PATCH 02/20] enh: create from csv rm tbname hash --- source/libs/parser/src/parTranslater.c | 33 ++++---------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 854bf83a1f..81adfff9a1 100755 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -5993,7 +5993,7 @@ static int32_t isOperatorEqTbnameCond(STranslateContext* pCxt, SOperatorNode* pO *pRet = false; return TSDB_CODE_SUCCESS; } - + SFunctionNode* pTbnameFunc = NULL; SValueNode* pValueNode = NULL; if (nodeType(pOperator->pLeft) == QUERY_NODE_FUNCTION && @@ -6275,7 +6275,7 @@ static int32_t replaceToChildTableQuery(STranslateContext* pCxt, SEqCondTbNameTa if (NULL == pMeta || TSDB_CHILD_TABLE != pMeta->tableType || pMeta->suid != pRealTable->pMeta->suid) { goto _return; } - + pRealTable->pMeta->uid = pMeta->uid; pRealTable->pMeta->vgId = pMeta->vgId; pRealTable->pMeta->tableType = pMeta->tableType; @@ -6386,11 +6386,11 @@ static int32_t setEqualTbnameTableVgroups(STranslateContext* pCxt, SSelectStmt* } qDebug("before ctbname optimize, code:%d, aTableNum:%d, nTbls:%d, stableQuery:%d", code, aTableNum, nTbls, stableQuery); - + if (TSDB_CODE_SUCCESS == code && 1 == aTableNum && 1 == nTbls && stableQuery && NULL == pInfo->pRealTable->pTsmas) { code = replaceToChildTableQuery(pCxt, pInfo); } - + return code; } @@ -6797,7 +6797,7 @@ static int32_t translateSelect(STranslateContext* pCxt, SSelectStmt* pSelect) { if (pCxt->pParseCxt && pCxt->pParseCxt->setQueryFp) { (*pCxt->pParseCxt->setQueryFp)(pCxt->pParseCxt->requestRid); } - + if (NULL == pSelect->pFromTable) { return translateSelectWithoutFrom(pCxt, pSelect); } else { @@ -13801,7 +13801,6 @@ _OUT: } typedef struct SParseFileContext { - SHashObj* pTbNameHash; SArray* aTagNames; bool tagNameFilled; STableMeta* pStbMeta; @@ -13936,18 +13935,6 @@ static int32_t parseCsvFile(SMsgBuf* pMsgBuf, SParseContext* pParseCxt, SParseFi code = parseOneStbRow(pMsgBuf, pParFileCxt); - if (TSDB_CODE_SUCCESS == code) { - if (taosHashGet(pParFileCxt->pTbNameHash, pParFileCxt->ctbName.tname, strlen(pParFileCxt->ctbName.tname) + 1) != - NULL) { - taosMemoryFreeClear(pParFileCxt->pTag); - code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TBNAME_DUPLICATED, pParFileCxt->ctbName.tname); - break; - } - - code = taosHashPut(pParFileCxt->pTbNameHash, pParFileCxt->ctbName.tname, strlen(pParFileCxt->ctbName.tname) + 1, - NULL, 0); - } - if (TSDB_CODE_SUCCESS == code) { code = fillVgroupInfo(pParseCxt, &pParFileCxt->ctbName, &pParFileCxt->vg); } @@ -13987,7 +13974,6 @@ static void destructParseFileContext(SParseFileContext** ppParFileCxt) { SParseFileContext* pParFileCxt = *ppParFileCxt; - taosHashCleanup(pParFileCxt->pTbNameHash); taosArrayDestroy(pParFileCxt->aTagNames); taosMemoryFreeClear(pParFileCxt->pStbMeta); taosArrayDestroy(pParFileCxt->aTagIndexs); @@ -14012,15 +13998,6 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S pParFileCxt->ctbName.acctId = acctId; strcpy(pParFileCxt->ctbName.dbname, pStmt->useDbName); - if (NULL == pParFileCxt->pTbNameHash) { - pParFileCxt->pTbNameHash = - taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK); - if (!pParFileCxt->pTbNameHash) { - code = TSDB_CODE_OUT_OF_MEMORY; - goto _ERR; - } - } - if (NULL == pParFileCxt->aTagNames) { pParFileCxt->aTagNames = taosArrayInit(8, TSDB_COL_NAME_LEN); if (NULL == pParFileCxt->aTagNames) { From c8ee66eee2cceb4b4e917f3f83fa282c3bec34e1 Mon Sep 17 00:00:00 2001 From: lyh250-666 Date: Thu, 12 Sep 2024 20:57:36 +0800 Subject: [PATCH 03/20] modify error code passing --- source/common/src/cos_cp.c | 2 +- source/common/src/tdatablock.c | 29 ++++++++++----------- source/common/src/tdataformat.c | 18 ++++++------- source/common/src/tmisce.c | 4 +-- source/common/src/tmsg.c | 8 +++--- source/common/src/trow.c | 2 +- source/common/src/ttime.c | 12 ++++----- source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 8 +++--- source/dnode/mgmt/mgmt_dnode/src/dmInt.c | 2 +- source/dnode/mgmt/mgmt_mnode/src/mmFile.c | 8 +++--- source/dnode/mgmt/mgmt_snode/src/smWorker.c | 6 ++--- source/dnode/mgmt/mgmt_vnode/src/vmFile.c | 8 +++--- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 2 +- source/dnode/mgmt/node_mgmt/src/dmMgmt.c | 3 +-- source/dnode/mgmt/node_util/src/dmEps.c | 12 ++++----- source/dnode/mgmt/node_util/src/dmFile.c | 10 +++---- 16 files changed, 66 insertions(+), 68 deletions(-) diff --git a/source/common/src/cos_cp.c b/source/common/src/cos_cp.c index e9af9c0306..1db417f6d9 100644 --- a/source/common/src/cos_cp.c +++ b/source/common/src/cos_cp.c @@ -170,7 +170,7 @@ int32_t cos_cp_load(char const* filepath, SCheckpoint* checkpoint) { cp_body = taosMemoryMalloc(size + 1); if (!cp_body) { - TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, &lino, _exit); + TAOS_CHECK_GOTO(terrno, &lino, _exit); } int64_t n = taosReadFile(fd, cp_body, size); diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index ea3e88919b..757813dfbc 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -124,7 +124,7 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* buf = taosMemoryRealloc(pColumnInfoData->pData, newSize); if (buf == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumnInfoData->pData = buf; @@ -170,7 +170,7 @@ static int32_t colDataReserve(SColumnInfoData* pColumnInfoData, size_t newSize) if (pColumnInfoData->varmeta.allocLen < newSize) { char* buf = taosMemoryRealloc(pColumnInfoData->pData, newSize); if (buf == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumnInfoData->pData = buf; @@ -388,7 +388,7 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int if (finalNumOfRows > (*capacity)) { char* p = taosMemoryRealloc(pColumnInfoData->varmeta.offset, sizeof(int32_t) * (numOfRow1 + numOfRow2)); if (p == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } *capacity = finalNumOfRows; @@ -409,7 +409,7 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int if (pColumnInfoData->varmeta.allocLen < len + oldLen) { char* tmp = taosMemoryRealloc(pColumnInfoData->pData, len + oldLen); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumnInfoData->pData = tmp; @@ -425,14 +425,14 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int // all data may be null, when the pColumnInfoData->info.type == 0, bytes == 0; char* tmp = taosMemoryRealloc(pColumnInfoData->pData, finalNumOfRows * pColumnInfoData->info.bytes); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumnInfoData->pData = tmp; if (BitmapLen(numOfRow1) < BitmapLen(finalNumOfRows)) { char* btmp = taosMemoryRealloc(pColumnInfoData->nullbitmap, BitmapLen(finalNumOfRows)); if (btmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } uint32_t extend = BitmapLen(finalNumOfRows) - BitmapLen(numOfRow1); memset(btmp + BitmapLen(numOfRow1), 0, extend); @@ -469,7 +469,7 @@ int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* p if (pColumnInfoData->varmeta.allocLen < newLen) { char* tmp = taosMemoryRealloc(pColumnInfoData->pData, newLen); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumnInfoData->pData = tmp; @@ -545,7 +545,7 @@ int32_t colDataAssignNRows(SColumnInfoData* pDst, int32_t dstIdx, const SColumnI if (pDst->varmeta.allocLen < pDst->varmeta.length + allLen) { char* tmp = taosMemoryRealloc(pDst->pData, pDst->varmeta.length + allLen); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pDst->pData = tmp; @@ -995,7 +995,7 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) { size_t metaSize = pBlock->info.rows * sizeof(int32_t); char* tmp = taosMemoryRealloc(pCol->varmeta.offset, metaSize); // preview calloc is too small if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pCol->varmeta.offset = (int32_t*)tmp; @@ -1013,7 +1013,7 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) { if (pCol->varmeta.allocLen < colLength) { char* tmp = taosMemoryRealloc(pCol->pData, colLength); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pCol->pData = tmp; @@ -1094,7 +1094,7 @@ int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity) if (pCol->varmeta.allocLen < colLength) { char* tmp = taosMemoryRealloc(pCol->pData, colLength); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pCol->pData = tmp; @@ -1417,7 +1417,6 @@ int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) { int32_t* index = createTupleIndex(rows); if (index == NULL) { - terrno = TSDB_CODE_OUT_OF_MEMORY; return terrno; } @@ -1540,7 +1539,7 @@ int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockI if (IS_VAR_DATA_TYPE(pColumn->info.type)) { char* tmp = taosMemoryRealloc(pColumn->varmeta.offset, sizeof(int32_t) * numOfRows); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pColumn->varmeta.offset = (int32_t*)tmp; @@ -1549,7 +1548,7 @@ int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockI // prepare for the null bitmap char* tmp = taosMemoryRealloc(pColumn->nullbitmap, BitmapLen(numOfRows)); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } int32_t oldLen = BitmapLen(existedRows); @@ -1563,7 +1562,7 @@ int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockI // to MALLOC_ALIGN_BYTES tmp = taosMemoryMallocAlign(MALLOC_ALIGN_BYTES, numOfRows * pColumn->info.bytes); if (tmp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } // memset(tmp, 0, numOfRows * pColumn->info.bytes); diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 24e669577a..4b44e4af43 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -489,7 +489,7 @@ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, colVal = COL_VAL_VALUE(infos[iInfo].columnId, value); } if (taosArrayPush(colValArray, &colVal) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -500,7 +500,7 @@ int32_t tRowBuildFromBind(SBindInfo *infos, int32_t numOfInfos, bool infoSorted, } if ((taosArrayPush(rowArray, &row)) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -702,7 +702,7 @@ static int32_t tRowMergeImpl(SArray *aRowP, STSchema *pTSchema, int32_t iStart, if (pColVal) { if (taosArrayPush(aColVal, pColVal) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -1756,7 +1756,7 @@ int32_t tTagToValArray(const STag *pTag, SArray **ppArray) { } (void)tGetTagVal(p + offset, &tv, pTag->flags & TD_TAG_JSON); if (taosArrayPush(*ppArray, &tv) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _err; } } @@ -3251,13 +3251,13 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte } if ((bufArray = taosArrayInit(numOfInfos, sizeof(uint8_t *))) == NULL) { taosArrayDestroy(colValArray); - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } for (int i = 0; i < numOfInfos; ++i) { if (!taosArrayPush(bufArray, &infos[i].bind->buffer)) { taosArrayDestroy(colValArray); taosArrayDestroy(bufArray); - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } } @@ -3294,7 +3294,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte colVal = COL_VAL_VALUE(infos[iInfo].columnId, value); } if (taosArrayPush(colValArray, &colVal) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -3305,7 +3305,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte } if ((taosArrayPush(rowArray, &row)) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -3502,7 +3502,7 @@ static int32_t tColDataMerge(SArray **colArr) { dst = taosArrayInit(taosArrayGetSize(src), sizeof(SColData)); if (dst == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } for (int32_t i = 0; i < taosArrayGetSize(src); i++) { diff --git a/source/common/src/tmisce.c b/source/common/src/tmisce.c index f3f4b29617..338de6242e 100644 --- a/source/common/src/tmisce.c +++ b/source/common/src/tmisce.c @@ -179,7 +179,7 @@ int32_t epsetToStr(const SEpSet* pEpSet, char* pBuf, int32_t cap) { int32_t taosGenCrashJsonMsg(int signum, char** pMsg, int64_t clusterId, int64_t startTime) { int32_t code = 0; SJson* pJson = tjsonCreateObject(); - if (pJson == NULL) return TSDB_CODE_OUT_OF_MEMORY; + if (pJson == NULL) return terrno; char tmp[4096] = {0}; @@ -242,7 +242,7 @@ int32_t taosGenCrashJsonMsg(int signum, char** pMsg, int64_t clusterId, int64_t char* pCont = tjsonToString(pJson); if (pCont == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; TAOS_CHECK_GOTO(code, NULL, _exit); goto _exit; } diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 758a4aeec3..1f2268242f 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -12026,19 +12026,19 @@ int32_t tCloneTbTSMAInfo(STableTSMAInfo *pInfo, STableTSMAInfo **pRes) { *pRet = *pInfo; if (pInfo->pFuncs) { pRet->pFuncs = taosArrayDup(pInfo->pFuncs, NULL); - if (!pRet->pFuncs) code = TSDB_CODE_OUT_OF_MEMORY; + if (!pRet->pFuncs) code = terrno; } if (pInfo->pTags && code == TSDB_CODE_SUCCESS) { pRet->pTags = taosArrayDup(pInfo->pTags, NULL); - if (!pRet->pTags) code = TSDB_CODE_OUT_OF_MEMORY; + if (!pRet->pTags) code = terrno; } if (pInfo->pUsedCols && code == TSDB_CODE_SUCCESS) { pRet->pUsedCols = taosArrayDup(pInfo->pUsedCols, NULL); - if (!pRet->pUsedCols) code = TSDB_CODE_OUT_OF_MEMORY; + if (!pRet->pUsedCols) code = terrno; } if (pInfo->ast && code == TSDB_CODE_SUCCESS) { pRet->ast = taosStrdup(pInfo->ast); - if (!pRet->ast) code = TSDB_CODE_OUT_OF_MEMORY; + if (!pRet->ast) code = terrno; } if (code) { tFreeAndClearTableTSMAInfo(pRet); diff --git a/source/common/src/trow.c b/source/common/src/trow.c index 760b86dee1..40b4f863cb 100644 --- a/source/common/src/trow.c +++ b/source/common/src/trow.c @@ -482,7 +482,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r if (isAlloc) { taosMemoryFreeClear(*ppRow); } - TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + TAOS_RETURN(terrno); } } diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c index d771830d3f..7e8749ef8b 100644 --- a/source/common/src/ttime.c +++ b/source/common/src/ttime.c @@ -1247,7 +1247,7 @@ static int32_t parseTsFormat(const char* formatStr, SArray* formats) { const TSFormatKeyWord* key = keywordSearch(formatStr); if (key) { TSFormatNode format = {.key = key, .type = TS_FORMAT_NODE_TYPE_KEYWORD}; - if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(terrno); formatStr += key->len; lastOtherFormat = NULL; } else { @@ -1274,7 +1274,7 @@ static int32_t parseTsFormat(const char* formatStr, SArray* formats) { TSFormatNode format = {.type = TS_FORMAT_NODE_TYPE_CHAR, .key = NULL}; format.c = formatStr; format.len = 1; - if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(terrno); formatStr++; last = taosArrayGetLast(formats); } @@ -1301,7 +1301,7 @@ static int32_t parseTsFormat(const char* formatStr, SArray* formats) { .key = NULL}; format.c = formatStr; format.len = 1; - if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + if (NULL == taosArrayPush(formats, &format)) TAOS_RETURN(terrno); formatStr++; if (format.type == TS_FORMAT_NODE_TYPE_CHAR) lastOtherFormat = taosArrayGetLast(formats); } @@ -1910,7 +1910,7 @@ int32_t taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t pr if (!*formats) { *formats = taosArrayInit(8, sizeof(TSFormatNode)); if (!*formats) { - TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + TAOS_RETURN(terrno); } TAOS_CHECK_RETURN(parseTsFormat(format, *formats)); } @@ -1926,7 +1926,7 @@ int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int if (!*formats) { *formats = taosArrayInit(4, sizeof(TSFormatNode)); if (!*formats) { - TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + TAOS_RETURN(terrno); } TAOS_CHECK_RETURN(parseTsFormat(format, *formats)); } @@ -1951,7 +1951,7 @@ int32_t TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* ou SArray* formats = taosArrayInit(4, sizeof(TSFormatNode)); if (!formats) { - TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + TAOS_RETURN(terrno); } TAOS_CHECK_RETURN(parseTsFormat(format, formats)); struct STm tm; diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c index 9c22a11674..f9ae94c53f 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c @@ -345,7 +345,7 @@ int32_t dmProcessServerRunStatus(SDnodeMgmt *pMgmt, SRpcMsg *pMsg) { void *pRsp = rpcMallocCont(rspLen); if (pRsp == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; // rspMsg.code = TSDB_CODE_OUT_OF_MEMORY; // return rspMsg.code; } @@ -383,7 +383,7 @@ int32_t dmBuildVariablesBlock(SSDataBlock **ppBlock) { pBlock->pDataBlock = taosArrayInit(pMeta[index].colNum, sizeof(SColumnInfoData)); if (pBlock->pDataBlock == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } @@ -393,7 +393,7 @@ int32_t dmBuildVariablesBlock(SSDataBlock **ppBlock) { colInfoData.info.type = pMeta[index].schema[i].type; colInfoData.info.bytes = pMeta[index].schema[i].bytes; if (taosArrayPush(pBlock->pDataBlock, &colInfoData) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _exit; } } @@ -457,7 +457,7 @@ int32_t dmProcessRetrieve(SDnodeMgmt *pMgmt, SRpcMsg *pMsg) { SRetrieveMetaTableRsp *pRsp = rpcMallocCont(size); if (pRsp == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; dError("failed to retrieve data since %s", tstrerror(code)); blockDataDestroy(pBlock); return code; diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c index d7170398fb..1561ab0a6b 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c @@ -54,7 +54,7 @@ static int32_t dmOpenMgmt(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) { int32_t code = 0; SDnodeMgmt *pMgmt = taosMemoryCalloc(1, sizeof(SDnodeMgmt)); if (pMgmt == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } pMgmt->pData = pInput->pData; diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c index 563d123b83..f02970e4b2 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c @@ -91,7 +91,7 @@ int32_t mmReadFile(const char *path, SMnodeOpt *pOption) { pData = taosMemoryMalloc(size + 1); if (pData == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -134,14 +134,14 @@ static int32_t mmEncodeOption(SJson *pJson, const SMnodeOpt *pOption) { SJson *replicas = tjsonCreateArray(); if (replicas == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } if ((code = tjsonAddItemToObject(pJson, "replicas", replicas)) < 0) return code; for (int32_t i = 0; i < pOption->numOfTotalReplicas; ++i) { SJson *replica = tjsonCreateObject(); if (replica == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } const SReplica *pReplica = pOption->replicas + i; @@ -183,7 +183,7 @@ int32_t mmWriteFile(const char *path, const SMnodeOpt *pOption) { // terrno = TSDB_CODE_OUT_OF_MEMORY; pJson = tjsonCreateObject(); if (pJson == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } diff --git a/source/dnode/mgmt/mgmt_snode/src/smWorker.c b/source/dnode/mgmt/mgmt_snode/src/smWorker.c index ad602313e0..e8594130d6 100644 --- a/source/dnode/mgmt/mgmt_snode/src/smWorker.c +++ b/source/dnode/mgmt/mgmt_snode/src/smWorker.c @@ -71,14 +71,14 @@ int32_t smStartWorker(SSnodeMgmt *pMgmt) { int32_t code = 0; pMgmt->writeWroker = taosArrayInit(0, sizeof(SMultiWorker *)); if (pMgmt->writeWroker == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; return code; } for (int32_t i = 0; i < tsNumOfSnodeWriteThreads; i++) { SMultiWorker *pWriteWorker = taosMemoryMalloc(sizeof(SMultiWorker)); if (pWriteWorker == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; return code; } @@ -93,7 +93,7 @@ int32_t smStartWorker(SSnodeMgmt *pMgmt) { return code; } if (taosArrayPush(pMgmt->writeWroker, &pWriteWorker) == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; return code; } } diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c index 8513d31695..1e61d450b9 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c @@ -128,7 +128,7 @@ int32_t vmGetVnodeListFromFile(SVnodeMgmt *pMgmt, SWrapperCfg **ppCfgs, int32_t pData = taosMemoryMalloc(size + 1); if (pData == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -169,7 +169,7 @@ static int32_t vmEncodeVnodeList(SJson *pJson, SVnodeObj **ppVnodes, int32_t num int32_t code = 0; SJson *vnodes = tjsonCreateArray(); if (vnodes == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } if ((code = tjsonAddItemToObject(pJson, "vnodes", vnodes)) < 0) { tjsonDelete(vnodes); @@ -181,7 +181,7 @@ static int32_t vmEncodeVnodeList(SJson *pJson, SVnodeObj **ppVnodes, int32_t num if (pVnode == NULL) continue; SJson *vnode = tjsonCreateObject(); - if (vnode == NULL) return TSDB_CODE_OUT_OF_MEMORY; + if (vnode == NULL) return terrno; if ((code = tjsonAddDoubleToObject(vnode, "vgId", pVnode->vgId)) < 0) return code; if ((code = tjsonAddDoubleToObject(vnode, "dropped", pVnode->dropped)) < 0) return code; if ((code = tjsonAddDoubleToObject(vnode, "vgVersion", pVnode->vgVersion)) < 0) return code; @@ -221,7 +221,7 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) { // terrno = TSDB_CODE_OUT_OF_MEMORY; pJson = tjsonCreateObject(); if (pJson == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } if ((code = vmEncodeVnodeList(pJson, ppVnodes, numOfVnodes)) != 0) goto _OVER; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 2abf292e73..f020ba2f5e 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -921,7 +921,7 @@ int32_t vmProcessArbHeartBeatReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { void *pRsp = rpcMallocCont(rspLen); if (pRsp == NULL) { - terrno = TSDB_CODE_OUT_OF_MEMORY; + terrno = terrno; goto _OVER; } diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c index fdce9fd4c9..ba0a40e048 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c @@ -161,8 +161,7 @@ int32_t dmInitVars(SDnode *pDnode) { pData->dnodeHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_NO_LOCK); if (pData->dnodeHash == NULL) { dError("failed to init dnode hash"); - code = TSDB_CODE_OUT_OF_MEMORY; - return terrno = code; + return terrno; } if ((code = dmReadEps(pData)) != 0) { diff --git a/source/dnode/mgmt/node_util/src/dmEps.c b/source/dnode/mgmt/node_util/src/dmEps.c index 315c4d7430..7cd794500c 100644 --- a/source/dnode/mgmt/node_util/src/dmEps.c +++ b/source/dnode/mgmt/node_util/src/dmEps.c @@ -217,7 +217,7 @@ int32_t dmReadEps(SDnodeData *pData) { content = taosMemoryMalloc(size + 1); if (content == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -321,7 +321,7 @@ int32_t dmWriteEps(SDnodeData *pData) { TAOS_CHECK_GOTO(dmInitDndInfo(pData), NULL, _OVER); pJson = tjsonCreateObject(); - if (pJson == NULL) TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, NULL, _OVER); + if (pJson == NULL) TAOS_CHECK_GOTO(terrno, NULL, _OVER); pData->engineVer = tsVersion; @@ -329,7 +329,7 @@ int32_t dmWriteEps(SDnodeData *pData) { buffer = tjsonToString(pJson); if (buffer == NULL) { - TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, NULL, _OVER); + TAOS_CHECK_GOTO(terrno, NULL, _OVER); } pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_WRITE_THROUGH); @@ -575,7 +575,7 @@ static int32_t dmDecodeEpPairs(SJson *pJson, SDnodeData *pData) { tjsonGetUInt16ValueFromDouble(dnode, "new_port", pair.newPort, code); if (code < 0) return TSDB_CODE_INVALID_CFG_VALUE; - if (taosArrayPush(pData->oldDnodeEps, &pair) == NULL) return TSDB_CODE_OUT_OF_MEMORY; + if (taosArrayPush(pData->oldDnodeEps, &pair) == NULL) return terrno; } return code; @@ -621,7 +621,7 @@ static int32_t dmReadDnodePairs(SDnodeData *pData) { content = taosMemoryMalloc(size + 1); if (content == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -641,7 +641,7 @@ static int32_t dmReadDnodePairs(SDnodeData *pData) { pData->oldDnodeEps = taosArrayInit(1, sizeof(SDnodeEpPair)); if (pData->oldDnodeEps == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; dError("failed to calloc dnodeEp array since %s", strerror(errno)); goto _OVER; } diff --git a/source/dnode/mgmt/node_util/src/dmFile.c b/source/dnode/mgmt/node_util/src/dmFile.c index c8b24d5469..ae66999bcf 100644 --- a/source/dnode/mgmt/node_util/src/dmFile.c +++ b/source/dnode/mgmt/node_util/src/dmFile.c @@ -70,7 +70,7 @@ int32_t dmReadFile(const char *path, const char *name, bool *pDeployed) { content = taosMemoryMalloc(size + 1); if (content == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -134,7 +134,7 @@ int32_t dmWriteFile(const char *path, const char *name, bool deployed) { pJson = tjsonCreateObject(); if (pJson == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -230,7 +230,7 @@ static int32_t dmWriteCheckCodeFile(char *file, char *realfile, char *key, bool int32_t len = ENCRYPTED_LEN(sizeof(DM_KEY_INDICATOR)); result = taosMemoryMalloc(len); if (result == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } SCryptOpts opts; @@ -338,7 +338,7 @@ static int32_t dmCompareEncryptKey(char *file, char *key, bool toLogFile) { content = taosMemoryMalloc(size); if (content == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } @@ -479,7 +479,7 @@ static int32_t dmReadEncryptCodeFile(char *file, char **output) { content = taosMemoryMalloc(size + 1); if (content == NULL) { - code = TSDB_CODE_OUT_OF_MEMORY; + code = terrno; goto _OVER; } From 0335799e1cc9b813aff10d065cf71b1e522123db Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 12 Sep 2024 21:48:54 +0800 Subject: [PATCH 04/20] refactor: remove void. --- source/dnode/mnode/impl/src/mndStream.c | 12 ++++---- source/dnode/mnode/impl/src/mndStreamHb.c | 11 +++++--- source/dnode/mnode/impl/src/mndStreamUtil.c | 31 +++++++++++++++------ 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index cbe631912c..e0b8caa938 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -2221,7 +2221,11 @@ static int32_t refreshNodeListFromExistedStreams(SMnode *pMnode, SArray *pNodeLi } char buf[256] = {0}; - (void) epsetToStr(&pEntry->epset, buf, tListLen(buf)); // ignore this error since it is only for log file + int32_t ret = epsetToStr(&pEntry->epset, buf, tListLen(buf)); // ignore this error since it is only for log file + if (ret != 0) { // print error and continue + mError("failed to convert epset to str, code:%s", tstrerror(ret)); + } + mDebug("extract nodeInfo from stream obj, nodeId:%d, %s", pEntry->nodeId, buf); } @@ -2231,7 +2235,7 @@ static int32_t refreshNodeListFromExistedStreams(SMnode *pMnode, SArray *pNodeLi return code; } -static int32_t addAllDbsIntoHashmap(SHashObj *pDBMap, SSdb *pSdb) { +static void addAllDbsIntoHashmap(SHashObj *pDBMap, SSdb *pSdb) { void *pIter = NULL; int32_t code = 0; while (1) { @@ -2249,8 +2253,6 @@ static int32_t addAllDbsIntoHashmap(SHashObj *pDBMap, SSdb *pSdb) { mDebug("add Db:%s into Dbs list (total:%d) for kill checkpoint trans", pVgroup->dbName, size); } } - - return code; } // this function runs by only one thread, so it is not multi-thread safe @@ -2311,7 +2313,7 @@ static int32_t mndProcessNodeCheckReq(SRpcMsg *pMsg) { mInfo("rollback all stream due to mnode leader/follower switch by using nodeUpdate trans"); updateAllVgroups = true; execInfo.switchFromFollower = false; // reset the flag - (void) addAllDbsIntoHashmap(changeInfo.pDBMap, pMnode->pSdb); + addAllDbsIntoHashmap(changeInfo.pDBMap, pMnode->pSdb); } } diff --git a/source/dnode/mnode/impl/src/mndStreamHb.c b/source/dnode/mnode/impl/src/mndStreamHb.c index 43f9d8d055..941956ae2b 100644 --- a/source/dnode/mnode/impl/src/mndStreamHb.c +++ b/source/dnode/mnode/impl/src/mndStreamHb.c @@ -194,10 +194,13 @@ int32_t mndSendDropOrphanTasksMsg(SMnode *pMnode, SArray *pList) { return terrno; } - (void)tSerializeDropOrphanTaskMsg(pReq, contLen, &msg); + int32_t code = tSerializeDropOrphanTaskMsg(pReq, contLen, &msg); + if (code <= 0) { + mError("failed to serialize the drop orphan task msg, code:%s", tstrerror(code)); + } SRpcMsg rpcMsg = {.msgType = TDMT_MND_STREAM_DROP_ORPHANTASKS, .pCont = pReq, .contLen = contLen}; - int32_t code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); + code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); if (code) { mError("failed to put drop-orphan task msg into write queue, code:%s", tstrerror(code)); } else { @@ -216,7 +219,7 @@ int32_t mndProcessResetStatusReq(SRpcMsg *pReq) { mndKillTransImpl(pMnode, pMsg->transId, ""); streamMutexLock(&execInfo.lock); - (void) mndResetChkptReportInfo(execInfo.pChkptStreams, pMsg->streamId); + code = mndResetChkptReportInfo(execInfo.pChkptStreams, pMsg->streamId); // do thing if failed streamMutexUnlock(&execInfo.lock); code = mndGetStreamObj(pMnode, pMsg->streamId, &pStream); @@ -393,7 +396,7 @@ int32_t mndProcessStreamHb(SRpcMsg *pReq) { int32_t numOfUpdated = taosArrayGetSize(req.pUpdateNodes); if (numOfUpdated > 0) { mDebug("%d stream node(s) need updated from hbMsg(vgId:%d)", numOfUpdated, req.vgId); - (void) setNodeEpsetExpiredFlag(req.pUpdateNodes); + int32_t unused = setNodeEpsetExpiredFlag(req.pUpdateNodes); } bool snodeChanged = false; diff --git a/source/dnode/mnode/impl/src/mndStreamUtil.c b/source/dnode/mnode/impl/src/mndStreamUtil.c index b2e35827af..bad44a8687 100644 --- a/source/dnode/mnode/impl/src/mndStreamUtil.c +++ b/source/dnode/mnode/impl/src/mndStreamUtil.c @@ -165,7 +165,10 @@ int32_t mndTakeVgroupSnapshot(SMnode *pMnode, bool *allReady, SArray **pList) { } char buf[256] = {0}; - (void)epsetToStr(&entry.epset, buf, tListLen(buf)); + code = epsetToStr(&entry.epset, buf, tListLen(buf)); + if (code != 0) { // print error and continue + mError("failed to convert epset to str, code:%s", tstrerror(code)); + } void *p = taosArrayPush(pVgroupList, &entry); if (p == NULL) { @@ -198,7 +201,10 @@ int32_t mndTakeVgroupSnapshot(SMnode *pMnode, bool *allReady, SArray **pList) { } char buf[256] = {0}; - (void)epsetToStr(&entry.epset, buf, tListLen(buf)); + code = epsetToStr(&entry.epset, buf, tListLen(buf)); + if (code != 0) { // print error and continue + mError("failed to convert epset to str, code:%s", tstrerror(code)); + } void *p = taosArrayPush(pVgroupList, &entry); if (p == NULL) { @@ -424,9 +430,12 @@ static int32_t doSetPauseAction(SMnode *pMnode, STrans *pTrans, SStreamTask *pTa } char buf[256] = {0}; - (void) epsetToStr(&epset, buf, tListLen(buf)); - mDebug("pause stream task in node:%d, epset:%s", pTask->info.nodeId, buf); + code = epsetToStr(&epset, buf, tListLen(buf)); + if (code != 0) { // print error and continue + mError("failed to convert epset to str, code:%s", tstrerror(code)); + } + mDebug("pause stream task in node:%d, epset:%s", pTask->info.nodeId, buf); code = setTransAction(pTrans, pReq, sizeof(SVPauseStreamTaskReq), TDMT_STREAM_TASK_PAUSE, &epset, 0, TSDB_CODE_VND_INVALID_VGROUP_ID); if (code != 0) { taosMemoryFree(pReq); @@ -639,8 +648,7 @@ static int32_t doBuildStreamTaskUpdateMsg(void **pBuf, int32_t *pLen, SVgroupCha static int32_t doSetUpdateTaskAction(SMnode *pMnode, STrans *pTrans, SStreamTask *pTask, SVgroupChangeInfo *pInfo) { void *pBuf = NULL; int32_t len = 0; - (void)streamTaskUpdateEpsetInfo(pTask, pInfo->pUpdateNodeList); - + bool unusedRet = streamTaskUpdateEpsetInfo(pTask, pInfo->pUpdateNodeList); int32_t code = doBuildStreamTaskUpdateMsg(&pBuf, &len, pInfo, pTask->info.nodeId, &pTask->id, pTrans->id); if (code) { return code; @@ -914,8 +922,15 @@ void removeStreamTasksInBuf(SStreamObj *pStream, SStreamExecInfo *pExecNode) { } // 2. remove stream entry in consensus hash table and checkpoint-report hash table - (void) mndClearConsensusCheckpointId(execInfo.pStreamConsensus, pStream->uid); - (void) mndClearChkptReportInfo(execInfo.pChkptStreams, pStream->uid); + code = mndClearConsensusCheckpointId(execInfo.pStreamConsensus, pStream->uid); + if (code) { + mError("failed to clear consensus checkpointId, code:%s", tstrerror(code)); + } + + code = mndClearChkptReportInfo(execInfo.pChkptStreams, pStream->uid); + if (code) { + mError("failed to clear the checkpoint report info, code:%s", tstrerror(code)); + } streamMutexUnlock(&pExecNode->lock); destroyStreamTaskIter(pIter); From 49e2f1f0a4137f0962b56847a4ffd333dff79a1c Mon Sep 17 00:00:00 2001 From: wangjiaming0909 <604227650@qq.com> Date: Thu, 12 Sep 2024 14:57:03 +0800 Subject: [PATCH 05/20] avoid runtime error for double to int64_t conversion --- source/util/src/tunit.c | 28 ++++++++++++++++++++-------- tests/system-test/0-others/show.py | 14 ++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/source/util/src/tunit.c b/source/util/src/tunit.c index 57226878dd..e73045cc89 100644 --- a/source/util/src/tunit.c +++ b/source/util/src/tunit.c @@ -23,14 +23,16 @@ #define UNIT_ONE_PEBIBYTE (UNIT_ONE_TEBIBYTE * UNIT_SIZE_CONVERT_FACTOR) #define UNIT_ONE_EXBIBYTE (UNIT_ONE_PEBIBYTE * UNIT_SIZE_CONVERT_FACTOR) -static int32_t parseCfgIntWithUnit(const char* str, double* res) { - double val, temp = (double)INT64_MAX; +static int32_t parseCfgIntWithUnit(const char* str, int64_t* res) { + double val = 0, temp = (double)INT64_MAX; char* endPtr; + bool useDouble = false; errno = 0; - val = taosStr2Int64(str, &endPtr, 0); + int64_t int64Val = taosStr2Int64(str, &endPtr, 0); if (*endPtr == '.' || errno == ERANGE) { errno = 0; val = taosStr2Double(str, &endPtr); + useDouble = true; } if (endPtr == str || errno == ERANGE || isnan(val)) { return terrno = TSDB_CODE_INVALID_CFG_VALUE; @@ -67,23 +69,33 @@ static int32_t parseCfgIntWithUnit(const char* str, double* res) { default: return terrno = TSDB_CODE_INVALID_CFG_VALUE; } + endPtr++; + if ((val > 0 && val > temp) || (val < 0 && val < -temp)) { return terrno = TSDB_CODE_OUT_OF_RANGE; } - endPtr++; val *= factor; + int64Val *= factor; } while (isspace((unsigned char)*endPtr)) endPtr++; if (*endPtr) { return terrno = TSDB_CODE_INVALID_CFG_VALUE; } - val = rint(val); - *res = val; + if (useDouble) { + val = rint(val); + if ((val > 0 && val >= (double)INT64_MAX) || (val < 0 && val <= (double)INT64_MIN)) { + return terrno = TSDB_CODE_OUT_OF_RANGE; + } else { + *res = (int64_t)val; + } + } else { + *res = int64Val; + } return TSDB_CODE_SUCCESS; } int32_t taosStrHumanToInt64(const char* str, int64_t* out) { - double res; + int64_t res; int32_t code = parseCfgIntWithUnit(str, &res); if (code == TSDB_CODE_SUCCESS) *out = (int64_t)res; return code; @@ -109,7 +121,7 @@ void taosInt64ToHumanStr(int64_t val, char* outStr) { #endif int32_t taosStrHumanToInt32(const char* str, int32_t* out) { - double res; + int64_t res; int32_t code = parseCfgIntWithUnit(str, &res); if (code == TSDB_CODE_SUCCESS) { if (res < INT32_MIN || res > INT32_MAX) { diff --git a/tests/system-test/0-others/show.py b/tests/system-test/0-others/show.py index 64696c5e6d..032e5eebe1 100644 --- a/tests/system-test/0-others/show.py +++ b/tests/system-test/0-others/show.py @@ -284,6 +284,20 @@ class TDTestCase: for error_val in error_vals: tdSql.error(f'ALTER DNODE 1 "{var}" "{error_val}"') + var = 'randErrorDivisor' + vals = ['9223372036854775807', '9223372036854775807.1', '9223372036854775806', '9223372036854775808', '9223372036854775808.1', '9223372036854775807.0', '9223372036854775806.1'] + expected_vals = ['9223372036854775807', 'err', '9223372036854775806', 'err', 'err', 'err', 'err'] + for val_str, expected_val in zip(vals, expected_vals): + sql = f'ALTER dnode 1 "{var}" "{val_str}"' + if expected_val == 'err': + tdSql.error(sql) + else: + tdSql.execute(sql, queryTimes=1) + actual_val = self.get_variable(var, False) + if expected_val != actual_val: + tdLog.exit(f"failed to set local {var} to {expected_val} actually {actual_val}") + + def stop(self): tdSql.close() tdLog.success("%s successfully executed" % __file__) From 0cb4c927ec38d9a02e0511b34c5a919ecc5160db Mon Sep 17 00:00:00 2001 From: Jinqing Kuang Date: Wed, 11 Sep 2024 15:49:44 +0800 Subject: [PATCH 06/20] enh(query)[TD-31903]. Handle return values for function calls --- source/common/src/tdatablock.c | 52 ++++++++++++++---------- source/libs/executor/src/mergeoperator.c | 2 +- source/libs/executor/src/tlinearhash.c | 27 ++++++++---- source/libs/executor/src/tsort.c | 3 +- source/os/src/osFile.c | 3 +- source/os/src/osString.c | 3 +- source/util/src/tpagedbuf.c | 11 +++-- 7 files changed, 63 insertions(+), 38 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 08f6842c4b..22c4be5cc9 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -2517,24 +2517,25 @@ int32_t dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf pDataBlock->info.id.groupId, pDataBlock->info.id.uid, pDataBlock->info.rows, pDataBlock->info.version, pDataBlock->info.calWin.skey, pDataBlock->info.calWin.ekey, pDataBlock->info.parTbName); if (len >= size - 1) { - return code; + goto _exit; } for (int32_t j = 0; j < rows; j++) { len += snprintf(dumpBuf + len, size - len, "%s|", flag); if (len >= size - 1) { - return code; + goto _exit; } for (int32_t k = 0; k < colNum; k++) { SColumnInfoData* pColInfoData = taosArrayGet(pDataBlock->pDataBlock, k); if (pColInfoData == NULL) { - return terrno; + code = terrno; + goto _exit; } if (colDataIsNull(pColInfoData, rows, j, NULL) || !pColInfoData->pData) { len += snprintf(dumpBuf + len, size - len, " %15s |", "NULL"); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; continue; } @@ -2542,53 +2543,53 @@ int32_t dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf switch (pColInfoData->info.type) { case TSDB_DATA_TYPE_TIMESTAMP: memset(pBuf, 0, sizeof(pBuf)); - (void) formatTimestamp(pBuf, *(uint64_t*)var, pColInfoData->info.precision); + (void)formatTimestamp(pBuf, *(uint64_t*)var, pColInfoData->info.precision); len += snprintf(dumpBuf + len, size - len, " %25s |", pBuf); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_TINYINT: len += snprintf(dumpBuf + len, size - len, " %15d |", *(int8_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_UTINYINT: len += snprintf(dumpBuf + len, size - len, " %15d |", *(uint8_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_SMALLINT: len += snprintf(dumpBuf + len, size - len, " %15d |", *(int16_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_USMALLINT: len += snprintf(dumpBuf + len, size - len, " %15d |", *(uint16_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_INT: len += snprintf(dumpBuf + len, size - len, " %15d |", *(int32_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_UINT: len += snprintf(dumpBuf + len, size - len, " %15u |", *(uint32_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_BIGINT: len += snprintf(dumpBuf + len, size - len, " %15" PRId64 " |", *(int64_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_UBIGINT: len += snprintf(dumpBuf + len, size - len, " %15" PRIu64 " |", *(uint64_t*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_FLOAT: len += snprintf(dumpBuf + len, size - len, " %15f |", *(float*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_DOUBLE: len += snprintf(dumpBuf + len, size - len, " %15f |", *(double*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_BOOL: len += snprintf(dumpBuf + len, size - len, " %15d |", *(bool*)var); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; break; case TSDB_DATA_TYPE_VARCHAR: case TSDB_DATA_TYPE_VARBINARY: @@ -2599,24 +2600,33 @@ int32_t dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf dataSize = TMIN(dataSize, 50); memcpy(pBuf, varDataVal(pData), dataSize); len += snprintf(dumpBuf + len, size - len, " %15s |", pBuf); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; } break; case TSDB_DATA_TYPE_NCHAR: { char* pData = colDataGetVarData(pColInfoData, j); int32_t dataSize = TMIN(sizeof(pBuf), varDataLen(pData)); memset(pBuf, 0, sizeof(pBuf)); - (void)taosUcs4ToMbs((TdUcs4*)varDataVal(pData), dataSize, pBuf); + code = taosUcs4ToMbs((TdUcs4*)varDataVal(pData), dataSize, pBuf); + if (code < 0) { + uError("func %s failed to convert to ucs charset since %s", __func__, tstrerror(code)); + goto _exit; + } len += snprintf(dumpBuf + len, size - len, " %15s |", pBuf); - if (len >= size - 1) return 0; + if (len >= size - 1) goto _exit; } break; } } len += snprintf(dumpBuf + len, size - len, "%d\n", j); - if (len >= size - 1) return code; + if (len >= size - 1) goto _exit; } len += snprintf(dumpBuf + len, size - len, "%s |end\n", flag); *pDataBuf = dumpBuf; + dumpBuf = NULL; +_exit: + if (dumpBuf) { + taosMemoryFree(dumpBuf); + } return code; } diff --git a/source/libs/executor/src/mergeoperator.c b/source/libs/executor/src/mergeoperator.c index c94a330dbc..49973ac373 100644 --- a/source/libs/executor/src/mergeoperator.c +++ b/source/libs/executor/src/mergeoperator.c @@ -229,7 +229,7 @@ int32_t doSortMerge(SOperatorInfo* pOperator, SSDataBlock** pResBlock) { resetLimitInfoForNextGroup(&pInfo->limitInfo); } - (void)applyLimitOffset(&pInfo->limitInfo, p, pTaskInfo); + bool limitReached = applyLimitOffset(&pInfo->limitInfo, p, pTaskInfo); if (p->info.rows > 0) { break; diff --git a/source/libs/executor/src/tlinearhash.c b/source/libs/executor/src/tlinearhash.c index 763fc6a412..69ce50e150 100644 --- a/source/libs/executor/src/tlinearhash.c +++ b/source/libs/executor/src/tlinearhash.c @@ -150,10 +150,11 @@ static void doRemoveFromBucket(SFilePage* pPage, SLHashNode* pNode, SLHashBucket pBucket->size -= 1; } -static void doTrimBucketPages(SLHashObj* pHashObj, SLHashBucket* pBucket) { +static int32_t doTrimBucketPages(SLHashObj* pHashObj, SLHashBucket* pBucket) { + int32_t code = 0; size_t numOfPages = taosArrayGetSize(pBucket->pPageIdList); if (numOfPages <= 1) { - return; + return code; } int32_t* firstPage = taosArrayGet(pBucket->pPageIdList, 0); @@ -164,11 +165,14 @@ static void doTrimBucketPages(SLHashObj* pHashObj, SLHashBucket* pBucket) { if (pLast->num <= sizeof(SFilePage)) { // this is empty - // TODO check ret - (void)dBufSetBufPageRecycled(pHashObj->pBuf, pLast); + code = dBufSetBufPageRecycled(pHashObj->pBuf, pLast); + if (code != TSDB_CODE_SUCCESS) { + qError("%s failed to recycle buf page since %s", __func__, tstrerror(code)); + return code; + } releaseBufPage(pHashObj->pBuf, pFirst); taosArrayRemove(pBucket->pPageIdList, numOfPages - 1); - return; + return code; } char* pStart = pLast->data; @@ -191,8 +195,11 @@ static void doTrimBucketPages(SLHashObj* pHashObj, SLHashBucket* pBucket) { pStart += nodeSize; if (pLast->num <= sizeof(SFilePage)) { // this is empty - // TODO check ret - (void)dBufSetBufPageRecycled(pHashObj->pBuf, pLast); + code = dBufSetBufPageRecycled(pHashObj->pBuf, pLast); + if (code != TSDB_CODE_SUCCESS) { + qError("%s failed to recycle buf page since %s", __func__, tstrerror(code)); + return code; + } releaseBufPage(pHashObj->pBuf, pFirst); taosArrayRemove(pBucket->pPageIdList, numOfPages - 1); break; @@ -210,6 +217,7 @@ static void doTrimBucketPages(SLHashObj* pHashObj, SLHashBucket* pBucket) { break; } } + return code; } static int32_t doAddNewBucket(SLHashObj* pHashObj) { @@ -403,7 +411,10 @@ int32_t tHashPut(SLHashObj* pHashObj, const void* key, size_t keyLen, void* data releaseBufPage(pHashObj->pBuf, p); } - doTrimBucketPages(pHashObj, pBucket); + code = doTrimBucketPages(pHashObj, pBucket); + if (code != TSDB_CODE_SUCCESS) { + return code; + } } return code; diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c index 796ebbeb84..19b825b0ca 100644 --- a/source/libs/executor/src/tsort.c +++ b/source/libs/executor/src/tsort.c @@ -1308,8 +1308,7 @@ static int32_t getRowBufFromExtMemFile(SSortHandle* pHandle, int32_t regionId, i return terrno; } - // todo - (void)taosSeekCFile(pMemFile->pTdFile, pRegion->fileOffset, SEEK_SET); + TAOS_CHECK_RETURN(taosSeekCFile(pMemFile->pTdFile, pRegion->fileOffset, SEEK_SET)); int32_t readBytes = TMIN(pMemFile->blockSize, pRegion->regionSize); int32_t ret = taosReadFromCFile(pRegion->buf, readBytes, 1, pMemFile->pTdFile); diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c index 0e5b6b71a1..40f48af266 100644 --- a/source/os/src/osFile.c +++ b/source/os/src/osFile.c @@ -1535,8 +1535,9 @@ int taosSeekCFile(FILE *file, int64_t offset, int whence) { int code = fseeko(file, offset, whence); if (-1 == code) { terrno = TAOS_SYSTEM_ERROR(errno); + code = terrno; } - return terrno; + return code; #endif } diff --git a/source/os/src/osString.c b/source/os/src/osString.c index ffc64f3493..b1732a2ae1 100644 --- a/source/os/src/osString.c +++ b/source/os/src/osString.c @@ -351,7 +351,8 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) { int32_t code = 0; iconv_t conv = taosAcquireConv(&idx, C2M); if ((iconv_t)-1 == conv || (iconv_t)0 == conv) { - return TSDB_CODE_APP_ERROR; + code = TAOS_SYSTEM_ERROR(errno);; + return code; } size_t ucs4_input_len = ucs4_max_len; diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c index f22233a757..e8303b563e 100644 --- a/source/util/src/tpagedbuf.c +++ b/source/util/src/tpagedbuf.c @@ -316,7 +316,7 @@ static char* evictBufPage(SDiskbasedBuf* pBuf) { } terrno = 0; - (void)tdListPopNode(pBuf->lruList, pn); + pn = tdListPopNode(pBuf->lruList, pn); SPageInfo* d = *(SPageInfo**)pn->data; @@ -337,7 +337,7 @@ static int32_t lruListPushFront(SList* pList, SPageInfo* pi) { } static void lruListMoveToFront(SList* pList, SPageInfo* pi) { - (void)tdListPopNode(pList, pi->pn); + pi->pn = tdListPopNode(pList, pi->pn); tdListPrependNode(pList, pi->pn); } @@ -474,8 +474,11 @@ void* getNewBufPage(SDiskbasedBuf* pBuf, int32_t* pageId) { pBuf->totalBufSize += pBuf->pageSize; } else { taosMemoryFree(availablePage); - (void)taosArrayPop(pBuf->pIdList); - (void)tSimpleHashRemove(pBuf->all, pageId, sizeof(int32_t)); + SPageInfo **pLast = taosArrayPop(pBuf->pIdList); + int32_t ret = tSimpleHashRemove(pBuf->all, pageId, sizeof(int32_t)); + if (ret != TSDB_CODE_SUCCESS) { + uError("%s failed to clear pageId %d from buf hash-set since %s", __func__, *pageId, tstrerror(ret)); + } taosMemoryFree(pi); terrno = code; return NULL; From 19580c89eff7f42a4bdc7d9bb10ce5573383c710 Mon Sep 17 00:00:00 2001 From: wangjiaming0909 <604227650@qq.com> Date: Fri, 13 Sep 2024 13:25:36 +0800 Subject: [PATCH 07/20] postfix conn/app cache check time --- source/dnode/mnode/impl/src/mndProfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c index f4c5e9f2a0..5d91b0b0d8 100644 --- a/source/dnode/mnode/impl/src/mndProfile.c +++ b/source/dnode/mnode/impl/src/mndProfile.c @@ -91,7 +91,7 @@ int32_t mndInitProfile(SMnode *pMnode) { SProfileMgmt *pMgmt = &pMnode->profileMgmt; // in ms - int32_t checkTime = tsShellActivityTimer * 2 * 1000; + int32_t checkTime = CACHE_OBJ_KEEP_TIME * 1000; pMgmt->connCache = taosCacheInit(TSDB_DATA_TYPE_UINT, checkTime, false, (__cache_free_fn_t)mndFreeConn, "conn"); if (pMgmt->connCache == NULL) { code = TSDB_CODE_OUT_OF_MEMORY; From 92171e080ed7c44d972cc220111fa043459040cf Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 13 Sep 2024 15:20:23 +0800 Subject: [PATCH 08/20] ostime and ossocket --- include/os/osTimezone.h | 2 +- include/util/taoserror.h | 1 + source/common/src/tglobal.c | 5 +- source/os/src/osEnv.c | 5 +- source/os/src/osRand.c | 2 +- source/os/src/osTimezone.c | 96 ++++++++++++++++++------------------- 6 files changed, 59 insertions(+), 52 deletions(-) diff --git a/include/os/osTimezone.h b/include/os/osTimezone.h index fab42e8e11..2a8d5a442d 100644 --- a/include/os/osTimezone.h +++ b/include/os/osTimezone.h @@ -54,7 +54,7 @@ enum TdTimezone { TdEastZone12 }; -void taosGetSystemTimezone(char *outTimezone, enum TdTimezone *tsTimezone); +int32_t taosGetSystemTimezone(char *outTimezone, enum TdTimezone *tsTimezone); int32_t taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight, enum TdTimezone *tsTimezone); #ifdef __cplusplus diff --git a/include/util/taoserror.h b/include/util/taoserror.h index eb329192a2..17bb6d373c 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -157,6 +157,7 @@ int32_t taosGetErrSize(); #define TSDB_CODE_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x0138) #define TSDB_CODE_SOCKET_ERROR TAOS_DEF_ERROR_CODE(0, 0x0139) #define TSDB_CODE_UNSUPPORT_OS TAOS_DEF_ERROR_CODE(0, 0x013A) +#define TSDB_CODE_TIME_ERROR TAOS_DEF_ERROR_CODE(0, 0x013B) //client #define TSDB_CODE_TSC_INVALID_OPERATION TAOS_DEF_ERROR_CODE(0, 0x0200) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 5b67e1267b..b852a096f8 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -1696,7 +1696,10 @@ int32_t taosReadDataFolder(const char *cfgDir, const char **envCmd, const char * SArray *pArgs) { int32_t code = TSDB_CODE_SUCCESS; - if (tsCfg == NULL) osDefaultInit(); + if (tsCfg == NULL) code = osDefaultInit(); + if (code != 0) { + (void)printf("failed to init os since %s\n", tstrerror(code)); + } SConfig *pCfg = NULL; TAOS_CHECK_RETURN(cfgInit(&pCfg)); diff --git a/source/os/src/osEnv.c b/source/os/src/osEnv.c index c0273e4a6f..f2c90e778d 100644 --- a/source/os/src/osEnv.c +++ b/source/os/src/osEnv.c @@ -50,7 +50,10 @@ int32_t osDefaultInit() { taosSeedRand(taosSafeRand()); taosGetSystemLocale(tsLocale, tsCharset); - taosGetSystemTimezone(tsTimezoneStr, &tsTimezone); + code = taosGetSystemTimezone(tsTimezoneStr, &tsTimezone); + if(code != 0) { + return code; + } if (strlen(tsTimezoneStr) > 0) { // ignore empty timezone if ((code = taosSetSystemTimezone(tsTimezoneStr, tsTimezoneStr, &tsDaylight, &tsTimezone)) != TSDB_CODE_SUCCESS) return code; diff --git a/source/os/src/osRand.c b/source/os/src/osRand.c index da4e8dfb9d..b99017782b 100644 --- a/source/os/src/osRand.c +++ b/source/os/src/osRand.c @@ -69,7 +69,7 @@ uint32_t taosSafeRand(void) { if (len < 0) { seed = (int)taosGetTimestampSec(); } - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); } return (uint32_t)seed; diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c index 8fdd296655..1d8a552862 100644 --- a/source/os/src/osTimezone.c +++ b/source/os/src/osTimezone.c @@ -811,7 +811,11 @@ int32_t taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, i #elif defined(_TD_DARWIN_64) - setenv("TZ", buf, 1); + code = setenv("TZ", buf, 1); + if (-1 == code) { + terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; + } tzset(); int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR); *tsTimezone = tz; @@ -839,13 +843,17 @@ int32_t taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, i return code; } -void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { +int32_t taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { + int32_t code = 0; #ifdef WINDOWS char value[100]; char keyPath[100]; DWORD bufferSize = sizeof(value); - RegGetValue(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", "TimeZoneKeyName", + LONG result = RegGetValue(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", "TimeZoneKeyName", RRF_RT_ANY, NULL, (PVOID)&value, &bufferSize); + if (result != ERROR_SUCCESS) { + return TAOS_SYSTEM_WINAPI_ERROR(result); + } strcpy(outTimezoneStr, "not configured"); *tsTimezone = 0; if (bufferSize > 0) { @@ -854,7 +862,10 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { strcpy(outTimezoneStr, win_tz[i][1]); bufferSize = sizeof(value); sprintf(keyPath, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\%s", value); - RegGetValue(HKEY_LOCAL_MACHINE, keyPath, "Display", RRF_RT_ANY, NULL, (PVOID)&value, &bufferSize); + result = RegGetValue(HKEY_LOCAL_MACHINE, keyPath, "Display", RRF_RT_ANY, NULL, (PVOID)&value, &bufferSize); + if (result != ERROR_SUCCESS) { + return TAOS_SYSTEM_WINAPI_ERROR(result); + } if (bufferSize > 0) { // value[4] = (value[4] == '+' ? '-' : '+'); sprintf(outTimezoneStr, "%s (UTC, %c%c%c%c%c)", outTimezoneStr, value[4], value[5], value[6], value[8], @@ -865,6 +876,7 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { } } } + return 0; #elif defined(_TD_DARWIN_64) char buf[4096] = {0}; char *tz = NULL; @@ -883,21 +895,11 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { } tz = zi + strlen("zoneinfo") + 1; - // for (int i = n - 1; i >= 0; --i) { - // if (buf[i] == '/') { - // if (tz) { - // tz = buf + i + 1; - // break; - // } - // tz = buf + i + 1; - // } - // } - // if (!tz || 0 == strchr(tz, '/')) { - // printf("parsing /etc/localtime failed\n"); - // return; - // } - - setenv("TZ", tz, 1); + code = setenv("TZ", tz, 1); + if (-1 == code) { + terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; + } tzset(); } @@ -908,7 +910,9 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { */ time_t tx1 = taosGetTimestampSec(); struct tm tm1; - taosLocalTime(&tx1, &tm1, NULL); + if (taosLocalTime(&tx1, &tm1, NULL) == NULL) { + return TSDB_CODE_TIME_ERROR; + } daylight = tm1.tm_isdst; isdst_now = tm1.tm_isdst; @@ -920,6 +924,7 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { */ snprintf(outTimezoneStr, TD_TIMEZONE_LEN, "%s (%s, %+03ld00)", tz, tm1.tm_isdst ? tzname[daylight] : tzname[0], -timezone / 3600); + return 0; #else char buf[4096] = {0}; @@ -927,8 +932,6 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { { int n = readlink("/etc/localtime", buf, sizeof(buf)-1); if (n < 0) { - (void)printf("read /etc/localtime error, reason:%s\n", strerror(errno)); - if (taosCheckExistFile("/etc/timezone")) { /* * NOTE: do not remove it. @@ -937,7 +940,9 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { */ time_t tx1 = taosGetTimestampSec(); struct tm tm1; - (void)taosLocalTime(&tx1, &tm1, NULL); + if(taosLocalTime(&tx1, &tm1, NULL) == NULL) { + return TSDB_CODE_TIME_ERROR; + } /* load time zone string from /etc/timezone */ // FILE *f = fopen("/etc/timezone", "r"); errno = 0; @@ -946,12 +951,11 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { if (pFile != NULL) { int len = taosReadFile(pFile, buf, 64); if (len < 0) { - (void)taosCloseFile(&pFile); - (void)printf("read /etc/timezone error, reason:%s\n", strerror(errno)); - return; + TAOS_UNUSED(taosCloseFile(&pFile)); + return TSDB_CODE_TIME_ERROR; } - (void)taosCloseFile(&pFile); + TAOS_UNUSED(taosCloseFile(&pFile)); buf[sizeof(buf) - 1] = 0; char *lineEnd = strstr(buf, "\n"); @@ -961,7 +965,11 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { // for CentOS system, /etc/timezone does not exist. Ignore the TZ environment variables if (strlen(buf) > 0) { - (void)setenv("TZ", buf, 1); + code = setenv("TZ", buf, 1); + if (-1 == code) { + terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; + } } } // get and set default timezone @@ -986,34 +994,23 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { (void)snprintf(outTimezoneStr, TD_TIMEZONE_LEN, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz)); } else { - (void)printf("There is not /etc/timezone.\n"); + return TSDB_CODE_TIME_ERROR; } - return; + return 0; } buf[n] = '\0'; char *zi = strstr(buf, "zoneinfo"); if (!zi) { - (void)printf("parsing /etc/localtime failed\n"); - return; + return TSDB_CODE_TIME_ERROR; } tz = zi + strlen("zoneinfo") + 1; - // for (int i = n - 1; i >= 0; --i) { - // if (buf[i] == '/') { - // if (tz) { - // tz = buf + i + 1; - // break; - // } - // tz = buf + i + 1; - // } - // } - // if (!tz || 0 == strchr(tz, '/')) { - // printf("parsing /etc/localtime failed"); - // return; - // } - - (void)setenv("TZ", tz, 1); + code = setenv("TZ", tz, 1); + if (-1 == code) { + terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; + } tzset(); } @@ -1024,7 +1021,9 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { */ time_t tx1 = taosGetTimestampSec(); struct tm tm1; - (void)taosLocalTime(&tx1, &tm1, NULL); + if(taosLocalTime(&tx1, &tm1, NULL) == NULL) { + return TSDB_CODE_TIME_ERROR; + } isdst_now = tm1.tm_isdst; /* @@ -1035,5 +1034,6 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { */ (void)snprintf(outTimezoneStr, TD_TIMEZONE_LEN, "%s (%s, %+03ld00)", tz, tm1.tm_isdst ? tzname[daylight] : tzname[0], -timezone / 3600); + return 0; #endif } From 661a170a9b988a86b4606abb01286add287b67bc Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 13 Sep 2024 15:26:14 +0800 Subject: [PATCH 09/20] osTimer --- source/os/src/osSocket.c | 29 +++++++++++++---------------- source/os/src/osTimer.c | 2 +- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/source/os/src/osSocket.c b/source/os/src/osSocket.c index 4d650715f9..851615fb7f 100644 --- a/source/os/src/osSocket.c +++ b/source/os/src/osSocket.c @@ -120,7 +120,12 @@ int32_t taosReadFromSocket(TdSocketPtr pSocket, void *buf, int32_t len, int32_t int32_t taosCloseSocketNoCheck1(SocketFd fd) { #ifdef WINDOWS - return closesocket(fd); + int ret = closesocket(fd); + if (ret == SOCKET_ERROR) { + int errorCode = WSAGetLastError(); + return terrno = TAOS_SYSTEM_WINSOCKET_ERROR(errorCode); + } + return 0; #else int32_t code = close(fd); if (-1 == code) { @@ -770,10 +775,7 @@ bool taosValidIpAndPort(uint32_t ip, uint16_t port) { TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket)); if (pSocket == NULL) { - code = terrno; - (void)taosCloseSocketNoCheck1(fd); - terrno = code; - + TAOS_SKIP_ERROR(taosCloseSocketNoCheck1(fd)); return false; } pSocket->refId = 0; @@ -782,22 +784,18 @@ bool taosValidIpAndPort(uint32_t ip, uint16_t port) { /* set REUSEADDR option, so the portnumber can be re-used */ reuse = 1; if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) { - code = terrno; - (void)taosCloseSocket(&pSocket); - terrno = code; - + TAOS_SKIP_ERROR(taosCloseSocket(&pSocket)); return false; } /* bind socket to server address */ if (-1 == bind(pSocket->fd, (struct sockaddr *)&serverAdd, sizeof(serverAdd))) { - code = TAOS_SYSTEM_ERROR(errno); - (void)taosCloseSocket(&pSocket); - terrno = code; + terrno = TAOS_SYSTEM_ERROR(errno); + TAOS_SKIP_ERROR(taosCloseSocket(&pSocket)); return false; } - (void)taosCloseSocket(&pSocket); + TAOS_SKIP_ERROR(taosCloseSocket(&pSocket)); return true; } @@ -1160,9 +1158,8 @@ int32_t taosCreateSocketWithTimeout(uint32_t timeout) { #else // Linux like systems uint32_t conn_timeout_ms = timeout; if (-1 == setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, (char *)&conn_timeout_ms, sizeof(conn_timeout_ms))) { - int32_t code = TAOS_SYSTEM_ERROR(errno); - (void)taosCloseSocketNoCheck1(fd); - terrno = code; + terrno = TAOS_SYSTEM_ERROR(errno); + TAOS_SKIP_ERROR(taosCloseSocketNoCheck1(fd)); return -1; } #endif diff --git a/source/os/src/osTimer.c b/source/os/src/osTimer.c index 6e5d9844a9..fe3a0dcf95 100644 --- a/source/os/src/osTimer.c +++ b/source/os/src/osTimer.c @@ -80,7 +80,7 @@ void taos_block_sigalrm(void) { static void taosDeleteTimer(void *tharg) { timer_t *pTimer = tharg; - (void)timer_delete(*pTimer); + TAOS_SKIP_ERROR(timer_delete(*pTimer)); } static TdThread timerThread; From a91085eef6afc78cba8bdae69dc10a92919404b9 Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 13 Sep 2024 16:14:40 +0800 Subject: [PATCH 10/20] fix: void --- source/libs/function/src/tudf.c | 5 ++++- source/os/src/osDir.c | 6 +++--- source/os/src/osSleep.c | 15 ++++++++++----- source/os/src/osSysinfo.c | 27 ++++++++++++++------------- source/util/src/tlog.c | 5 ++++- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c index d0b3b191ad..0510b6cff5 100644 --- a/source/libs/function/src/tudf.c +++ b/source/libs/function/src/tudf.c @@ -127,7 +127,10 @@ static int32_t udfSpawnUdfd(SUdfdData *pData) { snprintf(dnodeIdEnvItem, 32, "%s=%d", "DNODE_ID", pData->dnodeId); float numCpuCores = 4; - taosGetCpuCores(&numCpuCores, false); + int32_t code = taosGetCpuCores(&numCpuCores, false); + if(code != 0) { + fnError("failed to get cpu cores, code:%d", code); + } numCpuCores = TMAX(numCpuCores, 2); snprintf(thrdPoolSizeEnvItem, 32, "%s=%d", "UV_THREADPOOL_SIZE", (int)numCpuCores * 2); diff --git a/source/os/src/osDir.c b/source/os/src/osDir.c index e06c1a6aac..04747cacd4 100644 --- a/source/os/src/osDir.c +++ b/source/os/src/osDir.c @@ -109,8 +109,8 @@ void taosRemoveDir(const char *dirname) { } } - (void)taosCloseDir(&pDir); - (void)rmdir(dirname); + TAOS_UNUSED(taosCloseDir(&pDir)); + TAOS_UNUSED(rmdir(dirname)); // printf("dir:%s is removed\n", dirname); return; @@ -374,7 +374,7 @@ int32_t taosRealPath(char *dirname, char *realPath, int32_t maxlen) { bool taosIsDir(const char *dirname) { TdDirPtr pDir = taosOpenDir(dirname); if (pDir != NULL) { - (void)taosCloseDir(&pDir); + TAOS_SKIP_ERROR(taosCloseDir(&pDir)); return true; } return false; diff --git a/source/os/src/osSleep.c b/source/os/src/osSleep.c index f72805b15d..67a621e8b7 100644 --- a/source/os/src/osSleep.c +++ b/source/os/src/osSleep.c @@ -37,7 +37,7 @@ void taosMsleep(int32_t ms) { #ifdef WINDOWS Sleep(ms); #else - (void)usleep(ms * 1000); + TAOS_SKIP_ERROR(usleep(ms * 1000)); #endif } @@ -49,10 +49,15 @@ void taosUsleep(int32_t us) { interval.QuadPart = (10 * us); timer = CreateWaitableTimer(NULL, TRUE, NULL); - SetWaitableTimer(timer, &interval, 0, NULL, NULL, 0); - WaitForSingleObject(timer, INFINITE); - CloseHandle(timer); + if (timer == NULL) { + return; + } + if (!SetWaitableTimer(timer, &interval, 0, NULL, NULL, 0)) { + return; + } + TAOS_SKIP_ERROR(WaitForSingleObject(timer, INFINITE)); + TAOS_SKIP_ERROR(CloseHandle(timer)); #else - (void)usleep(us); + TAOS_SKIP_ERROR(usleep(us)); #endif } diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c index 36b1d7b60d..fc6296bc04 100644 --- a/source/os/src/osSysinfo.c +++ b/source/os/src/osSysinfo.c @@ -191,10 +191,11 @@ static int32_t taosGetSysCpuInfo(SysCpuInfo *cpuInfo) { &cpuInfo->si, &cpuInfo->st, &cpuInfo->guest, &cpuInfo->guest_nice); if (EOF == code) { terrno = TAOS_SYSTEM_ERROR(errno); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); return terrno; } - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); #endif return 0; @@ -263,9 +264,9 @@ bool taosCheckSystemIsLittleEnd() { void taosGetSystemInfo() { #ifdef WINDOWS - taosGetCpuCores(&tsNumOfCores, false); - taosGetTotalMemory(&tsTotalMemoryKB); - taosGetCpuUsage(NULL, NULL); + TAOS_SKIP_ERROR(taosGetCpuCores(&tsNumOfCores, false)); + TAOS_SKIP_ERROR(taosGetTotalMemory(&tsTotalMemoryKB)); + TAOS_SKIP_ERROR(taosGetCpuUsage(NULL, NULL)); #elif defined(_TD_DARWIN_64) long physical_pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGESIZE); @@ -274,10 +275,10 @@ void taosGetSystemInfo() { tsNumOfCores = sysconf(_SC_NPROCESSORS_ONLN); #else taosGetProcIOnfos(); - (void)taosGetCpuCores(&tsNumOfCores, false); - (void)taosGetTotalMemory(&tsTotalMemoryKB); - (void)taosGetCpuUsage(NULL, NULL); - (void)taosGetCpuInstructions(&tsSSE42Supported, &tsAVXSupported, &tsAVX2Supported, &tsFMASupported, &tsAVX512Supported); + TAOS_SKIP_ERROR(taosGetCpuCores(&tsNumOfCores, false)); + TAOS_SKIP_ERROR(taosGetTotalMemory(&tsTotalMemoryKB)); + TAOS_SKIP_ERROR(taosGetCpuUsage(NULL, NULL)); + TAOS_SKIP_ERROR(taosGetCpuInstructions(&tsSSE42Supported, &tsAVXSupported, &tsAVX2Supported, &tsFMASupported, &tsAVX512Supported)); #endif } @@ -313,11 +314,11 @@ int32_t taosGetEmail(char *email, int32_t maxLen) { if (taosReadFile(pFile, (void *)email, maxLen) < 0) { int32_t code = terrno; - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); return code; } - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); return 0; #endif @@ -748,7 +749,7 @@ int32_t taosGetProcMemory(int64_t *usedKB) { char tmp[10]; (void)sscanf(line, "%s %" PRId64, tmp, usedKB); - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); return 0; #endif @@ -1045,7 +1046,7 @@ int32_t taosGetSystemUUID(char *uid, int32_t uidlen) { return terrno; } else { len = taosReadFile(pFile, uid, uidlen); - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); if (len < 0) { return len; } @@ -1087,7 +1088,7 @@ char *taosGetCmdlineByPID(int pid) { cmdline[n] = 0; - (void)taosCloseFile(&pFile); + TAOS_SKIP_ERROR(taosCloseFile(&pFile)); } else { cmdline[0] = 0; } diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index bd22a4e42b..7d905e843d 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -215,7 +215,10 @@ int32_t taosInitSlowLog() { int32_t taosInitLog(const char *logName, int32_t maxFiles, bool tsc) { if (atomic_val_compare_exchange_8(&tsLogInited, 0, 1) != 0) return 0; - TAOS_CHECK_RETURN(osUpdate()); + int32_t code = osUpdate(); + if (code != 0) { + uError("failed to update os info, reason:%s", tstrerror(code)); + } TAOS_CHECK_RETURN(taosInitNormalLog(logName, maxFiles)); if (tsc){ From 3acac77f9f503ac5abef39dd53022ed16d4b21c6 Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 13 Sep 2024 16:41:13 +0800 Subject: [PATCH 11/20] build on mac --- source/os/src/osTimezone.c | 6 ++---- source/util/src/terror.c | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c index 1d8a552862..89ced69f97 100644 --- a/source/os/src/osTimezone.c +++ b/source/os/src/osTimezone.c @@ -883,15 +883,13 @@ int32_t taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) { int n = readlink("/etc/localtime", buf, sizeof(buf)); if (n < 0) { - printf("read /etc/localtime error, reason:%s\n", strerror(errno)); - return; + return TSDB_CODE_TIME_ERROR; } buf[n] = '\0'; char *zi = strstr(buf, "zoneinfo"); if (!zi) { - printf("parsing /etc/localtime failed\n"); - return; + return TSDB_CODE_TIME_ERROR; } tz = zi + strlen("zoneinfo") + 1; diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 5ceec33831..31ede562bd 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -112,6 +112,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_FAILED_TO_CONNECT_S3, "Failed to connect to TAOS_DEFINE_ERROR(TSDB_CODE_MSG_PREPROCESSED, "Message has been processed in preprocess") TAOS_DEFINE_ERROR(TSDB_CODE_OUT_OF_BUFFER, "Out of buffer") TAOS_DEFINE_ERROR(TSDB_CODE_INTERNAL_ERROR, "Internal error") +TAOS_DEFINE_ERROR(TSDB_CODE_TIME_ERROR, "Internal error in time") //client TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_OPERATION, "Invalid operation") From 98413626aa8a762e5d654905f7fea4eb4eabb348 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Fri, 13 Sep 2024 18:22:42 +0800 Subject: [PATCH 12/20] fix:[TD-31965] code rewrite if error happen --- source/libs/scalar/src/filter.c | 39 +++++++++++++-------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 8ffc588d41..588c252669 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -2912,6 +2912,8 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum uint32_t uidx = 0; uint32_t code = TSDB_CODE_SUCCESS; SArray *group = taosArrayInit(FILTER_DEFAULT_GROUP_SIZE, sizeof(SFilterGroup)); + SFilterGroup ng = {0}; + if (group == NULL) { FLT_ERR_JRET(terrno); } @@ -2927,11 +2929,8 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum for (int32_t i = 0; i < gResNum; ++i) { res = gRes[i]; - optr = (res->colNum > 1) ? LOGIC_COND_TYPE_AND : LOGIC_COND_TYPE_OR; - SFilterGroup ng = {0}; - for (uint32_t m = 0; m < res->colNum; ++m) { colInfo = &res->colInfo[res->colIdx[m]]; if (FILTER_NO_MERGE_DATA_TYPE(colInfo->dataType)) { @@ -2944,28 +2943,16 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum for (int32_t n = 0; n < usize; ++n) { SFilterUnit *u = (SFilterUnit *)taosArrayGetP((SArray *)colInfo->info, n); if (NULL == u) { - code = TSDB_CODE_OUT_OF_RANGE; - break; + FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE); } code = filterAddUnitFromUnit(info, &oinfo, u, &uidx); - if (TSDB_CODE_SUCCESS != code) { - break; - } + FLT_ERR_JRET(code); code = filterAddUnitToGroup(&ng, uidx); - if (TSDB_CODE_SUCCESS != code) { - break; - } - } - if (TSDB_CODE_SUCCESS != code) { - break; + FLT_ERR_JRET(code); } continue; } - if (TSDB_CODE_SUCCESS != code) { - filterFreeGroup((void*)&ng); - FLT_ERR_JRET(code); - } if (colInfo->type != RANGE_TYPE_MR_CTX) { fltError("filterRewrite get invalid col type : %d", colInfo->type); @@ -2973,24 +2960,28 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum } code = filterAddGroupUnitFromCtx(info, &oinfo, colInfo->info, res->colIdx[m], &ng, optr, group); - if (TSDB_CODE_SUCCESS != code) { - filterFreeGroup((void*)&ng); - FLT_ERR_JRET(code); - } + FLT_ERR_JRET(code); } if (ng.unitNum > 0) { if (NULL == taosArrayPush(group, &ng)) { - filterFreeGroup((void*)&ng); FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); } + ng = (SFilterGroup){0}; } } FLT_ERR_JRET(filterConvertGroupFromArray(info, group)); -_return: taosArrayDestroy(group); + filterFreeInfo(&oinfo); + return 0; + +_return: + filterFreeGroup((void*)&ng); + + taosArrayDestroyEx(group, filterFreeGroup); + filterFreeInfo(&oinfo); FLT_RET(code); From 4ef4dddc7bb7f7ed2c85f590af729897f676ad66 Mon Sep 17 00:00:00 2001 From: Shungang Li Date: Fri, 13 Sep 2024 18:59:54 +0800 Subject: [PATCH 13/20] fix: schedulerFreeJob reset jobId only on the last reference --- include/util/tref.h | 1 + source/client/src/clientImpl.c | 4 +--- source/libs/scheduler/inc/schInt.h | 1 + source/libs/scheduler/src/schUtil.c | 13 +++++++++++-- source/libs/scheduler/src/scheduler.c | 9 ++++++--- source/util/src/tref.c | 13 +++++++++---- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/include/util/tref.h b/include/util/tref.h index 1520ced14e..f17fb73f3d 100644 --- a/include/util/tref.h +++ b/include/util/tref.h @@ -46,6 +46,7 @@ void *taosAcquireRef(int32_t rsetId, int64_t rid); // release ref, rid is the reference ID returned by taosAddRef // return 0 if success. On error, -1 is returned, and terrno is set appropriately int32_t taosReleaseRef(int32_t rsetId, int64_t rid); +int32_t taosReleaseRefEx(int32_t rsetId, int64_t rid, int32_t* isReleased); // return the first reference if rid is 0, otherwise return the next after current reference. // if return value is NULL, it means list is over(if terrno is set, it means error happens) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index ac5866401e..5afd8a0cbe 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1163,9 +1163,7 @@ void schedulerExecCb(SExecResult* pResult, void* param, int32_t code) { (void)atomic_add_fetch_64((int64_t*)&pActivity->numOfInsertRows, pResult->numOfRows); } } - if (TSDB_CODE_SUCCESS == code) { - schedulerFreeJob(&pRequest->body.queryJob, 0); - } + schedulerFreeJob(&pRequest->body.queryJob, 0); } taosMemoryFree(pResult); diff --git a/source/libs/scheduler/inc/schInt.h b/source/libs/scheduler/inc/schInt.h index 3a25f37895..8d77ba1c98 100644 --- a/source/libs/scheduler/inc/schInt.h +++ b/source/libs/scheduler/inc/schInt.h @@ -570,6 +570,7 @@ int32_t schDelayLaunchTask(SSchJob *pJob, SSchTask *pTask); int32_t schBuildAndSendMsg(SSchJob *job, SSchTask *task, SQueryNodeAddr *addr, int32_t msgType, void *param); int32_t schAcquireJob(int64_t refId, SSchJob **ppJob); int32_t schReleaseJob(int64_t refId); +int32_t schReleaseJobEx(int64_t refId, int32_t* released); void schFreeFlowCtrl(SSchJob *pJob); int32_t schChkJobNeedFlowCtrl(SSchJob *pJob, SSchLevel *pLevel); int32_t schDecTaskFlowQuota(SSchJob *pJob, SSchTask *pTask); diff --git a/source/libs/scheduler/src/schUtil.c b/source/libs/scheduler/src/schUtil.c index 3f610ed387..bcca820dff 100644 --- a/source/libs/scheduler/src/schUtil.c +++ b/source/libs/scheduler/src/schUtil.c @@ -41,6 +41,15 @@ FORCE_INLINE int32_t schReleaseJob(int64_t refId) { return taosReleaseRef(schMgmt.jobRef, refId); } +FORCE_INLINE int32_t schReleaseJobEx(int64_t refId, int32_t* released) { + if (0 == refId) { + return TSDB_CODE_SUCCESS; + } + + qDebug("sch release ex jobId:0x%" PRIx64, refId); + return taosReleaseRefEx(schMgmt.jobRef, refId, released); +} + int32_t schDumpEpSet(SEpSet *pEpSet, char** ppRes) { *ppRes = NULL; if (NULL == pEpSet) { @@ -189,7 +198,7 @@ void schDeregisterTaskHb(SSchJob *pJob, SSchTask *pTask) { SCH_TASK_ELOG("fail to get the %dth condidateAddr in task, totalNum:%d", pTask->candidateIdx, (int32_t)taosArrayGetSize(pTask->candidateAddrs)); return; } - + SQueryNodeEpId epId = {0}; epId.nodeId = addr->nodeId; @@ -334,7 +343,7 @@ void schFreeRpcCtx(SRpcCtx *pCtx) { void schGetTaskFromList(SHashObj *pTaskList, uint64_t taskId, SSchTask **pTask) { *pTask = NULL; - + int32_t s = taosHashGetSize(pTaskList); if (s <= 0) { return; diff --git a/source/libs/scheduler/src/scheduler.c b/source/libs/scheduler/src/scheduler.c index 3ce5cd5714..7a69691573 100644 --- a/source/libs/scheduler/src/scheduler.c +++ b/source/libs/scheduler/src/scheduler.c @@ -119,7 +119,7 @@ int32_t schedulerGetTasksStatus(int64_t jobId, SArray *pSub) { qError("failed to get task %d, total: %d", m, pLevel->taskNum); SCH_ERR_JRET(TSDB_CODE_SCH_INTERNAL_ERROR); } - + SQuerySubDesc subDesc = {0}; subDesc.tid = pTask->taskId; TAOS_STRCPY(subDesc.status, jobTaskStatusStr(pTask->status)); @@ -179,8 +179,11 @@ void schedulerFreeJob(int64_t *jobId, int32_t errCode) { SCH_JOB_DLOG("start to free job 0x%" PRIx64 ", code:%s", *jobId, tstrerror(errCode)); (void)schHandleJobDrop(pJob, errCode); // ignore any error - (void)schReleaseJob(*jobId); // ignore error - *jobId = 0; + int32_t released = false; + (void)schReleaseJobEx(*jobId, &released); // ignore error + if (released) { + *jobId = 0; + } } void schedulerDestroy(void) { diff --git a/source/util/src/tref.c b/source/util/src/tref.c index 0eac7b4427..d387156e2c 100644 --- a/source/util/src/tref.c +++ b/source/util/src/tref.c @@ -55,7 +55,7 @@ static void taosLockList(int64_t *lockedBy); static void taosUnlockList(int64_t *lockedBy); static void taosIncRsetCount(SRefSet *pSet); static void taosDecRsetCount(SRefSet *pSet); -static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove); +static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove, int32_t* isReleased); int32_t taosOpenRef(int32_t max, RefFp fp) { SRefNode **nodeList; @@ -181,7 +181,7 @@ int64_t taosAddRef(int32_t rsetId, void *p) { return rid; } -int32_t taosRemoveRef(int32_t rsetId, int64_t rid) { return taosDecRefCount(rsetId, rid, 1); } +int32_t taosRemoveRef(int32_t rsetId, int64_t rid) { return taosDecRefCount(rsetId, rid, 1, NULL); } // if rid is 0, return the first p in hash list, otherwise, return the next after current rid void *taosAcquireRef(int32_t rsetId, int64_t rid) { @@ -245,7 +245,8 @@ void *taosAcquireRef(int32_t rsetId, int64_t rid) { return p; } -int32_t taosReleaseRef(int32_t rsetId, int64_t rid) { return taosDecRefCount(rsetId, rid, 0); } +int32_t taosReleaseRef(int32_t rsetId, int64_t rid) { return taosDecRefCount(rsetId, rid, 0, NULL); } +int32_t taosReleaseRefEx(int32_t rsetId, int64_t rid, int32_t* isReleased) { return taosDecRefCount(rsetId, rid, 0, isReleased); } // if rid is 0, return the first p in hash list, otherwise, return the next after current rid void *taosIterateRef(int32_t rsetId, int64_t rid) { @@ -372,7 +373,7 @@ int32_t taosListRef() { return num; } -static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove) { +static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove, int32_t* isReleased) { int32_t hash; SRefSet *pSet; SRefNode *pNode; @@ -440,6 +441,10 @@ static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove) { taosDecRsetCount(pSet); } + if (isReleased) { + *isReleased = released; + } + return code; } From b9c1ab16e138f021b149bee3415f7cf4e2f87b36 Mon Sep 17 00:00:00 2001 From: Jinqing Kuang Date: Fri, 13 Sep 2024 19:06:28 +0800 Subject: [PATCH 14/20] fix(query)[TD-32059]. Enable HAVING clause to work with FILL clause --- source/libs/planner/src/planLogicCreater.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c index 6886260d0a..6ad30eccb8 100644 --- a/source/libs/planner/src/planLogicCreater.c +++ b/source/libs/planner/src/planLogicCreater.c @@ -1312,6 +1312,10 @@ static int32_t createFillLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect code = createColumnByRewriteExpr(pFill->pWStartTs, &pFill->node.pTargets); } + if (TSDB_CODE_SUCCESS == code && NULL != pSelect->pHaving) { + code = nodesCloneNode(pSelect->pHaving, &pFill->node.pConditions); + } + if (TSDB_CODE_SUCCESS == code) { *pLogicNode = (SLogicNode*)pFill; } else { From 29d9e9acfcf8a0eb88e48e998f57e0d2d59c15e4 Mon Sep 17 00:00:00 2001 From: Jing Sima Date: Wed, 11 Sep 2024 08:05:54 +0800 Subject: [PATCH 15/20] docs:[TS-4893] Add doc for new function. --- .../14-reference/03-taos-sql/10-function.md | 898 +++++++++++++++++- 1 file changed, 873 insertions(+), 25 deletions(-) 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 ee71abbdec..007e1dd64a 100644 --- a/docs/zh/14-reference/03-taos-sql/10-function.md +++ b/docs/zh/14-reference/03-taos-sql/10-function.md @@ -169,14 +169,43 @@ POW(expr1, expr2) #### ROUND - ```sql -ROUND(expr) +ROUND(expr[, digits]) ``` **功能说明**：获得指定字段的四舍五入的结果。 - 其他使用说明参见 CEIL 函数描述。 +**返回结果类型**：与指定字段的原始数据类型一致。 + +**适用数据类型**： +- `expr`：数值类型。 +- `digits`：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `expr` 或 `digits` 为 NULL，返回 NULL。 +- 若指定了`digits`，则会保留 `digits` 位小数，默认为 0。 +- 若输入值是 INTEGER 类型, 无论 `digits` 值为多少，都只会返回 INTEGER 类型，不会保留小数。 +- `digits` 大于零表示对小数位进行操作，四舍五入到 `digits` 位小数。若小数位数小于 `digits` 位，不进行四舍五入操作，直接返回。 +- `digits` 小于零表示丢掉小数位，并将数字四舍五入到小数点左侧 `digits` 位。若小数点左侧的位数小于 `digits`位，返回 0。 +- 由于暂未支持 DECIMAL 类型，所以该函数会用 DOUBLE 和 FLOAT 来表示包含小数的结果，但是 DOUBLE 和 FLOAT 是有精度上限的，当位数太多时使用该函数可能没有意义。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select round(8888.88); + round(8888.88) | +============================ + 8889.000000000000000 | + +taos> select round(8888.88,-1); + round(8888.88,-1) | +============================ + 8890.000000000000000 | +``` #### SIN @@ -232,6 +261,297 @@ TAN(expr) **使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 +#### PI +```sql +PI() +``` + +**功能说明**：返回圆周率 π 的值。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：无。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- π ≈ 3.141592653589793。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select pi(); + pi() | +============================ + 3.141592653589793 | +``` + +##### TRUNCATE +```sql +TRUNCATE(expr, digits) +``` + +**功能说明**：获得指定字段按照指定位数截断的值。 + +**返回结果类型**：与 `expr` 字段的原始数据类型一致。 + +**适用数据类型**： +- `expr`：数值类型。 +- `digits`：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `expr` 或 `digits` 为 NULL，返回 NULL。 +- 截取指按保留位数直接进行截取，没有四舍五入。 +- `digits` 大于零表示对小数位进行操作，截取到 `digits` 位小数，若小数位数小于 `digits` 位，不进行截取操作，直接返回。 +- `digits` 等于零表示丢掉小数位。 +- `digits` 小于零表示丢掉小数位，并将小数点左侧 `digits` 位置 `0`。若小数点左侧的位数小于 `digits`位，返回 0。 +- 由于暂未支持 DECIMAL 类型，所以该函数会用 DOUBLE 和 FLOAT 来表示包含小数的结果，但是 DOUBLE 和 FLOAT 是有精度上限的，当位数太多时使用该函数可能没有意义。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select truncate(8888.88, 0); + truncate(8888.88, 0) | +============================ + 8888.000000000000000 | + +taos> select truncate(8888.88, -1); + truncate(8888.88, -1) | +============================ + 8880.000000000000000 | +``` + +#### EXP +```sql +EXP(expr) +``` +**功能说明**：返回 e（自然对数的底）的指定乘方后的值。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为 NULL，返回 NULL。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select exp(2); + exp(2) | +============================ + 7.389056098930650 | +``` + +#### LN +```sql +LN(expr) +``` + +**功能说明**：返回指定参数的自然对数。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为 NULL，返回 NULL。 +- 如果 `epxr` 小于等于 0，返回 NULL。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select ln(10); + ln(10) | +============================ + 2.302585092994046 | +``` + +#### MOD +```sql +MOD(expr1, expr2) +``` + +**功能说明**：计算 expr1 % expr2 的结果。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr2` 为 0 则返回 NULL。 +- 如果 `expr1` 或 `expr2` 为 NULL，返回 NULL。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +``` sql +taos> select mod(10,3); + mod(10,3) | +============================ + 1.000000000000000 | + +taos> select mod(1,0); + mod(1,0) | +============================ + NULL | +``` + +#### RAND +```sql +RAND([seed]) +``` + +**功能说明**：返回一个从0到1均匀分布的随机数。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**： +- `seed`：INTEGER。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果指定了 `seed` 值，那么将会用指定的 `seed` 作为随机种子，确保生成的随机数序列具有确定性。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +``` sql +taos> select rand(); + rand() | +============================ + 0.202092426923147 | + +taos> select rand(); + rand() | +============================ + 0.131537788143166 | + +taos> select rand(1); + rand(1) | +============================ + 0.000007826369259 | + +taos> select rand(1); + rand(1) | +============================ + 0.000007826369259 | +``` + +#### SIGN +```sql +SIGN(expr) +``` + +**功能说明**：返回指定参数的符号。 + +**返回结果类型**：与指定字段的原始数据类型一致。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为负，返回 -1 ， +- 如果 `expr` 为正，返回 1 ， +- 如果 `expr` 为 0 ，返回 0 。 +- 如果 `expr` 为 NULL ，返回 NULL 。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select sign(-1); + sign(-1) | +======================== + -1 | + +taos> select sign(1); + sign(1) | +======================== + 1 | + +taos> select sign(0); + sign(0) | +======================== + 0 | +``` + +#### DEGREES +```sql +DEGREES(expr) +``` + +**功能说明**：计算指定参数由弧度值转为角度后的值。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为 NULL，则返回 NULL。 +- degree = radian * 180 / π。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select degrees(PI()); + degrees(pi()) | +============================ + 180.000000000000000 | +``` + +#### RADIANS +```sql +RADIANS(expr) +``` + +**功能说明**：计算指定参数由角度值转为弧度后的值。 + +**返回结果类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为 NULL，则返回 NULL。 +- radian = degree * π / 180。 +- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。 + +**举例**： +```sql +taos> select radians(180); + radians(180) | +============================ + 3.141592653589793 | +``` ### 字符串函数 字符串函数的输入参数为字符串类型，返回结果为数值类型或字符串类型。 @@ -252,6 +572,27 @@ CHAR_LENGTH(expr) **适用于**: 表和超级表。 +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 与 `LENGTH()` 函数不同在于，对于多字节字符，比如中文字符， `CHAR_LENGTH()` 函数会将其算做一个字符，长度为 1，而 `LENGTH()` 会计算其字节数，长度为 3。比如 `CHAR_LENGTH('你好') = 2`， `LENGTH('你好') = 6`。 +- 如果 `expr` 为 NULL，返回 NULL。 + +**举例**： +```sql +taos> select char_length('Hello world'); + char_length('Hello world') | +============================= + 11 | + +taos> select char_length('你好 世界'); + char_length('你好 世界') | +=============================== + 5 | +``` + #### CONCAT ```sql @@ -353,23 +694,150 @@ RTRIM(expr) **适用于**: 表和超级表。 - -#### SUBSTR - +#### TRIM ```sql -SUBSTR(expr, pos [,len]) +TRIM([{LEADING | TRAILING | BOTH} [remstr] FROM] expr) +TRIM([remstr FROM] expr) ``` -**功能说明**：从源字符串 str 中的指定位置 pos 开始取一个长度为 len 的子串并返回。如果输入参数 len 被忽略，返回的子串包含从 pos 开始的整个字串。 +**功能说明**：返回去掉了所有 remstr 前缀或后缀的字符串 epxr 。 -**返回结果类型**：与输入字段的原始类型相同。 +**返回结果类型**：与输入字段 epxr 的原始类型相同。 -**适用数据类型**：VARCHAR, NCHAR。输入参数 pos 可以为正数，也可以为负数。如果 pos 是正数，表示开始位置从字符串开头正数计算。如果 pos 为负数，表示开始位置从字符串结尾倒数计算。 +**适用数据类型**： +- remstr：VARCHAR,NCHAR。 +- epxr：VARCHAR,NCHAR。 **嵌套子查询支持**：适用于内层查询和外层查询。 **适用于**: 表和超级表。 +**使用说明**： +- 第一个可选变量[LEADING | BOTH | TRAILING]指定要剪裁字符串的哪一侧： + - LEADING 将移除字符串开头的指定字符。 + - TRAILING 将移除字符串末尾的指定字符。 + - BOTH（默认值）将移除字符串开头和末尾的指定字符。 +- 第二个可选变量[remstr]指定要裁剪掉的字符串： + - 如果不指定 remstr ，默认裁剪空格。 + - remstr 可以指定多个字符，如trim('ab' from 'abacd') ，此时会将 'ab' 看做一个整体来裁剪，得到裁剪结果 'acd'。 +- 若 expr 为 NULL, 返回 NULL。 +- 该函数是多字节安全的。 + +**举例**： +```sql +taos> select trim(' a '); + trim(' a ') | +============================= + a | + +taos> select trim(leading from ' a '); + trim(leading from ' a ') | +========================================== + a | + + +taos> select trim(leading 'b' from 'bbbbbbbba '); + trim(leading 'b' from 'bbbbbbbba ') | +============================================== + a | + +taos> select trim(both 'b' from 'bbbbbabbbbbb'); + trim(both 'b' from 'bbbbbabbbbbb') | +===================================== + a | +``` + +#### SUBSTRING/SUBSTR +```sql +SUBSTRING/SUBSTR(expr, pos [, len]) +SUBSTRING/SUBSTR(expr FROM pos [FOR len]) +``` +**功能说明**：返回字符串 `expr` 在 `pos` 位置开始的子串，若指定了 `len` ，则返回在 `pos` 位置开始，长度为 `len` 的子串。 + +**返回结果类型**：与输入字段 `expr` 的原始类型相同。 + +**适用数据类型**： +- `expr`：VARCHAR,NCHAR。 +- `pos`：整数类型。 +- `len`：整数类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `pos` 为正数，则返回的结果为 `expr` 从左到右开始数 `pos` 位置开始的右侧的子串。 +- 若 `pos` 为负数，则返回的结果为 `expr` 从右到左开始数 `pos` 位置开始的右侧的子串。 +- 任意参数为 NULL，返回 NULL。 +- 该函数是多字节安全的。 +- 若 `len` 小于 1，返回空串。 +- `pos` 是 1-base 的，若 `pos` 为 0，返回空串。 +- 若 `pos` + `len` 大于 `len(expr)`，返回从 `pos` 开始到字符串结尾的子串，等同于执行 `substring(expr, pos)`。 + +**举例**： +```sql +taos> select substring('tdengine', 0); + substring('tdengine', 0) | +=========================== + | + +taos> select substring('tdengine', 3); + substring('tdengine', 3) | +=========================== + engine | + +taos> select substring('tdengine', 3,3); + substring('tdengine', 3,3) | +============================= + eng | + +taos> select substring('tdengine', -3,3); + substring('tdengine', -3,3) | +============================== + ine | + +taos> select substring('tdengine', -3,-3); + substring('tdengine', -3,-3) | +=============================== + | +``` + +#### SUBSTRING_INDEX +```sql +SUBSTRING_INDEX(expr, delim, count) +``` + +**功能说明**：返回字符串 `expr` 在出现指定次数分隔符的位置截取的子串。 + +**返回结果类型**：与输入字段 `expr` 的原始类型相同。 + +**适用数据类型**： +- `expr`：VARCHAR,NCHAR。 +- `delim`：VARCHAR, NCHAR。 +- `count`：INTEGER。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `count` 为正数，则返回的结果为 `expr` 从左到右开始数第 `count` 次 出现 `delim` 的位置左侧的字符串。 +- 若 `count` 为负数，则返回的结果为 `expr` 从右到左开始数第 `count` 的绝对值次 出现 `delim` 的位置右侧的字符串。 +- 任意参数为 NULL，返回 NULL。 +- 该函数是多字节安全的。 + +**举例**： +```sql +taos> select substring_index('www.taosdata.com','.',2); + substring_index('www.taosdata.com','.',2) | +============================================ + www.taosdata | + +taos> select substring_index('www.taosdata.com','.',-2); + substring_index('www.taosdata.com','.',-2) | +============================================= + taosdata.com | +``` #### UPPER @@ -387,7 +855,182 @@ UPPER(expr) **适用于**: 表和超级表。 +#### CHAR +```sql +CHAR(expr1 [, expr2] [, epxr3] ...) +``` +**功能说明**：将输入参数当作整数，并返回这些整数在 ASCII 编码中对应的字符。 + +**返回结果类型**：VARCHAR。 + +**适用数据类型**：整数类型,VARCHAR,NCHAR。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 输入的值超过 255 会被转化成多字节的结果，如 `CHAR(256)` 等同于 `CHAR(1,0)`, `CHAR(256 * 256)` 等同于 `CHAR(1,0,0)`。 +- 输入参数的 NULL 值会被跳过。 +- 输入参数若为字符串类型，会将其转换为数值类型处理。 +- 若输入的参数对应的字符为不可打印字符，返回值中仍有该参数对应的字符，但是可能无法显示出来。 + +**举例**： +```sql +taos> select char(77); + char(77) | +=========== + M | + +taos> select char(77,77); + char(77,77) | +============== + MM | + +taos> select char(77 * 256 + 77); + char(77 * 256 + 77) | +====================== + MM | + +taos> select char(77,NULL,77); + char(77,null,77) | +=================== + MM | +``` + +#### ASCII +```sql +ASCII(expr) +``` + +**功能说明**：返回字符串第一个字符的 ASCII 码。 + +**返回结果数据类型**：BIGINT。 + +**适用数据类型**：VARCHAR, NCHAR。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 如果 `expr` 为 NULL，返回 NULL。 +- 如果 `expr` 的第一个字符为多字节字符，只会返回该字符第一个字节的值对应的 ASCII 码。 + +**举例**： +```sql +taos> select ascii('testascii'); + ascii('testascii') | +===================== + 116 | +``` + +#### POSITION +```sql +POSITION(expr1 IN expr2) +``` + +**功能说明**：计算字符串 `expr1` 在字符串 `expr2` 中的位置。 + +**返回结果类型**：BIGINT。 + +**适用数据类型**： +- `expr1`：VARCHAR, NCHAR。 +- `expr2`：VARCHAR, NCHAR。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `expr1` 或 `expr2` 为 NULL，返回 NULL。 +- 若 `expr1` 在 `expr2` 中不存在，返回 0。 +- 若 `expr1` 为空串，认为 `expr1` 在 `expr2` 中总能匹配成功，返回 1。 +- 返回的位置是 1-base 的。 +- 该函数是多字节安全的。 + +**举例**： +```sql +taos> select position('a' in 'cba'); + position('a' in 'cba') | +========================= + 3 | + + +taos> select position('' in 'cba'); + position('' in 'cba') | +======================== + 1 | + +taos> select position('d' in 'cba'); + position('d' in 'cba') | +========================= + 0 | +``` + +#### REPLACE +```sql +REPLACE(expr, from_str, to_str) +``` +**功能说明**：将字符串中的 `from_str` 全部替换为 `to_str`。 + +**返回结果类型**：与输入字段 `expr` 的原始类型相同。 + +**适用数据类型**： +- `expr`：VARCHAR, NCHAR。 +- `from_str`：VARCHAR, NCHAR。 +- `to_str`：VARCHAR, NCHAR。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 该函数是大小写敏感的。 +- 任意参数为 NULL，返回 NULL。 +- 该函数是多字节安全的。 + +**举例**： +```sql +taos> select replace('aabbccAABBCC', 'AA', 'DD'); + replace('aabbccAABBCC', 'AA', 'DD') | +====================================== + aabbccDDBBCC | +``` + +#### REPEAT +```sql +REPEAT(expr, count) +``` +**功能说明**：返回将字符串重复指定次数得到的字符串。 + +**返回结果类型**：与输入字段 `expr` 的原始类型相同。 + +**适用数据类型**： +- `expr`： VARCHAR,NCHAR。 +- `count`：INTEGER。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `count < 1`，返回空串。 +- 若 `expr` 或 `count` 为 NULL，返回 NULL。 + +**举例**： +```sql +taos> select repeat('abc',5); + repeat('abc',5) | +============================ + abcabcabcabcabc | + +taos> select repeat('abc',-1); + repeat('abc',-1) | +=================== + | +``` ### 转换函数 转换函数将值从一种数据类型转换为另一种数据类型。 @@ -609,22 +1252,39 @@ NOW() TIMEDIFF(expr1, expr2 [, time_unit]) ``` -**功能说明**：计算两个时间戳之间的差值，并近似到时间单位 time_unit 指定的精度。 +**功能说明**：返回时间戳 `expr1` - `expr2` 的结果，结果可能为负，并近似到时间单位 `time_unit` 指定的精度。 -**返回结果数据类型**：BIGINT。 +**返回结果类型**：BIGINT。 -**应用字段**：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 - -**适用于**：表和超级表。 +**适用数据类型**： +- `expr1`：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 +- `expr2`：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 +- `time_unit`：见使用说明。 **嵌套子查询支持**：适用于内层查询和外层查询。 -**使用说明**： -- 支持的时间单位 time_unit 如下： - 1b(纳秒), 1u(微秒)，1a(毫秒)，1s(秒)，1m(分)，1h(小时)，1d(天), 1w(周)。 -- 如果时间单位 time_unit 未指定， 返回的时间差值精度与当前 DATABASE 设置的时间精度一致。 -- 输入包含不符合时间日期格式的字符串则返回 NULL。 +**适用于**: 表和超级表。 +**使用说明**： +- 支持的时间单位 `time_unit` 如下： 1b(纳秒), 1u(微秒)，1a(毫秒)，1s(秒)，1m(分)，1h(小时)，1d(天), 1w(周)。 +- 如果时间单位 `time_unit` 未指定， 返回的时间差值精度与当前 DATABASE 设置的时间精度一致。 +- 输入包含不符合时间日期格式的字符串则返回 NULL。 +- `expr1` 或 `expr2` 为 NULL，返回 NULL。 +- `time_unit` 为 NULL，等同于未指定时间单位。 +- 输入时间戳的精度由所查询表的精度确定, 若未指定表, 则精度为毫秒. + +**举例**： +```sql +taos> select timediff('2022-01-01 08:00:00', '2022-01-01 08:00:01',1s); + timediff('2022-01-01 08:00:00', '2022-01-01 08:00:01',1s) | +============================================================ + -1 | + +taos> select timediff('2022-01-01 08:00:01', '2022-01-01 08:00:00',1s); + timediff('2022-01-01 08:00:01', '2022-01-01 08:00:00',1s) | +============================================================ + 1 | +``` #### TIMETRUNCATE @@ -695,6 +1355,148 @@ TODAY() b(纳秒)，u(微秒)，a(毫秒)，s(秒)，m(分)，h(小时)，d(天)，w(周)。 - 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。 +#### WEEK +```sql +WEEK(expr [, mode]) +``` +**功能说明**：返回输入日期的周数。 + +**返回结果类型**：BIGINT。 + +**适用数据类型**： +- `expr`：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 +- `mode`：0 - 7 之间的整数。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 若 `expr` 为 NULL，返回 NULL。 +- 输入时间戳的精度由所查询表的精度确定, 若未指定表, 则精度为毫秒. +- `mode` 用来指定一周是从周日开始还是周一开始，以及指定返回值范围是 1 - 53 还是 0 - 53。下表详细描述不同的 mode 对应的计算方法： + +| Mode | 每周的第一天 | 返回值范围 | 第 1 周的计算方法 | +| ---- | ------ | ------ | ------------------ | +| 0 | 周日 | 0 - 53 | 第一个包含周日的周为第 1 周 | +| 1 | 周一 | 0 - 53 | 第一个包含四天及以上的周为第 1 周 | +| 2 | 周日 | 1 - 53 | 第一个包含周日的周为第 1 周 | +| 3 | 周一 | 1 - 53 | 第一个包含四天及以上的周为第 1 周 | +| 4 | 周日 | 0 - 53 | 第一个包含四天及以上的周为第 1 周 | +| 5 | 周一 | 0 - 53 | 第一个包含周一的周为第 1 周 | +| 6 | 周日 | 1 - 53 | 第一个包含四天及以上的周为第 1 周 | +| 7 | 周一 | 1 - 53 | 第一个包含周一的周为第 1 周 | +- 当返回值范围为0 - 53时，第 1 周之前的日期为第 0 周。 +- 当返回值范围为1 - 53时，第 1 周之前的日期为上一年的最后一周。 +- 以`2000-01-01`为例， + - 在 `mode=0`时返回值为`0`，因为该年第一个周日为`2000-01-02`，从`2000-01-02`起才是第 1 周，所以 `2000-01-01`为第 0 周，返回 0。 + - 在 `mode=1`时返回值为`0`，因为`2000-01-01`所在的周只有两天，分别是 `2000-01-01(周六)`和`2000-01-02(周日)`，所以`2000-01-03`起才是第一周，`2000-01-01`为第 0 周，返回 0。 + - 在 `mode=2`时返回值为`52`，因为从`2000-01-02`起才是第 1 周，并且返回值范围为 1-53，所以`2000-01-01`算做上一年的最后一周，即 1999 年的第 52 周，返回 52。 + +**举例**： +```sql +taos> select week('2000-01-01',0); + week('2000-01-01',0) | +======================== + 0 | + +taos> select week('2000-01-01',1); + week('2000-01-01',1) | +======================== + 0 | + +taos> select week('2000-01-01',2); + week('2000-01-01',2) | +======================== + 52 | + +taos> select week('2000-01-01',3); + week('2000-01-01',3) | +======================== + 52 | +``` + +#### WEEKOFYEAR +```sql +WEEKOFYEAR(expr) +``` +**功能说明**：返回输入日期的周数。 + +**返回结果类型**：BIGINT。 + +**适用数据类型**：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 等同于`WEEK(expr, 3)`，即在每周第一天是周一，返回值范围为 1 - 53，第一个包含四天及以上的周为第 1 周的条件下判断输入日期的周数。 +- 若 `expr` 为 NULL，返回 NULL。 +- 输入时间戳的精度由所查询表的精度确定, 若未指定表, 则精度为毫秒. + +**举例**： +```sql +taos> select weekofyear('2000-01-01'); + weekofyear('2000-01-01') | +=========================== + 52 | +``` + +#### WEEKDAY +```sql +WEEKDAY(expr) +``` +**功能说明**：返回输入日期是周几。 + +**返回结果类型**：BIGINT。 + +**适用数据类型**：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 返回值 0 代表周日，1 代表周一 ... 6 代表周六。 +- 若 `expr` 为 NULL，返回 NULL。 +- 输入时间戳的精度由所查询表的精度确定, 若未指定表, 则精度为毫秒. + +**举例**： +```sql +taos> select weekday('2000-01-01'); + weekday('2000-01-01') | +======================== + 5 | +``` + +#### DAYOFWEEK +```sql +DAYOFWEEK(expr) +``` +**功能说明**：返回输入日期是周几。 + +**返回结果类型**：BIGINT。 + +**适用数据类型**：表示 UNIX 时间戳的 BIGINT, TIMESTAMP 类型，或符合日期时间格式的 VARCHAR, NCHAR 类型。 + +**嵌套子查询支持**：适用于内层查询和外层查询。 + +**适用于**: 表和超级表。 + +**使用说明**： +- 返回值 1 代表周日，2 代表周一 ... 7 代表周六 +- 若 `expr` 为 NULL，返回 NULL。 +- 输入时间戳的精度由所查询表的精度确定, 若未指定表, 则精度为毫秒. + +**举例**： +```sql +taos> select dayofweek('2000-01-01'); + dayofweek('2000-01-01') | +========================== + 7 | +``` + ## 聚合函数 @@ -817,13 +1619,13 @@ SPREAD(expr) **适用于**：表和超级表。 -### STDDEV +### STDDEV/STDDEV_POP ```sql -STDDEV(expr) +STDDEV/STDDEV_POP(expr) ``` -**功能说明**：统计表中某列的均方差。 +**功能说明**：统计表中某列的总体标准差。 **返回数据类型**：DOUBLE。 @@ -831,7 +1633,51 @@ STDDEV(expr) **适用于**：表和超级表。 +**举例**： +```sql +taos> select id from test_stddev; + id | +============== + 1 | + 2 | + 3 | + 4 | + 5 | +taos> select stddev_pop(id) from test_stddev; + stddev_pop(id) | +============================ + 1.414213562373095 | +``` +### VAR_POP +```sql +VAR_POP(expr) +``` + +**功能说明**：统计表中某列的总体方差。 + +**返回数据类型**：DOUBLE。 + +**适用数据类型**：数值类型。 + +**适用于**：表和超级表。 + +**举例**: +```sql +taos> select id from test_var; + id | +============== + 3 | + 1 | + 2 | + 4 | + 5 | + +taos> select var_pop(id) from test_var; + var_pop(id) | +============================ + 2.000000000000000 | +``` ### SUM ```sql @@ -1045,10 +1891,11 @@ MAX(expr) **返回数据类型**：同应用的字段。 -**适用数据类型**：数值类型。 +**适用数据类型**：数值类型, VARCHAR，NCHAR。 **适用于**：表和超级表。 +**使用说明**：max 函数可以接受字符串作为输入参数，当输入参数为字符串类型时，返回最大的字符串值。 ### MIN @@ -1060,10 +1907,11 @@ MIN(expr) **返回数据类型**：同应用的字段。 -**适用数据类型**：数值类型。 +**适用数据类型**：数值类型, VARCHAR，NCHAR。 **适用于**：表和超级表。 +**使用说明**：min 函数可以接受字符串作为输入参数，当输入参数为字符串类型时，返回最大的字符串值。 ### MODE From 379a837b8c0d0af7c3a6c0ed52b46d78d385ee9a Mon Sep 17 00:00:00 2001 From: charles Date: Sat, 14 Sep 2024 08:46:13 +0800 Subject: [PATCH 16/20] Add ci test case to cover ts-5400 by charles --- tests/army/query/accuracy/test_ts5400.py | 51 ++++++++++++++++++++++++ tests/parallel_test/cases.task | 1 + 2 files changed, 52 insertions(+) create mode 100644 tests/army/query/accuracy/test_ts5400.py diff --git a/tests/army/query/accuracy/test_ts5400.py b/tests/army/query/accuracy/test_ts5400.py new file mode 100644 index 0000000000..5263df8014 --- /dev/null +++ b/tests/army/query/accuracy/test_ts5400.py @@ -0,0 +1,51 @@ +import taos +import socket +from frame.log import * +from frame.cases import * +from frame.sql import * +from frame.caseBase import * +from frame import * +from frame.eos import * +from frame.server.dnodes import * + +class TDTestCase(TBase): + """Add test case to cover TS-5400 + """ + updatecfgDict = { + "timezone": "UTC" + } + + def init(self, conn, logSql, replicaVar=1): + host = socket.gethostname() + con = taos.connect(host=f"{host}", config=tdDnodes.getSimCfgPath(), timezone='UTC') + self.replicaVar = int(replicaVar) + tdLog.debug("start to execute %s" % __file__) + tdSql.init(con.cursor()) + + def prepare_data(self): + # prepare data for TS-5400 + tdSql.execute("create database db_ts5400 BUFFER 512 CACHESIZE 1024 CACHEMODEL 'both' COMP 2 DURATION 10d WAL_FSYNC_PERIOD 3000 MAXROWS 4096 MINROWS 100 KEEP 365000d;") + tdSql.execute("use db_ts5400;") + #tdSql.execute("create stable st(ts TIMESTAMP ENCODE 'delta-i' COMPRESS 'lz4' LEVEL 'medium', `uk` VARCHAR(64) ENCODE 'disabled' COMPRESS 'lz4' LEVEL 'medium' PRIMARY KEY ) tags(ta int,tb int,tc int);") + tdSql.execute("create stable st(ts TIMESTAMP, `uk` VARCHAR(64)) tags(ta int,tb int,tc int);") + tdSql.execute("create table t1 using st tags(1,1,1);") + tdSql.execute("insert into t1 values ('1970-01-29 05:04:53.000','22:: ');") + + def test_ts5400(self): + self.prepare_data() + tdSql.execute("use db_ts5400;") + tdSql.query("select _wstart, count(*) from st interval(1y);") + tdSql.checkRows(1) + tdSql.checkData(0, 0, '1970-01-01 00:00:00.000') + tdSql.checkData(0, 1, 1) + + def run(self): + self.test_ts5400() + + def stop(self): + tdSql.execute("drop database db_ts5400;") + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 04efaf92c4..a1b23bb282 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -27,6 +27,7 @@ ,,y,army,./pytest.sh python3 ./test.py -f cluster/clusterBasic.py -N 5 ,,y,army,./pytest.sh python3 ./test.py -f query/query_basic.py -N 3 ,,y,army,./pytest.sh python3 ./test.py -f query/accuracy/test_query_accuracy.py +,,y,army,./pytest.sh python3 ./test.py -f query/accuracy/test_ts5400.py ,,y,army,./pytest.sh python3 ./test.py -f insert/insert_basic.py -N 3 ,,y,army,./pytest.sh python3 ./test.py -f cluster/splitVgroupByLearner.py -N 3 ,,y,army,./pytest.sh python3 ./test.py -f authorith/authBasic.py -N 3 From 7d3a77bcaf7d7737d310b5a16c79b8cef970da60 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Sat, 14 Sep 2024 09:57:34 +0800 Subject: [PATCH 17/20] docs:[TD-31985]add schemaless docs that losted --- docs/zh/08-develop/04-schemaless.md | 36 +++++++++++++++++-- .../zh/14-reference/01-components/02-taosc.md | 2 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/docs/zh/08-develop/04-schemaless.md b/docs/zh/08-develop/04-schemaless.md index 130d012e8b..17a377950c 100644 --- a/docs/zh/08-develop/04-schemaless.md +++ b/docs/zh/08-develop/04-schemaless.md @@ -13,7 +13,7 @@ import TabItem from "@theme/TabItem"; 值得注意的是，通过无模式写入方式创建的超级表及其对应的子表与通过 SQL 直接创建的超级表和子表在功能上没有区别，用户仍然可以使用 SQL 直接向其中写入数据。然而，由于无模式写入方式生成的表名是基于标签值按照固定的映射规则生成的，因此这些表名可能缺乏可读性，不易于理解。 -**采用无模式写入方式时会自动创建表，无须手动创建表。** +**采用无模式写入方式时会自动创建表，无须手动创建表。手动建表的话可能会出现未知的错误。** ## 无模式写入行协议 @@ -30,6 +30,7 @@ measurement,tag_set field_set timestamp - tag_set 格式形如 `=, =`，表示标签列数据，使用英文逗号分隔，与 field_set 之间使用一个半角空格分隔。 - field_set 格式形如 `=, =`，表示普通列，同样使用英文逗号来分隔，与 timestamp 之间使用一个半角空格分隔。 - timestamp 为本行数据对应的主键时间戳。 +- 无模式写入不支持含第二主键列的表的数据写入。 tag_set 中的所有的数据自动转化为 nchar 数据类型，并不需要使用双引号。 在无模式写入数据行协议中，field_set 中的每个数据项都需要对自身的数据类型进行描述，具体要求如下。 @@ -81,7 +82,38 @@ st,t1=3,t2=4,t3=t3 c1=3i64,c3="passit",c2=false,c4=4f64 1626006833639000000 需要注意的是，如果描述数据类型后缀时出现大小写错误，或者为数据指定的数据类型有误，均可能引发报错提示而导致数据写入失败。 -TDengine提供数据写入的幂等性保证，即用户可以反复调用API进行出错数据的写入操作。无模式写入TDengine的主要处理逻辑请参考TDengine的官方网站，此处不赘述。 +TDengine 提供数据写入的幂等性保证，即您可以反复调用 API 进行出错数据的写入操作。但是不提供多行数据写入的原子性保证。即在多行数据一批次写入过程中，会出现部分数据写入成功，部分数据写入失败的情况。 + +## 无模式写入处理规则 + +无模式写入按照如下原则来处理行数据： + +1. 将使用如下规则来生成子表名：首先将 measurement 的名称和标签的 key 和 value 组合成为如下的字符串 + + ```json + "measurement,tag_key1=tag_value1,tag_key2=tag_value2" + ``` + + - 需要注意的是，这里的 tag_key1, tag_key2 并不是用户输入的标签的原始顺序，而是使用了标签名称按照字符串升序排列后的结果。所以，tag_key1 并不是在行协议中输入的第一个标签。 + 排列完成以后计算该字符串的 MD5 散列值 "md5_val"。然后将计算的结果与字符串组合生成表名：“t_md5_val”。其中的 “t_” 是固定的前缀，每个通过该映射关系自动生成的表都具有该前缀。 + + - 如果不想用自动生成的表名，有两种指定子表名的方式(第一种优先级更高)。 + 1. 通过在taos.cfg里配置 smlAutoChildTableNameDelimiter 参数来指定（`@ # 空格 回车 换行 制表符`除外)。 + 1. 举例如下：配置 smlAutoChildTableNameDelimiter=- 插入数据为 st,t0=cpu1,t1=4 c1=3 1626006833639000000 则创建的表名为 cpu1-4。 + 2. 通过在taos.cfg里配置 smlChildTableName 参数来指定。 + 1. 举例如下：配置 smlChildTableName=tname 插入数据为 st,tname=cpu1,t1=4 c1=3 1626006833639000000 则创建的表名为 cpu1，注意如果多行数据 tname 相同，但是后面的 tag_set 不同，则使用第一行自动建表时指定的 tag_set，其他的行会忽略。 + +2. 如果解析行协议获得的超级表不存在，则会创建这个超级表（不建议手动创建超级表，不然插入数据可能异常）。 +3. 如果解析行协议获得子表不存在，则 Schemaless 会按照步骤 1 或 2 确定的子表名来创建子表。 +4. 如果数据行中指定的标签列或普通列不存在，则在超级表中增加对应的标签列或普通列（只增不减）。 +5. 如果超级表中存在一些标签列或普通列未在一个数据行中被指定取值，那么这些列的值在这一行中会被置为 NULL。 +6. 对 BINARY 或 NCHAR 列，如果数据行中所提供值的长度超出了列类型的限制，自动增加该列允许存储的字符长度上限（只增不减），以保证数据的完整保存。 +7. 整个处理过程中遇到的错误会中断写入过程，并返回错误代码。 +8. 为了提高写入的效率，默认假设同一个超级表中 field_set 的顺序是一样的（第一条数据包含所有的 field，后面的数据按照这个顺序），如果顺序不一样，需要配置参数 smlDataFormat 为 false，否则，数据写入按照相同顺序写入，库中数据会异常，从3.0.3.0开始，自动检测顺序是否一致，该配置废弃。 +9. 由于sql建表表名不支持点号（.），所以schemaless也对点号（.）做了处理，如果schemaless自动建表的表名如果有点号（.），会自动替换为下划线（\_）。如果手动指定子表名的话，子表名里有点号（.），同样转化为下划线（\_）。 +10. taos.cfg 增加 smlTsDefaultName 配置（值为字符串），只在client端起作用，配置后，schemaless自动建表的时间列名字可以通过该配置设置。不配置的话，默认为 _ts。 +11. 无模式写入的数据超级表或子表名区分大小写。 +12. 无模式写入仍然遵循 TDengine 对数据结构的底层限制，例如每行数据的总长度不能超过 48KB（从 3.0.5.0 版本开始为 64KB），标签值的总长度不超过16KB。 ## 时间分辨率识别 diff --git a/docs/zh/14-reference/01-components/02-taosc.md b/docs/zh/14-reference/01-components/02-taosc.md index dfcdf22aac..2563fa6811 100644 --- a/docs/zh/14-reference/01-components/02-taosc.md +++ b/docs/zh/14-reference/01-components/02-taosc.md @@ -33,7 +33,7 @@ TDengine 客户端驱动提供了应用编程所需要的全部 API，并且在 |logKeepDays | 日志文件的最长保存时间; 缺省值: 0，表示无限保存; 大于 0 时，日志文件会被重命名为 taosdlog.xxx，其中 xxx 为日志文件最后修改的时间戳| |smlChildTableName | schemaless 自定义的子表名的 key, 无缺省值 | |smlAutoChildTableNameDelimiter | schemaless tag之间的连接符，连起来作为子表名，无缺省值 | -|smlTagName | schemaless tag 为空时默认的 tag 名字, 无缺省值 | +|smlTagName | schemaless tag 为空时默认的 tag 名字, 缺省值 "_tag_null" | |smlTsDefaultName | schemaless自动建表的时间列名字通过该配置设置, 缺省值 "_ts" | |enableCoreFile | crash 时是否生成 core 文件，0: 不生成， 1： 生成；缺省值：1 | |enableScience | 是否开启科学计数法显示浮点数; 0: 不开始, 1: 开启；缺省值：1 | From cd580c575842b5eee26cda2ecd3c830addd02685 Mon Sep 17 00:00:00 2001 From: dmchen Date: Sat, 14 Sep 2024 02:00:05 +0000 Subject: [PATCH 18/20] fix/check-state-when-restore-dnode --- include/util/taoserror.h | 1 + source/util/src/terror.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index ba0930955c..2d9729771b 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -366,6 +366,7 @@ int32_t taosGetErrSize(); #define TSDB_CODE_MND_ARBGROUP_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x03AA) #define TSDB_CODE_MND_ARBGROUP_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x03AB) #define TSDB_CODE_MND_ARB_TOKEN_MISMATCH TAOS_DEF_ERROR_CODE(0, 0x03AC) +#define TSDB_CODE_MND_VNODE_NOT_OFFLINE TAOS_DEF_ERROR_CODE(0, 0x03AD) // mnode-dnode-part2 #define TSDB_CODE_MND_TOO_MANY_DNODES TAOS_DEF_ERROR_CODE(0, 0x03B0) diff --git a/source/util/src/terror.c b/source/util/src/terror.c index ccf30438bd..b2e663979d 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -278,6 +278,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_MNODES, "The replica of mnode TAOS_DEFINE_ERROR(TSDB_CODE_MND_ARBGROUP_ALREADY_EXIST, "Arbitrator group already exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_ARBGROUP_NOT_EXIST, "Arbitrator group not there") TAOS_DEFINE_ERROR(TSDB_CODE_MND_ARB_TOKEN_MISMATCH, "Arbitrator token mismatch") +TAOS_DEFINE_ERROR(TSDB_CODE_MND_VNODE_NOT_OFFLINE, "Vnode is not offline on this restoring dnode") // mnode-dnode-part2 TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_DNODES, "Too many dnodes") From b649f1f1c41988563a35887144a063f34db80bb4 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Sat, 14 Sep 2024 10:51:57 +0800 Subject: [PATCH 19/20] fix(stream):adj build file state res --- include/libs/executor/storageapi.h | 6 +-- include/libs/stream/tstreamFileState.h | 10 ++-- .../executor/src/streamtimewindowoperator.c | 41 ++++++++-------- source/libs/stream/src/streamUpdate.c | 4 +- source/libs/stream/src/tstreamFileState.c | 48 ++++++++++++------- 5 files changed, 62 insertions(+), 47 deletions(-) diff --git a/include/libs/executor/storageapi.h b/include/libs/executor/storageapi.h index 61ae034450..ff42643b75 100644 --- a/include/libs/executor/storageapi.h +++ b/include/libs/executor/storageapi.h @@ -408,9 +408,9 @@ typedef struct SStateStore { SStreamStateCur* (*streamStateSessionSeekKeyCurrentPrev)(SStreamState* pState, const SSessionKey* key); SStreamStateCur* (*streamStateSessionSeekKeyCurrentNext)(SStreamState* pState, const SSessionKey* key); - struct SStreamFileState* (*streamFileStateInit)(int64_t memSize, uint32_t keySize, uint32_t rowSize, - uint32_t selectRowSize, GetTsFun fp, void* pFile, TSKEY delMark, - const char* id, int64_t ckId, int8_t type); + int32_t (*streamFileStateInit)(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize, + GetTsFun fp, void* pFile, TSKEY delMark, const char* id, int64_t ckId, int8_t type, + struct SStreamFileState** ppFileState); void (*streamFileStateDestroy)(struct SStreamFileState* pFileState); void (*streamFileStateClear)(struct SStreamFileState* pFileState); diff --git a/include/libs/stream/tstreamFileState.h b/include/libs/stream/tstreamFileState.h index 8c005fa994..6f1a1b3b98 100644 --- a/include/libs/stream/tstreamFileState.h +++ b/include/libs/stream/tstreamFileState.h @@ -45,9 +45,9 @@ typedef int32_t (*_state_fun_get_fn)(SStreamFileState* pFileState, void* pKey, i typedef int32_t (*range_cmpr_fn)(const SSessionKey* pWin1, const SSessionKey* pWin2); -SStreamFileState* streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize, - GetTsFun fp, void* pFile, TSKEY delMark, const char* taskId, int64_t checkpointId, - int8_t type); +int32_t streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize, GetTsFun fp, + void* pFile, TSKEY delMark, const char* taskId, int64_t checkpointId, int8_t type, + struct SStreamFileState** ppFileState); void streamFileStateDestroy(SStreamFileState* pFileState); void streamFileStateClear(SStreamFileState* pFileState); bool needClearDiskBuff(SStreamFileState* pFileState); @@ -63,7 +63,7 @@ int32_t putFreeBuff(SStreamFileState* pFileState, SRowBuffPos* pPos); SStreamSnapshot* getSnapshot(SStreamFileState* pFileState); void flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot, bool flushState); -void recoverSnapshot(SStreamFileState* pFileState, int64_t ckId); +int32_t recoverSnapshot(SStreamFileState* pFileState, int64_t ckId); int32_t getSnapshotIdList(SStreamFileState* pFileState, SArray* list); int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark); @@ -89,7 +89,7 @@ int32_t allocSessioncWinBuffByNextPosition(SStreamFileState* pFileState, SStream const SSessionKey* pWinKey, void** ppVal, int32_t* pVLen); SRowBuffPos* createSessionWinBuff(SStreamFileState* pFileState, SSessionKey* pKey, void* p, int32_t* pVLen); -void recoverSesssion(SStreamFileState* pFileState, int64_t ckId); +int32_t recoverSesssion(SStreamFileState* pFileState, int64_t ckId); void sessionWinStateClear(SStreamFileState* pFileState); void sessionWinStateCleanup(void* pBuff); diff --git a/source/libs/executor/src/streamtimewindowoperator.c b/source/libs/executor/src/streamtimewindowoperator.c index 6196647eff..b9484decdc 100644 --- a/source/libs/executor/src/streamtimewindowoperator.c +++ b/source/libs/executor/src/streamtimewindowoperator.c @@ -1991,10 +1991,12 @@ int32_t createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiN pInfo->pUpdatedMap = NULL; pInfo->stateStore = pTaskInfo->storageAPI.stateStore; int32_t funResSize = getMaxFunResSize(&pOperator->exprSupp, numOfCols); - pInfo->pState->pFileState = pAPI->stateStore.streamFileStateInit( - tsStreamBufferSize, sizeof(SWinKey), pInfo->aggSup.resultRowSize, funResSize, compareTs, pInfo->pState, - pInfo->twAggSup.deleteMark, GET_TASKID(pTaskInfo), pHandle->checkpointId, STREAM_STATE_BUFF_HASH); - QUERY_CHECK_NULL(pInfo->pState->pFileState, code, lino, _error, terrno); + pInfo->pState->pFileState = NULL; + code = + pAPI->stateStore.streamFileStateInit(tsStreamBufferSize, sizeof(SWinKey), pInfo->aggSup.resultRowSize, funResSize, + compareTs, pInfo->pState, pInfo->twAggSup.deleteMark, GET_TASKID(pTaskInfo), + pHandle->checkpointId, STREAM_STATE_BUFF_HASH, &pInfo->pState->pFileState); + QUERY_CHECK_CODE(code, lino, _error); pInfo->dataVersion = 0; pInfo->recvGetAll = false; @@ -2176,39 +2178,33 @@ int32_t initStreamAggSupporter(SStreamAggSupporter* pSup, SExprSupp* pExpSup, in pSup->resultRowSize = keySize + getResultRowSize(pExpSup->pCtx, numOfOutput); int32_t lino = 0; int32_t code = createSpecialDataBlock(STREAM_CLEAR, &pSup->pScanBlock); - if (code) { - return code; - } + QUERY_CHECK_CODE(code, lino, _end); pSup->gap = gap; pSup->stateKeySize = keySize; pSup->stateKeyType = keyType; pSup->pDummyCtx = (SqlFunctionCtx*)taosMemoryCalloc(numOfOutput, sizeof(SqlFunctionCtx)); - if (pSup->pDummyCtx == NULL) { - return terrno; - } + QUERY_CHECK_NULL(pSup->pDummyCtx, code, lino, _end, terrno); pSup->stateStore = *pStore; pSup->pSessionAPI = pApi; initDummyFunction(pSup->pDummyCtx, pExpSup->pCtx, numOfOutput); pSup->pState = taosMemoryCalloc(1, sizeof(SStreamState)); - if (!pSup->pState) { - return terrno; - } + QUERY_CHECK_NULL(pSup->pState, code, lino, _end, terrno); + *(pSup->pState) = *pState; pSup->stateStore.streamStateSetNumber(pSup->pState, -1, tsIndex); int32_t funResSize = getMaxFunResSize(pExpSup, numOfOutput); - pSup->pState->pFileState = pSup->stateStore.streamFileStateInit( + pSup->pState->pFileState = NULL; + code = pSup->stateStore.streamFileStateInit( tsStreamBufferSize, sizeof(SSessionKey), pSup->resultRowSize, funResSize, sesionTs, pSup->pState, - pTwAggSup->deleteMark, taskIdStr, pHandle->checkpointId, STREAM_STATE_BUFF_SORT); - QUERY_CHECK_NULL(pSup->pState->pFileState, code, lino, _end, terrno); + pTwAggSup->deleteMark, taskIdStr, pHandle->checkpointId, STREAM_STATE_BUFF_SORT, &pSup->pState->pFileState); + QUERY_CHECK_CODE(code, lino, _end); _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY); pSup->pResultRows = tSimpleHashInit(32, hashFn); - if (!pSup->pResultRows) { - return terrno; - } + QUERY_CHECK_NULL(pSup->pResultRows, code, lino, _end, terrno); for (int32_t i = 0; i < numOfOutput; ++i) { pExpSup->pCtx[i].saveHandle.pState = pSup->pState; @@ -5348,10 +5344,11 @@ int32_t createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiNode* int32_t funResSize = getMaxFunResSize(pSup, numOfCols); pInfo->stateStore = pTaskInfo->storageAPI.stateStore; - pInfo->pState->pFileState = pTaskInfo->storageAPI.stateStore.streamFileStateInit( + pInfo->pState->pFileState = NULL; + code = pTaskInfo->storageAPI.stateStore.streamFileStateInit( tsStreamBufferSize, sizeof(SWinKey), pInfo->aggSup.resultRowSize, funResSize, compareTs, pInfo->pState, - pInfo->twAggSup.deleteMark, GET_TASKID(pTaskInfo), pHandle->checkpointId, STREAM_STATE_BUFF_HASH); - QUERY_CHECK_NULL(pInfo->pState->pFileState, code, lino, _error, terrno); + pInfo->twAggSup.deleteMark, GET_TASKID(pTaskInfo), pHandle->checkpointId, STREAM_STATE_BUFF_HASH, &pInfo->pState->pFileState); + QUERY_CHECK_CODE(code, lino, _error); setOperatorInfo(pOperator, "StreamIntervalOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL, true, OP_NOT_OPENED, pInfo, pTaskInfo); diff --git a/source/libs/stream/src/streamUpdate.c b/source/libs/stream/src/streamUpdate.c index 9a1a30ac7b..cc80e27467 100644 --- a/source/libs/stream/src/streamUpdate.c +++ b/source/libs/stream/src/streamUpdate.c @@ -345,7 +345,7 @@ bool updateInfoIsUpdated(SUpdateInfo* pInfo, uint64_t tableId, TSKEY ts, void* p void** pMapMaxTs = taosHashGet(pInfo->pMap, &tableId, sizeof(uint64_t)); uint64_t index = ((uint64_t)tableId) % pInfo->numBuckets; TSKEY maxTs = *(TSKEY*)taosArrayGet(pInfo->pTsBuckets, index); - if (ts < maxTs - pInfo->watermark && maxTs != INT64_MIN) { + if (maxTs != INT64_MIN && ts < maxTs - pInfo->watermark) { // this window has been closed. if (pInfo->pCloseWinSBF) { code = tScalableBfPut(pInfo->pCloseWinSBF, pInfo->pKeyBuff, buffLen, &res); @@ -585,6 +585,8 @@ int32_t updateInfoDeserialize(void* buf, int32_t bufLen, SUpdateInfo* pInfo) { int32_t sBfSize = 0; if (tDecodeI32(&decoder, &sBfSize) < 0) return -1; pInfo->pTsSBFs = taosArrayInit(sBfSize, sizeof(void*)); + QUERY_CHECK_NULL(pInfo->pTsSBFs, code, lino, _error, terrno); + for (int32_t i = 0; i < sBfSize; i++) { SScalableBf* pSBf = NULL; code = tScalableBfDecode(&decoder, &pSBf); diff --git a/source/libs/stream/src/tstreamFileState.c b/source/libs/stream/src/tstreamFileState.c index aa237efd04..abb796b0b7 100644 --- a/source/libs/stream/src/tstreamFileState.c +++ b/source/libs/stream/src/tstreamFileState.c @@ -127,9 +127,9 @@ static void streamFileStateEncode(TSKEY* pKey, void** pVal, int32_t* pLen) { int32_t tmp = taosEncodeFixedI64(&buff, *pKey); } -SStreamFileState* streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize, - GetTsFun fp, void* pFile, TSKEY delMark, const char* taskId, int64_t checkpointId, - int8_t type) { +int32_t streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize, GetTsFun fp, + void* pFile, TSKEY delMark, const char* taskId, int64_t checkpointId, int8_t type, + SStreamFileState** ppFileState) { int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; if (memSize <= 0) { @@ -194,10 +194,11 @@ SStreamFileState* streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_ // todo(liuyao) optimize if (type == STREAM_STATE_BUFF_HASH) { - recoverSnapshot(pFileState, checkpointId); + code = recoverSnapshot(pFileState, checkpointId); } else { - recoverSesssion(pFileState, checkpointId); + code = recoverSesssion(pFileState, checkpointId); } + QUERY_CHECK_CODE(code, lino, _error); void* valBuf = NULL; int32_t len = 0; @@ -208,14 +209,14 @@ SStreamFileState* streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_ qDebug("===stream===flushMark read:%" PRId64, pFileState->flushMark); } taosMemoryFreeClear(valBuf); - return pFileState; + (*ppFileState) = pFileState; _error: if (code != TSDB_CODE_SUCCESS) { + streamFileStateDestroy(pFileState); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); } - streamFileStateDestroy(pFileState); - return NULL; + return code; } void destroyRowBuffPos(SRowBuffPos* pPos) { @@ -806,8 +807,10 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) { return code; } -void recoverSesssion(SStreamFileState* pFileState, int64_t ckId) { +int32_t recoverSesssion(SStreamFileState* pFileState, int64_t ckId) { int32_t code = TSDB_CODE_SUCCESS; + int32_t lino = 0; + int32_t winRes = TSDB_CODE_SUCCESS; if (pFileState->maxTs != INT64_MIN) { int64_t mark = (INT64_MIN + pFileState->deleteMark >= pFileState->maxTs) ? INT64_MIN @@ -818,7 +821,7 @@ void recoverSesssion(SStreamFileState* pFileState, int64_t ckId) { SStreamStateCur* pCur = streamStateSessionSeekToLast_rocksdb(pFileState->pFileStore, INT64_MAX); int32_t recoverNum = TMIN(MIN_NUM_OF_RECOVER_ROW_BUFF, pFileState->maxRowCount); - while (code == TSDB_CODE_SUCCESS) { + while (winRes == TSDB_CODE_SUCCESS) { if (pFileState->curRowCount >= recoverNum) { break; } @@ -826,22 +829,34 @@ void recoverSesssion(SStreamFileState* pFileState, int64_t ckId) { void* pVal = NULL; int32_t vlen = 0; SSessionKey key = {0}; - code = streamStateSessionGetKVByCur_rocksdb(pCur, &key, &pVal, &vlen); - if (code != TSDB_CODE_SUCCESS) { + winRes = streamStateSessionGetKVByCur_rocksdb(pCur, &key, &pVal, &vlen); + if (winRes != TSDB_CODE_SUCCESS) { break; } + + if (vlen != pFileState->rowSize) { + code = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; + QUERY_CHECK_CODE(code, lino, _end); + } + SRowBuffPos* pPos = createSessionWinBuff(pFileState, &key, pVal, &vlen); - code = putSessionWinResultBuff(pFileState, pPos); - if (code != TSDB_CODE_SUCCESS) { + winRes = putSessionWinResultBuff(pFileState, pPos); + if (winRes != TSDB_CODE_SUCCESS) { break; } - code = streamStateSessionCurPrev_rocksdb(pCur); + winRes = streamStateSessionCurPrev_rocksdb(pCur); + } + +_end: + if (code != TSDB_CODE_SUCCESS) { + qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); } streamStateFreeCur(pCur); + return code; } -void recoverSnapshot(SStreamFileState* pFileState, int64_t ckId) { +int32_t recoverSnapshot(SStreamFileState* pFileState, int64_t ckId) { int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; int32_t winCode = TSDB_CODE_SUCCESS; @@ -896,6 +911,7 @@ _end: qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); } streamStateFreeCur(pCur); + return code; } int32_t streamFileStateGetSelectRowSize(SStreamFileState* pFileState) { return pFileState->selectivityRowSize; } From c9f0df925bdc0690bd5f652e2469eb2f0d350e4a Mon Sep 17 00:00:00 2001 From: guxiang02 Date: Sat, 14 Sep 2024 14:03:43 +0800 Subject: [PATCH 20/20] docs: update kafka&opcua TD-32095 TD-32090 --- docs/zh/06-advanced/05-data-in/05-opcua.md | 4 ++-- docs/zh/06-advanced/05-data-in/08-kafka.md | 6 +++++- docs/zh/06-advanced/05-data-in/kafka-03.png | Bin 6686 -> 46089 bytes 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/zh/06-advanced/05-data-in/05-opcua.md b/docs/zh/06-advanced/05-data-in/05-opcua.md index 36dfd08664..7ae7f153e9 100644 --- a/docs/zh/06-advanced/05-data-in/05-opcua.md +++ b/docs/zh/06-advanced/05-data-in/05-opcua.md @@ -169,8 +169,8 @@ CSV 文件中的每个 Row 配置一个 OPC 数据点位。Row 的规则如下 - **采集模式**：可使用 `subscribe` 或 `observe` 模式。 - `subscribe`：订阅模式，变更时上报数据并写入 TDengine。 - `observe`：按照`采集间隔`时长，轮询读取点位最新值并写入 TDengine。 -- 采集间隔：默认为 10 秒，数据点位采集间隔，从上次采集数据结束后开始计时，轮询读取点位最新值并写入 TDengine。 -- **采集超时**：向 OPC 服务器读取点位数据时如果超过设定时间未返回数据，则读取失败，默认为 10 秒。 +- **采集间隔**：默认为 10 秒，数据点位采集间隔，从上次采集数据结束后开始计时，轮询读取点位最新值并写入 TDengine。仅在 **采集模式** 为 `observe` 时可配置。 +- **采集超时**：向 OPC 服务器读取点位数据时如果超过设定时间未返回数据，则读取失败，默认为 10 秒。仅在 **采集模式** 为 `observe` 时可配置。 当 **点位集** 中使用 **选择数据点位** 方式时，采集配置中可以配置 **点位更新模式** 和 **点位更新间隔** 来启用动态点位更新。**动态点位更新** 是指，在任务运行期间，OPC Server增加或删除了点位后，符合条件的点位会自动添加到当前任务中，不需要重启 OPC 任务。 diff --git a/docs/zh/06-advanced/05-data-in/08-kafka.md b/docs/zh/06-advanced/05-data-in/08-kafka.md index 5c6d9190a8..dd5512d615 100644 --- a/docs/zh/06-advanced/05-data-in/08-kafka.md +++ b/docs/zh/06-advanced/05-data-in/08-kafka.md @@ -32,7 +32,11 @@ TDengine 可以高效地从 Kafka 读取数据并将其写入 TDengine，以实 ### 3. 配置连接信息 -在 **连接配置** 区域填写 **bootstrap-servers**，例如：`192.168.1.92:9092`。 +**bootstrap-server**，例如：`192.168.1.92`。 + +**服务端口**，例如：`9092`。 + +多个 broker 地址时，在连接配置右下增加 **新增 Broker** 按钮，成对增加 bootstrap-server 和服务端口。 ![kafka-03.png](./kafka-03.png) diff --git a/docs/zh/06-advanced/05-data-in/kafka-03.png b/docs/zh/06-advanced/05-data-in/kafka-03.png index 31a3ead3edbd7c068dc71d1ff0e0e2a56643d458..a3257cc588b6c88b0571f022adcfca77b867c4a7 100644 GIT binary patch literal 46089 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 literal 6686 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