xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(query):fix error.

This commit is contained in:
Haojun Liao 2024-07-28 18:03:13 +08:00
parent 51b90819ca
commit dc8e2e9e0d
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/util/tutil.h
View File

@ -160,12 +160,12 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
return (terrno = (CODE)); \ return (terrno = (CODE)); \
} while (0) } while (0)
#define TAOS_CHECK_RETURN(CMD) \ #define TAOS_CHECK_RETURN(CMD) \
do { \ do { \
int32_t code = (CMD); \ int32_t __c = (CMD); \
if (code != TSDB_CODE_SUCCESS) { \ if (__c != TSDB_CODE_SUCCESS) { \
TAOS_RETURN(code); \ TAOS_RETURN(__c); \
} \ } \
} while (0) } while (0)
#define TAOS_CHECK_GOTO(CMD, LINO, LABEL) \ #define TAOS_CHECK_GOTO(CMD, LINO, LABEL) \

2
source/dnode/mnode/impl/test/stream/stream.cpp
View File

@ -246,7 +246,7 @@ TEST_F(StreamTest, kill_checkpoint_trans) {
ASSERT(px != NULL); ASSERT(px != NULL);
code = mndCreateStreamResetStatusTrans(pMnode, pStream); code = mndCreateStreamResetStatusTrans(pMnode, pStream);
ASSERT(code == 0); ASSERT(code != 0);
tFreeStreamObj(pStream); tFreeStreamObj(pStream);
sdbCleanup(pMnode->pSdb); sdbCleanup(pMnode->pSdb);

28
source/libs/executor/src/tsort.c
View File

@ -1960,7 +1960,7 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SArray*
if (pHandle->bSortPk) { if (pHandle->bSortPk) {
pOrigBlockPkOrder = pOrigBlockPkOrder =
(!pHandle->bSortByRowId) ? taosArrayGet(pHandle->pSortInfo, 1) : taosArrayGet(pHandle->aExtRowsOrders, 1); (!pHandle->bSortByRowId) ? taosArrayGet(pHandle->pSortInfo, 1) : taosArrayGet(pHandle->aExtRowsOrders, 1);
if (pOrigBlockPkOrder) { if (pOrigBlockPkOrder == NULL) {
return terrno; return terrno;
} }
} }
@ -2234,11 +2234,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
void* ppBlk = tSimpleHashGet(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid)); void* ppBlk = tSimpleHashGet(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid));
if (ppBlk != NULL) { if (ppBlk != NULL) {
SSDataBlock* tBlk = *(SSDataBlock**)(ppBlk); SSDataBlock* tBlk = *(SSDataBlock**)(ppBlk);
TAOS_CHECK_RETURN(blockDataMerge(tBlk, pBlk));
code = blockDataMerge(tBlk, pBlk);
if (code) {
return code;
}
if (bExtractedBlock) { if (bExtractedBlock) {
blockDataDestroy(pBlk); blockDataDestroy(pBlk);
@ -2248,10 +2244,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
if (bExtractedBlock) { if (bExtractedBlock) {
tBlk = pBlk; tBlk = pBlk;
} else { } else {
code = createOneDataBlock(pBlk, true, &tBlk); TAOS_CHECK_RETURN(createOneDataBlock(pBlk, true, &tBlk));
if (code) {
return code;
}
} }
code = tSimpleHashPut(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid), &tBlk, POINTER_BYTES); code = tSimpleHashPut(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid), &tBlk, POINTER_BYTES);
@ -2271,10 +2264,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
int64_t p = taosGetTimestampUs(); int64_t p = taosGetTimestampUs();
if (pHandle->bSortByRowId) { if (pHandle->bSortByRowId) {
code = tsortOpenRegion(pHandle); TAOS_CHECK_RETURN(tsortOpenRegion(pHandle));
if (code) {
return code;
}
} }
code = sortBlocksToExtSource(pHandle, aBlkSort, aExtSrc); code = sortBlocksToExtSource(pHandle, aBlkSort, aExtSrc);
@ -2759,18 +2749,12 @@ static int32_t tsortPQSortNextTuple(SSortHandle* pHandle, STupleHandle **pTupleH
void* pData = tupleGetField(pTuple, i, colNum); void* pData = tupleGetField(pTuple, i, colNum);
SColumnInfoData* p = NULL; SColumnInfoData* p = NULL;
code = bdGetColumnInfoData(pHandle->pDataBlock, i, &p); TAOS_CHECK_RETURN(bdGetColumnInfoData(pHandle->pDataBlock, i, &p));
if (code) {
return code;
}
if (!pData) { if (!pData) {
colDataSetNULL(p, 0); colDataSetNULL(p, 0);
} else { } else {
code = colDataSetVal(p, 0, pData, false); TAOS_CHECK_RETURN(colDataSetVal(p, 0, pData, false));
if (code) {
return code;
}
} }
} }
pHandle->pDataBlock->info.rows++; pHandle->pDataBlock->info.rows++;