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

fix(query): fix error in merge sort scan

This commit is contained in:
Haojun Liao 2024-08-27 19:47:39 +08:00
parent f510f2961b
commit adca73d237
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/libs/executor/src/mergeoperator.c
View File

@ -505,7 +505,6 @@ int32_t doMultiwayMerge(SOperatorInfo* pOperator, SSDataBlock** pResBlock) {
return 0; return 0;
} }
SSDataBlock* pBlock = NULL;
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SMultiwayMergeOperatorInfo* pInfo = pOperator->info; SMultiwayMergeOperatorInfo* pInfo = pOperator->info;
@ -516,15 +515,15 @@ int32_t doMultiwayMerge(SOperatorInfo* pOperator, SSDataBlock** pResBlock) {
} }
if (NULL != gMultiwayMergeFps[pInfo->type].getNextFn) { if (NULL != gMultiwayMergeFps[pInfo->type].getNextFn) {
code = (*gMultiwayMergeFps[pInfo->type].getNextFn)(pOperator, &pBlock); code = (*gMultiwayMergeFps[pInfo->type].getNextFn)(pOperator, pResBlock);
if (code) { if (code) {
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
} }
if (pBlock != NULL) { if ((*pResBlock) != NULL) {
pOperator->resultInfo.totalRows += pBlock->info.rows; pOperator->resultInfo.totalRows += (*pResBlock)->info.rows;
} else { } else {
setOperatorCompleted(pOperator); setOperatorCompleted(pOperator);
} }