From d1b85f893ece8efddc234dc6b79805904a5ba97c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 21 Dec 2022 16:24:37 +0800 Subject: [PATCH 1/2] fix(query): update the blockInfo --- source/dnode/vnode/src/tsdb/tsdbRead.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 24a614800e..705130931e 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -190,7 +190,7 @@ static int32_t doMergeRowsInLastBlock(SLastBlockReader* pLastBlockReader, STabl static int32_t doMergeRowsInBuf(SIterInfo* pIter, uint64_t uid, int64_t ts, SArray* pDelList, SRowMerger* pMerger, STsdbReader* pReader); static int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow* pTSRow, - STableBlockScanInfo* pInfo); + STableBlockScanInfo* pScanInfo); static int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, SBlockData* pBlockData, int32_t rowIndex); static void setComposedBlockFlag(STsdbReader* pReader, bool composed); @@ -2482,6 +2482,8 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) { int32_t nextIndex = -1; SBlockIndex bIndex = {0}; + pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter); + bool hasNeighbor = getNeighborBlockOfSameTable(pBlockInfo, pBlockScanInfo, &nextIndex, pReader->order, &bIndex); if (!hasNeighbor) { // do nothing setBlockAllDumped(pDumpInfo, pBlock->maxKey.ts, pReader->order); From d5a770c98a7cebf4ef10afe38c6161399b57ae4f Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 21 Dec 2022 16:25:18 +0800 Subject: [PATCH 2/2] fix(query): add comment. --- source/dnode/vnode/src/tsdb/tsdbRead.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 705130931e..4aca1ea228 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -2482,7 +2482,7 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) { int32_t nextIndex = -1; SBlockIndex bIndex = {0}; - pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter); + pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter); // NOTE: get the new block info bool hasNeighbor = getNeighborBlockOfSameTable(pBlockInfo, pBlockScanInfo, &nextIndex, pReader->order, &bIndex); if (!hasNeighbor) { // do nothing