From b309c251dab1bac953be4121be78ce5a6141447c Mon Sep 17 00:00:00 2001 From: slzhou Date: Wed, 13 Dec 2023 13:21:26 +0800 Subject: [PATCH] fix: pass simple test --- source/libs/executor/src/scanoperator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index be5cf298a4..90ab994e1c 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -3317,8 +3317,8 @@ static int32_t transformIntoSortInputBlock(STableMergeScanInfo* pInfo, SSDataBlo int32_t length = -1; saveBlockRowToBuf(pInfo, pSrcBlock, i, &pageId, &offset, &length); colDataSetInt32(pageIdCol, i, &pageId); - colDataSetInt32(pageIdCol, i, &offset); - colDataSetInt32(pageIdCol, i, &length); + colDataSetInt32(offsetCol, i, &offset); + colDataSetInt32(lengthCol, i, &length); } pSortInputBlk->info.rows = nRows; @@ -3327,13 +3327,13 @@ static int32_t transformIntoSortInputBlock(STableMergeScanInfo* pInfo, SSDataBlo } void appendOneRowIdRowToDataBlock(STableMergeScanInfo* pInfo, SSDataBlock* pBlock, STupleHandle* pTupleHandle) { + STmsSortRowIdInfo* pSortInfo = &pInfo->tmsSortRowIdInfo; + int32_t pageId = *(int32_t*)tsortGetValue(pTupleHandle, 1); int32_t offset = *(int32_t*)tsortGetValue(pTupleHandle, 2); - int32_t length = *(int32_t*)tsortGetValue(pTupleHandle, 2); + int32_t length = *(int32_t*)tsortGetValue(pTupleHandle, 3); void* page = getBufPage(pInfo->tmsSortRowIdInfo.pExtSrcRowsBuf, pageId); - STmsSortRowIdInfo* pSortInfo = &pInfo->tmsSortRowIdInfo; - int32_t numOfCols = taosArrayGetSize(pBlock->pDataBlock); char* buf = (char*)page + offset; char* isNull = (char*)buf; @@ -3849,7 +3849,7 @@ SOperatorInfo* createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanN blockDataAppendColInfo(pSortInput, &pageIdCol); SColumnInfoData offsetCol = createColumnInfoData(TSDB_DATA_TYPE_INT, 4, 3); blockDataAppendColInfo(pSortInput, &offsetCol); - SColumnInfoData lengthCol = createColumnInfoData(TSDB_DATA_TYPE_INT, 4, 3); + SColumnInfoData lengthCol = createColumnInfoData(TSDB_DATA_TYPE_INT, 4, 4); blockDataAppendColInfo(pSortInput, &lengthCol); pInfo->pSortInputBlock = pSortInput;