diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index bccbc0c34e8c9448df2a6c9033c71b80a2df8264..46f8d85d55e7daf85d69b4e43ba4b1fb894cd238 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 84873931d65203eaa21491116a2fd833a09243b0..0e03e6e5fb98d319d1bccf2e321f9b2335c03af4 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)) {