From 043a8a8cfc2961d48ed9e4d138ff65dfb6e04fa9 Mon Sep 17 00:00:00 2001 From: wangjiaming0909 <604227650@qq.com> Date: Thu, 22 Aug 2024 18:34:15 +0800 Subject: [PATCH] use internal error --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 20 ++++++++++---------- source/dnode/vnode/src/tsdb/tsdbReadUtil.c | 4 ++-- source/libs/executor/src/projectoperator.c | 2 +- source/libs/executor/src/tlinearhash.c | 8 ++++---- source/libs/executor/src/tsort.c | 20 ++++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index ffd2427577..391b7f636d 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -674,7 +674,7 @@ static int32_t doLoadBlockIndex(STsdbReader* pReader, SDataFileReader* pFileRead if (!(pBrinBlk->minTbid.suid <= pReader->info.suid && pBrinBlk->maxTbid.suid >= pReader->info.suid)) { tsdbError("tsdb failed at: %s %d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } if (pBrinBlk->maxTbid.suid == pReader->info.suid && pBrinBlk->maxTbid.uid < pList->tableUidList[0]) { i += 1; @@ -757,7 +757,7 @@ static int32_t loadFileBlockBrinInfo(STsdbReader* pReader, SArray* pIndexList, S if (!(pRecord->suid == pReader->info.suid && uid == pRecord->uid)) { tsdbError("tsdb failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } STableBlockScanInfo* pScanInfo = NULL; @@ -930,7 +930,7 @@ static int32_t getCurrentBlockInfo(SDataBlockIter* pBlockIter, SFileDataBlockInf size_t num = TARRAY_SIZE(pBlockIter->blockList); if (num == 0) { tsdbError("tsdb read failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } *pInfo = taosArrayGet(pBlockIter->blockList, pBlockIter->index); @@ -1937,7 +1937,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo* if (pMerger->pArray == NULL) { if (pReader->info.pSchema != NULL) { tsdbError("tsdb failed at %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); if (ps == NULL) { @@ -2033,7 +2033,7 @@ static int32_t mergeFileBlockAndSttBlock(STsdbReader* pReader, SSttBlockReader* if (pMerger->pArray == NULL) { if (pReader->info.pSchema) { tsdbError("tsdb failed at %s %d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); if (ps == NULL) { @@ -2169,7 +2169,7 @@ static int32_t doMergeMultiLevelRows(STsdbReader* pReader, STableBlockScanInfo* if (pMerger->pArray == NULL) { if (pReader->info.pSchema != NULL) { tsdbError("tsdb read failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); if (ps == NULL) { @@ -2573,7 +2573,7 @@ int32_t mergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pBloc if (pMerger->pArray == NULL) { if (pReader->info.pSchema != NULL) { tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } STSchema* ps = getTableSchemaImpl(pReader, pBlockScanInfo->uid); if (ps == NULL) { @@ -3362,7 +3362,7 @@ static int32_t doBuildDataBlock(STsdbReader* pReader) { } else { // clean stt block if (!(pReader->info.execMode == READER_EXEC_ROWS && pSttBlockReader->mergeTree.pIter == NULL)) { tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } code = buildCleanBlockFromSttFiles(pReader, pScanInfo); return code; @@ -3386,7 +3386,7 @@ static int32_t doBuildDataBlock(STsdbReader* pReader) { while (hasDataInSttBlock(pScanInfo)) { if (pScanInfo->sttKeyInfo.status != STT_FILE_HAS_DATA) { tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } code = buildComposedDataBlockImpl(pReader, pScanInfo, &pReader->status.fileBlockData, pSttBlockReader); @@ -3611,7 +3611,7 @@ static ERetrieveType doReadDataFromSttFiles(STsdbReader* pReader) { // all data blocks are checked in this stt file, now let's try the next file set if (pReader->status.pTableIter != NULL) { - terrno = TSDB_CODE_FAILED; + terrno = TSDB_CODE_INTERNAL_ERROR; tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); return TSDB_READ_RETURN; } diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c index fe258093b4..5d4dc94431 100644 --- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c @@ -848,7 +848,7 @@ static int32_t doCheckTombBlock(STombBlock* pBlock, STsdbReader* pReader, int32_ if (!(record.suid == pReader->info.suid && uid == record.uid)) { tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } if (record.version <= pReader->info.verRange.maxVer) { @@ -885,7 +885,7 @@ static int32_t doLoadTombDataFromTombBlk(const TTombBlkArray* pTombBlkArray, STs if (!(pTombBlk->minTbid.suid <= pReader->info.suid && pTombBlk->maxTbid.suid >= pReader->info.suid)) { tsdbError("tsdb reader failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } if (pTombBlk->maxTbid.suid == pReader->info.suid && pTombBlk->maxTbid.uid < pList->tableUidList[0]) { i += 1; diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c index 1a43fe47a3..bf523af918 100644 --- a/source/libs/executor/src/projectoperator.c +++ b/source/libs/executor/src/projectoperator.c @@ -823,7 +823,7 @@ int32_t doGenerateSourceData(SOperatorInfo* pOperator) { int32_t startOffset = pRes->info.rows; if (pRes->info.capacity <= 0) { qError("project failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } code = colDataAssign(pResColData, &idata, dest.numOfRows, &pRes->info); if (code) { diff --git a/source/libs/executor/src/tlinearhash.c b/source/libs/executor/src/tlinearhash.c index 9487e9d163..55628c18f9 100644 --- a/source/libs/executor/src/tlinearhash.c +++ b/source/libs/executor/src/tlinearhash.c @@ -62,7 +62,7 @@ static int32_t doGetAlternativeBucketId(int32_t bucketId, int32_t bits, int32_t int32_t v = bucketId - (1ul << (bits - 1)); if (v >= numOfBuckets) { qError("tlinearhash failed at: %s:%d", __func__, __LINE__); - terrno = TSDB_CODE_FAILED; + terrno = TSDB_CODE_INTERNAL_ERROR; return -1; } return v; @@ -357,7 +357,7 @@ int32_t tHashPut(SLHashObj* pHashObj, const void* key, size_t keyLen, void* data // printf("extend the bits from %d to %d, new bucket:%d\n", pHashObj->bits, numOfBits, newBucketId); if (numOfBits != pHashObj->bits + 1) { qError("linear hash faield at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } pHashObj->bits = numOfBits; } @@ -377,7 +377,7 @@ int32_t tHashPut(SLHashObj* pHashObj, const void* key, size_t keyLen, void* data SLHashNode* pNode = (SLHashNode*)pStart; if (pNode->keyLen <= 0) { qError("linear hash faield at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } char* k = GET_LHASH_NODE_KEY(pNode); @@ -387,7 +387,7 @@ int32_t tHashPut(SLHashObj* pHashObj, const void* key, size_t keyLen, void* data if (v1 != splitBucketId) { // place it into the new bucket if (v1 != newBucketId) { qError("linear hash failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_INTERNAL_ERROR; } // printf("move key:%d to 0x%x bucket, remain items:%d\n", *(int32_t*)k, v1, pBucket->size - 1); SLHashBucket* pNewBucket = pHashObj->pBucket[newBucketId]; diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c index 74fd48d85a..c1edf700d1 100644 --- a/source/libs/executor/src/tsort.c +++ b/source/libs/executor/src/tsort.c @@ -471,7 +471,7 @@ static int32_t doAddNewExternalMemSource(SDiskbasedBuf* pBuf, SArray* pAllSource if (numOfRows <= 0) { qError("sort failed at: %s:%d", __func__, __LINE__); taosArrayDestroy(pPageIdList); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } return blockDataEnsureCapacity(pSource->src.pBlock, numOfRows); @@ -534,7 +534,7 @@ static int32_t doAddToBuf(SSDataBlock* pDataBlock, SSortHandle* pHandle) { int32_t size = blockDataGetSize(p) + sizeof(int32_t) + taosArrayGetSize(p->pDataBlock) * sizeof(int32_t); if (size > getBufPageSize(pHandle->pBuf)) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } code = blockDataToBuf(pPage, p); @@ -1052,7 +1052,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) { blockDataGetSize(pDataBlock) + sizeof(int32_t) + taosArrayGetSize(pDataBlock->pDataBlock) * sizeof(int32_t); if (size > getBufPageSize(pHandle->pBuf)) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } code= blockDataToBuf(pPage, pDataBlock); @@ -1325,7 +1325,7 @@ static int32_t getRowBufFromExtMemFile(SSortHandle* pHandle, int32_t regionId, i } if (pRegion->bufRegOffset > tupleOffset) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } if (pRegion->bufRegOffset + pRegion->bufLen >= tupleOffset + rowLen) { *pFreeRow = false; @@ -1505,7 +1505,7 @@ static int32_t tsortFinalizeRegions(SSortHandle* pHandle) { size_t numRegions = taosArrayGetSize(pMemFile->aFileRegions); if (numRegions != (pMemFile->currRegionId + 1)) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } if (numRegions == 0) { return TSDB_CODE_SUCCESS; @@ -1833,7 +1833,7 @@ static int32_t appendDataBlockToPageBuf(SSortHandle* pHandle, SSDataBlock* blk, int32_t size = blockDataGetSize(blk) + sizeof(int32_t) + taosArrayGetSize(blk->pDataBlock) * sizeof(int32_t); if (size > getBufPageSize(pHandle->pBuf)) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } int32_t code = blockDataToBuf(pPage, blk); @@ -1887,7 +1887,7 @@ static int32_t getPageBufIncForRowIdSort(SSDataBlock* pDstBlock, int32_t srcRowI if (pPkCol == NULL) { // no var column if (!((numOfCols == 4) && (!pDstBlock->info.hasVarCol))) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } size += numOfCols * ((dstRowIndex & 0x7) == 0 ? 1: 0); @@ -1895,7 +1895,7 @@ static int32_t getPageBufIncForRowIdSort(SSDataBlock* pDstBlock, int32_t srcRowI } else { if (numOfCols != 5) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } size += (numOfCols - 1) * (((dstRowIndex & 0x7) == 0)? 1:0); @@ -2534,7 +2534,7 @@ static int32_t tsortOpenForBufMergeSort(SSortHandle* pHandle) { if (pHandle->pBuf != NULL) { if (numOfSources > getNumOfInMemBufPages(pHandle->pBuf)) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } } @@ -2631,7 +2631,7 @@ static int32_t tsortBufMergeSortNextTuple(SSortHandle* pHandle, STupleHandle** p if (pSource->src.pBlock == NULL) { qError("sort failed at: %s:%d", __func__, __LINE__); - return TSDB_CODE_FAILED; + return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; } pHandle->tupleHandle.rowIndex = pSource->src.rowIndex;