From 6d82900a32485abd50945d8322f3e929f0b3a541 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 4 Dec 2023 18:00:41 +0800 Subject: [PATCH] fix(tsdb): fix error in block dist. --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 08912e0ca2..46b1219a2c 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -4731,17 +4731,18 @@ int32_t tsdbGetFileBlocksDistInfo2(STsdbReader* pReader, STableBlockDistInfo* pT } } - SMergeTreeConf conf = { - .pReader = pReader, - .pSchema = pReader->info.pSchema, - .pCols = pReader->suppInfo.colId, - .numOfCols = pReader->suppInfo.numOfCols, - .suid = pReader->info.suid, - }; - SReaderStatus* pStatus = &pReader->status; - pTableBlockInfo->numOfSttRows += - tsdbGetRowsInSttFiles(pStatus->pCurrentFileset, pStatus->pLDataIterArray, pReader->pTsdb, &conf, pReader->idStr); + if (pStatus->pCurrentFileset != NULL) { + SMergeTreeConf conf = { + .pReader = pReader, + .pSchema = pReader->info.pSchema, + .pCols = pReader->suppInfo.colId, + .numOfCols = pReader->suppInfo.numOfCols, + .suid = pReader->info.suid, + }; + pTableBlockInfo->numOfSttRows += tsdbGetRowsInSttFiles(pStatus->pCurrentFileset, pStatus->pLDataIterArray, + pReader->pTsdb, &conf, pReader->idStr); + } STsdbCfg* pc = &pReader->pTsdb->pVnode->config.tsdbCfg; pTableBlockInfo->defMinRows = pc->minRows;