From ee5e3b7cc0b318f57508b0c0ed2b46cf9e4ba831 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 30 Jun 2023 00:38:53 +0800 Subject: [PATCH] fix(tsdb): fix error in tsdb2 --- source/dnode/vnode/src/tsdb/tsdbMergeTree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c index 45052628f9..f0debf5d71 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c +++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c @@ -196,11 +196,13 @@ static SBlockData *loadLastBlock(SLDataIter *pIter, const char *idStr) { } code = tBlockDataInit(pBlock, &id, pInfo->pSchema, pInfo->colIds, pInfo->numOfCols); +// code = tBlockDataInit(pBlock, &id, pInfo->pSchema, &pInfo->colIds[1], pInfo->numOfCols-1); if (code != TSDB_CODE_SUCCESS) { goto _exit; } - code = tsdbSttFileReadBlockDataByColumn(pIter->pReader, pIter->pSttBlk, pBlock, pInfo->pSchema, &pInfo->colIds[1], pInfo->numOfCols - 1); + code = tsdbSttFileReadBlockData(pIter->pReader, pIter->pSttBlk, pBlock); +// code = tsdbSttFileReadBlockDataByColumn(pIter->pReader, pIter->pSttBlk, pBlock, pInfo->pSchema, &pInfo->colIds[1], pInfo->numOfCols - 1); if (code != TSDB_CODE_SUCCESS) { goto _exit; }