From 0e76449170f84914343fc0f2876e2dff1e492943 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Fri, 17 Sep 2021 10:21:54 +0800 Subject: [PATCH] update --- src/tsdb/src/tsdbReadImpl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/tsdb/src/tsdbReadImpl.c b/src/tsdb/src/tsdbReadImpl.c index 7ba415eea4..fcda6dcf26 100644 --- a/src/tsdb/src/tsdbReadImpl.c +++ b/src/tsdb/src/tsdbReadImpl.c @@ -449,7 +449,7 @@ static int tsdbLoadBlockStatisFromDFile(SReadH *pReadh, SBlock *pBlock) { } static int tsdbLoadBlockStatisFromAggr(SReadH *pReadh, SBlock *pBlock) { - ASSERT((pBlock->blkVer > TSDB_SBLK_VER_0) && pBlock->hasAggr); // TODO: remove after pass all the test + ASSERT((pBlock->blkVer > TSDB_SBLK_VER_0) && (pBlock->hasAggr)); // TODO: remove after pass all the test SDFile *pDFileAggr = TSDB_READ_AGGR_FILE(pReadh); if (tsdbSeekDFile(pDFileAggr, pBlock->aggrOffset, SEEK_SET) < 0) { @@ -502,12 +502,7 @@ int tsdbLoadBlockStatis(SReadH *pReadh, SBlock *pBlock) { int tsdbLoadBlockOffset(SReadH *pReadh, SBlock *pBlock) { ASSERT(pBlock->numOfSubBlocks <= 1); - - if (pBlock->blkVer > TSDB_SBLK_VER_0) { - return tsdbLoadBlockStatisFromDFile(pReadh, pBlock); - } - - return 0; + return tsdbLoadBlockStatisFromDFile(pReadh, pBlock); } int tsdbEncodeSBlockIdx(void **buf, SBlockIdx *pIdx) { -- GitLab