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

Merge pull request #27413 from taosdata/fix/3.0/TD-31524-TD-31523 

fix error not reported in sort operator
This commit is contained in:
dapan1121 2024-08-24 15:00:50 +08:00 committed by GitHub
parent 8a367a3537 9ae951621b
commit bf9e5f349d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/common/src/tdatablock.c
View File

@ -973,6 +973,9 @@ int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock) {
int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) { int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
int32_t numOfRows = *(int32_t*)buf; int32_t numOfRows = *(int32_t*)buf;
if (numOfRows == 0) {
return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
}
int32_t code = blockDataEnsureCapacity(pBlock, numOfRows); int32_t code = blockDataEnsureCapacity(pBlock, numOfRows);
if (code) { if (code) {
return code; return code;

3
source/libs/executor/src/sortoperator.c
View File

@ -295,6 +295,9 @@ static int32_t getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock,
break; break;
} }
} }
if (TSDB_CODE_SUCCESS != code) {
return code;
}
if (p->info.rows > 0) { if (p->info.rows > 0) {
code = blockDataEnsureCapacity(pDataBlock, capacity); code = blockDataEnsureCapacity(pDataBlock, capacity);