From 5528c2bf67d2a683844cf9ba37900e23624974cc Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 8 Dec 2023 23:47:49 +0800 Subject: [PATCH] fix(tsdb): do some internal refactor. --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 1ca42f4578..347672ee53 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -2708,19 +2708,22 @@ static int32_t doLoadSttBlockSequentially(STsdbReader* pReader) { bool asc = ASCENDING_TRAVERSE(pReader->info.order); SDataBlockInfo* pInfo = &pResBlock->info; + blockDataEnsureCapacity(pResBlock, pInfo->rows); + pInfo->rows = pScanInfo->numOfRowsInStt; pInfo->id.uid = pScanInfo->uid; pInfo->dataLoad = 1; pInfo->window = pScanInfo->sttWindow; - blockDataEnsureCapacity(pResBlock, pInfo->rows); setComposedBlockFlag(pReader, true); + pScanInfo->sttKeyInfo.nextProcKey = asc ? pScanInfo->sttWindow.ekey + 1 : pScanInfo->sttWindow.skey - 1; pScanInfo->sttKeyInfo.status = STT_FILE_NO_DATA; pScanInfo->lastProcKey = asc ? pScanInfo->sttWindow.ekey : pScanInfo->sttWindow.skey; - pSttBlockReader->mergeTree.pIter = NULL; pScanInfo->sttBlockReturned = true; + pSttBlockReader->mergeTree.pIter = NULL; + tsdbDebug("%p uid:%" PRId64 " return clean stt block as one, brange:%" PRId64 "-%" PRId64 " rows:%" PRId64 " %s", pReader, pResBlock->info.id.uid, pResBlock->info.window.skey, pResBlock->info.window.ekey, pResBlock->info.rows, pReader->idStr);