From 17a65430cda200c871086b4c25af4c48bbe52dde Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 22 Mar 2024 18:42:54 +0800 Subject: [PATCH] fix(tsdb): remove assert --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 5 +++++ source/dnode/vnode/src/tsdb/tsdbReadUtil.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index b05ce0680b..cda8330282 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -3101,6 +3101,7 @@ static void initBlockDumpInfo(STsdbReader* pReader, SDataBlockIter* pBlockIter) SFileBlockDumpInfo* pDumpInfo = &pStatus->fBlockDumpInfo; if (pBlockInfo) { + // todo handle // STableBlockScanInfo* pScanInfo = tSimpleHashGet(pBlockIter->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid)); // if (pScanInfo) { // tsdbRowKeyAssign(&pDumpInfo->lastKey, &pScanInfo->lastProcKey); @@ -4666,9 +4667,13 @@ int32_t tsdbNextDataBlock2(STsdbReader* pReader, bool* hasNext) { tsdbReleaseReader(pReader); } + tsdbReaderSuspend2(pReader); + tsdbReaderResume2(pReader); + return code; } + if (pReader->step == EXTERNAL_ROWS_MAIN && pReader->innerReader[1] != NULL) { // prepare for the next row scan int32_t step = -1; diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c index c7077a2e71..93bc5ca573 100644 --- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c @@ -229,8 +229,7 @@ void resetAllDataBlockScanInfo(SSHashObj* pTableMap, int64_t ts, int32_t step) { pInfo->delSkyline = taosArrayDestroy(pInfo->delSkyline); pInfo->lastProcKey.ts = ts; - ASSERT(0); - + // todo check the nextProcKey info pInfo->sttKeyInfo.nextProcKey = ts + step; } }