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

fix: ci error

This commit is contained in:
slzhou 2023-12-19 14:55:31 +08:00
parent 5be6ed9553
commit 1aa94a8b3d
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/executor/inc/executorInt.h
View File

@ -275,6 +275,7 @@ typedef struct STableScanInfo {
typedef struct STmsSortRowIdInfo { typedef struct STmsSortRowIdInfo {
SDiskbasedBuf* pExtSrcRowsBuf; SDiskbasedBuf* pExtSrcRowsBuf;
int32_t srcTsSlotId;
} STmsSortRowIdInfo; } STmsSortRowIdInfo;
typedef struct STableMergeScanInfo { typedef struct STableMergeScanInfo {

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

@ -3278,8 +3278,13 @@ static int32_t saveBlockRowToBuf(STableMergeScanInfo* pInfo, SSDataBlock* pBlock
memcpy(pStart, pData, dataLen); memcpy(pStart, pData, dataLen);
pStart += dataLen; pStart += dataLen;
} else if (IS_VAR_DATA_TYPE(pCol->info.type)) { } else if (IS_VAR_DATA_TYPE(pCol->info.type)) {
varDataCopy(pStart, pData); if (colDataGetLength(pCol, blockDataGetNumOfRows(pBlock)) != 0) {
pStart += varDataTLen(pData); varDataCopy(pStart, pData);
pStart += varDataTLen(pData);
} else {
*(VarDataLenT*)(pStart) = 0;
pStart += VARSTR_HEADER_SIZE;
}
} else { } else {
int32_t bytes = pCol->info.bytes; int32_t bytes = pCol->info.bytes;
memcpy(pStart, pData, bytes); memcpy(pStart, pData, bytes);
@ -3301,9 +3306,8 @@ static int32_t transformIntoSortInputBlock(STableMergeScanInfo* pInfo, SSDataBlo
pSortInputBlk->info.id = pSrcBlock->info.id; pSortInputBlk->info.id = pSrcBlock->info.id;
blockDataEnsureCapacity(pSortInputBlk, nRows); blockDataEnsureCapacity(pSortInputBlk, nRows);
int32_t tsSlotId = ((SBlockOrderInfo*)taosArrayGet(pInfo->pSortInfo, 0))->slotId;
SColumnInfoData* tsCol = taosArrayGet(pSortInputBlk->pDataBlock, 0); SColumnInfoData* tsCol = taosArrayGet(pSortInputBlk->pDataBlock, 0);
SColumnInfoData* pSrcTsCol = taosArrayGet(pSrcBlock->pDataBlock, tsSlotId); SColumnInfoData* pSrcTsCol = taosArrayGet(pSrcBlock->pDataBlock, pSortInfo->srcTsSlotId);
colDataAssign(tsCol, pSrcTsCol, nRows, &pSortInputBlk->info); colDataAssign(tsCol, pSrcTsCol, nRows, &pSortInputBlk->info);
SColumnInfoData* pageIdCol = taosArrayGet(pSortInputBlk->pDataBlock, 1); SColumnInfoData* pageIdCol = taosArrayGet(pSortInputBlk->pDataBlock, 1);
@ -3412,6 +3416,7 @@ static void doGetBlockForTableMergeScan(SOperatorInfo* pOperator, bool* pFinishe
uint32_t status = 0; uint32_t status = 0;
code = loadDataBlock(pOperator, &pInfo->base, pBlock, &status); code = loadDataBlock(pOperator, &pInfo->base, pBlock, &status);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
qInfo("table merge scan load datablock code %d, %s", code, GET_TASKID(pTaskInfo)); qInfo("table merge scan load datablock code %d, %s", code, GET_TASKID(pTaskInfo));
T_LONG_JMP(pTaskInfo->env, code); T_LONG_JMP(pTaskInfo->env, code);
@ -3918,6 +3923,7 @@ SOperatorInfo* createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanN
pInfo->pSortInfo = generateSortByTsInfo(pInfo->base.matchInfo.pList, pInfo->base.cond.order); pInfo->pSortInfo = generateSortByTsInfo(pInfo->base.matchInfo.pList, pInfo->base.cond.order);
pInfo->pSortInputBlock = createOneDataBlock(pInfo->pResBlock, false); pInfo->pSortInputBlock = createOneDataBlock(pInfo->pResBlock, false);
} else { } else {
SSDataBlock* pSortInput = createDataBlock(); SSDataBlock* pSortInput = createDataBlock();
SColumnInfoData tsCol = createColumnInfoData(TSDB_DATA_TYPE_TIMESTAMP, 8, 1); SColumnInfoData tsCol = createColumnInfoData(TSDB_DATA_TYPE_TIMESTAMP, 8, 1);
blockDataAppendColInfo(pSortInput, &tsCol); blockDataAppendColInfo(pSortInput, &tsCol);
@ -3929,6 +3935,14 @@ SOperatorInfo* createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanN
blockDataAppendColInfo(pSortInput, &lengthCol); blockDataAppendColInfo(pSortInput, &lengthCol);
pInfo->pSortInputBlock = pSortInput; pInfo->pSortInputBlock = pSortInput;
int32_t srcTsSlotId = 0;
for (int32_t i = 0; i < taosArrayGetSize(pInfo->base.matchInfo.pList); ++i) {
SColMatchItem* colInfo = taosArrayGet(pInfo->base.matchInfo.pList, i);
if (colInfo->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
srcTsSlotId = colInfo->dstSlotId;
}
}
pInfo->tmsSortRowIdInfo.srcTsSlotId = srcTsSlotId;
SArray* pList = taosArrayInit(1, sizeof(SBlockOrderInfo)); SArray* pList = taosArrayInit(1, sizeof(SBlockOrderInfo));
SBlockOrderInfo bi = {0}; SBlockOrderInfo bi = {0};
bi.order = pInfo->base.cond.order; bi.order = pInfo->base.cond.order;