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

fix: skip delete msg affects 0 row

This commit is contained in:
kailixu 2023-11-10 15:30:49 +08:00
parent b1bca4e1e2
commit d5d8568bad
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/vnode/src/sma/smaRollup.c
View File

@ -1550,13 +1550,17 @@ static int32_t tdRSmaBatchExec(SSma *pSma, SRSmaInfo *pInfo, STaosQall *qall, SA
taosFreeQitem(msg); taosFreeQitem(msg);
goto _err; goto _err;
} }
if (!taosArrayPush(pSubmitArr, &packData)) {
if (packData.pDataBlock && !taosArrayPush(pSubmitArr, &packData)) {
taosFreeQitem(msg); taosFreeQitem(msg);
terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;
goto _err; goto _err;
} }
taosFreeQitem(msg); taosFreeQitem(msg);
++nDelete; if (packData.pDataBlock) {
// packData.pDataBlock is NULL if delete affects 0 row
++nDelete;
}
} else { } else {
ASSERTS(0, "unknown msg type:%d", inputType); ASSERTS(0, "unknown msg type:%d", inputType);
break; break;

5
source/libs/executor/src/scanoperator.c
View File

@ -2106,11 +2106,6 @@ FETCH_NEXT_BLOCK:
SPackedData* pPacked = taosArrayGet(pInfo->pBlockLists, current); SPackedData* pPacked = taosArrayGet(pInfo->pBlockLists, current);
SSDataBlock* pBlock = pPacked->pDataBlock; SSDataBlock* pBlock = pPacked->pDataBlock;
if(!pBlock) {
doClearBufferedBlocks(pInfo);
return NULL;
}
if (pBlock->info.parTbName[0]) { if (pBlock->info.parTbName[0]) {
pAPI->stateStore.streamStatePutParName(pStreamInfo->pState, pBlock->info.id.groupId, pBlock->info.parTbName); pAPI->stateStore.streamStatePutParName(pStreamInfo->pState, pBlock->info.id.groupId, pBlock->info.parTbName);
} }