From 6261359efed47de664265f62607cce8280b3c42a Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 21 Jun 2023 14:46:35 +0800 Subject: [PATCH] fix(tsdb): reset the stt reader for new files. --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index c976af7ec6..cafa232462 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -595,6 +595,8 @@ static int32_t filesetIteratorNext(SFilesetIter* pIter, STsdbReader* pReader, bo pIter->pLastBlockReader->uid = 0; tMergeTreeClose(&pIter->pLastBlockReader->mergeTree); + destroySttBlockReader(pReader->status.pLDataIter, pReader->pTsdb->pVnode->config.sttTrigger); + resetLastBlockLoadInfo(pIter->pLastBlockReader->pInfo); // check file the time range of coverage @@ -1019,9 +1021,8 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN } { - while (record.uid > uid) { + while (record.uid > uid && (k + 1) < numOfTables) { k += 1; - uid = pReader->status.uidList.tableUidList[k]; pScanInfo = getTableBlockScanInfo(pReader->status.pTableMap, uid, pReader->idStr); @@ -1032,6 +1033,10 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN } } + if (k >= numOfTables) { + break; + } + if (record.uid < uid) { continue; }