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

fix: seqStableJoinComposeRes

This commit is contained in:
factosea 2025-01-08 15:22:19 +08:00
parent c85a57c055
commit e71ea69cdb
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/libs/executor/src/dynqueryctrloperator.c
View File

@ -906,26 +906,28 @@ static int32_t seqJoinLaunchNewRetrieve(SOperatorInfo* pOperator, SSDataBlock**
} }
static int32_t seqStableJoinComposeRes(SStbJoinDynCtrlInfo* pStbJoin, SSDataBlock* pBlock) { static int32_t seqStableJoinComposeRes(SStbJoinDynCtrlInfo* pStbJoin, SSDataBlock* pBlock) {
if (pBlock && pStbJoin && pStbJoin->pOutputDataBlockDesc) { if (pBlock) {
pBlock->info.id.blockId = pStbJoin->pOutputDataBlockDesc->dataBlockId; if (pStbJoin && pStbJoin->pOutputDataBlockDesc) {
if (!pBlock->pDataBlock) return TSDB_CODE_SUCCESS; pBlock->info.id.blockId = pStbJoin->pOutputDataBlockDesc->dataBlockId;
if (!pBlock->pDataBlock) return TSDB_CODE_SUCCESS;
for (int i = pBlock->pDataBlock->size; i < pStbJoin->pOutputDataBlockDesc->pSlots->length; i++) { for (int i = pBlock->pDataBlock->size; i < pStbJoin->pOutputDataBlockDesc->pSlots->length; i++) {
SSlotDescNode* pSlot = (SSlotDescNode*)nodesListGetNode(pStbJoin->pOutputDataBlockDesc->pSlots, i); SSlotDescNode* pSlot = (SSlotDescNode*)nodesListGetNode(pStbJoin->pOutputDataBlockDesc->pSlots, i);
if (pSlot == NULL) { if (pSlot == NULL) {
qError("seqStableJoinComposeRes: pSlot is NULL, i:%d", i); qError("seqStableJoinComposeRes: pSlot is NULL, i:%d", i);
return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR; return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
} }
SColumnInfoData colInfo = createColumnInfoData(pSlot->dataType.type, pSlot->dataType.bytes, pSlot->slotId); SColumnInfoData colInfo = createColumnInfoData(pSlot->dataType.type, pSlot->dataType.bytes, pSlot->slotId);
colInfoDataEnsureCapacity(&colInfo, pBlock->info.rows, true); colInfoDataEnsureCapacity(&colInfo, pBlock->info.rows, true);
int32_t code = blockDataAppendColInfo(pBlock, &colInfo); int32_t code = blockDataAppendColInfo(pBlock, &colInfo);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
return -1; return -1;
}
} }
} else {
qError("seqStableJoinComposeRes: pBlock or pStbJoin is NULL");
return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
} }
} else {
qError("seqStableJoinComposeRes: pBlock or pStbJoin is NULL");
return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }