From 992480eb00d765518e1b673b89bc32fd377ec280 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Fri, 5 May 2023 10:22:59 +0800 Subject: [PATCH] cache/read: fix ltype calc --- source/dnode/vnode/src/tsdb/tsdbCache.c | 9 +++++++-- source/dnode/vnode/src/tsdb/tsdbCacheRead.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c index bccbc0c34e..46f8d85d55 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCache.c +++ b/source/dnode/vnode/src/tsdb/tsdbCache.c @@ -294,7 +294,7 @@ _exit: } int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsReader *pr, int32_t ltype) { - static char const *alstring[2] = {"last", "last_row"}; + static char const *alstring[2] = {"last_row", "last"}; char const *lstring = alstring[ltype]; int32_t code = 0; @@ -342,7 +342,12 @@ int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsR } } else { // recalc: load from tsdb - + if (ltype) { + SArray *pArray = NULL; + // mergeLastCid(uid, pTsdb, &pArray, pr, cid); + } else { + // mergeLastRowCid(uid, pTsdb, &pArray, pr, cid); + } // still null, then make up a null col value pLastCol = &noneCol; diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c index 84873931d6..0e03e6e5fb 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c @@ -285,7 +285,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32 pr->pDataFReader = NULL; pr->pDataFReaderLast = NULL; - int32_t ltype = pr->type & CACHESCAN_RETRIEVE_LAST >> 3; + int32_t ltype = (pr->type & CACHESCAN_RETRIEVE_LAST) >> 3; // retrieve the only one last row of all tables in the uid list. if (HASTYPE(pr->type, CACHESCAN_RETRIEVE_TYPE_SINGLE)) { -- GitLab