From dbf7d01a849ac1cf7ac6eff1b2f803e3deae3908 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 27 Sep 2022 14:01:17 +0800 Subject: [PATCH] fix(query): set the correct uid. --- source/dnode/vnode/src/tsdb/tsdbMergeTree.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c index ab2fc22b4a..b8cd1d123f 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c +++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c @@ -115,7 +115,13 @@ static SBlockData* loadLastBlock(SLDataIter *pIter, const char* idStr) { int64_t st = taosGetTimestampUs(); SBlockData* pBlock = &pInfo->blockData[pInfo->currentLoadBlockIndex]; - TABLEID id = {.suid = pIter->pSttBlk->suid, .uid = 0}; + + TABLEID id = {0}; + if (pIter->pSttBlk->suid != 0) { + id.suid = pIter->pSttBlk->suid; + } else { + id.uid = pIter->uid; + } tBlockDataInit(pBlock, &id, pInfo->pSchema, pInfo->colIds, pInfo->numOfCols); code = tsdbReadSttBlock(pIter->pReader, pIter->iStt, pIter->pSttBlk, pBlock);