diff --git a/include/libs/executor/storageapi.h b/include/libs/executor/storageapi.h
index 9ed47c94f88e9d9a983656db3a56468bfadbd7e7..b89293f8f0a191b9124c3b3169d6c2ac2184a691 100644
--- a/include/libs/executor/storageapi.h
+++ b/include/libs/executor/storageapi.h
@@ -103,63 +103,6 @@ typedef struct SRowBuffPos {
   bool  beUsed;
 } SRowBuffPos;
 
-// int32_t tsdbReuseCacherowsReader(void* pReader, void* pTableIdList, int32_t numOfTables);
-// int32_t tsdbCacherowsReaderOpen(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
-//                                SArray *pCidList, int32_t *pSlotIds, uint64_t suid, void **pReader, const char *idstr);
-// int32_t tsdbRetrieveCacheRows(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, const int32_t *dstSlotIds,
-//                              SArray *pTableUids);
-// void   *tsdbCacherowsReaderClose(void *pReader);
-// int32_t tsdbGetTableSchema(void *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);
-
-// int32_t      tsdbReaderOpen(void *pVnode, SQueryTableDataCond *pCond, void *pTableList, int32_t numOfTables,
-//                            SSDataBlock *pResBlock, STsdbReader **ppReader, const char *idstr, bool countOnly, SHashObj** pIgnoreTables);
-// int32_t      tsdbSetTableList(STsdbReader *pReader, const void *pTableList, int32_t num);
-// void         tsdbReaderSetId(STsdbReader *pReader, const char *idstr);
-// void         tsdbReaderClose(STsdbReader *pReader);
-// int32_t      tsdbNextDataBlock(STsdbReader *pReader, bool *hasNext);
-// int32_t      tsdbRetrieveDatablockSMA(STsdbReader *pReader, SSDataBlock *pDataBlock, bool *allHave);
-// void         tsdbReleaseDataBlock(STsdbReader *pReader);
-// SSDataBlock *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
-// int32_t      tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
-// int32_t      tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
-// int64_t      tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
-// void        *tsdbGetIdx(void *pMeta);
-// void        *tsdbGetIvtIdx(void *pMeta);
-// uint64_t     tsdbGetReaderMaxVersion(STsdbReader *pReader);
-// void         tsdbReaderSetCloseFlag(STsdbReader *pReader);
-// int64_t      tsdbGetLastTimestamp(void* pVnode, void* pTableList, int32_t numOfTables, const char* pIdStr);
-
-// int32_t vnodeGetCtbIdList(void *pVnode, int64_t suid, SArray *list);
-// int32_t vnodeGetCtbIdListByFilter(void *pVnode, int64_t suid, SArray *list, bool (*filter)(void *arg), void *arg);
-// int32_t vnodeGetStbIdList(void *pVnode, int64_t suid, SArray *list);
-// void   *vnodeGetIdx(void *pVnode);
-// void   *vnodeGetIvtIdx(void *pVnode);
-
-// void        metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
-// void        metaReaderReleaseLock(SMetaReader *pReader);
-// void        metaReaderClear(SMetaReader *pReader);
-// int32_t     metaReaderGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
-// int32_t     metaReaderGetTableEntryByUidCache(SMetaReader *pReader, tb_uid_t uid);
-// int         metaGetTableEntryByName(SMetaReader *pReader, const char *name);
-// int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList);
-// int32_t     metaGetTableTagsByUids(SMeta *pMeta, int64_t suid, SArray *uidList);
-// const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
-// int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
-//
-// int      metaGetTableSzNameByUid(void *meta, uint64_t uid, char *tbName);
-// int      metaGetTableUidByName(void *meta, char *tbName, uint64_t *uid);
-// int      metaGetTableTypeByName(void *meta, char *tbName, ETableType *tbType);
-// bool     metaIsTableExist(SMeta *pMeta, tb_uid_t uid);
-// int32_t  metaGetCachedTableUidList(SMeta *pMeta, tb_uid_t suid, const uint8_t *key, int32_t keyLen, SArray *pList,
-//                                   bool *acquired);
-// int32_t  metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
-//                               int32_t payloadLen, double selectivityRatio);
-// int32_t  metaUidCacheClear(SMeta *pMeta, uint64_t suid);
-// tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name);
-// int32_t  metaGetCachedTbGroup(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
-// int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
-//                               int32_t payloadLen);
-
 // tq
 typedef struct SMetaTableInfo {
   int64_t         suid;
@@ -202,29 +145,10 @@ typedef struct {
 // int32_t        destroySnapContext(SSnapContext *ctx);
 
 /*-------------------------------------------------new api format---------------------------------------------------*/
-
-//  typedef int32_t       (*__store_reader_(STsdbReader *pReader, const void *pTableList, int32_t num);
-//  typedef void          (*tsdbReaderSetId(STsdbReader *pReader, const char *idstr);
-//  typedef void          (*tsdbReaderClose(STsdbReader *pReader);
-//  typedef int32_t       (*tsdbNextDataBlock(STsdbReader *pReader, bool *hasNext);
-//  typedef int32_t       (*tsdbRetrieveDatablockSMA(STsdbReader *pReader, SSDataBlock *pDataBlock, bool *allHave);
-//  typedef void          (*tsdbReleaseDataBlock(STsdbReader *pReader);
-//  typedef SSDataBlock * (*tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
-//  typedef int32_t       (*tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
-//  typedef int32_t       (*tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
-//  typedef int64_t       (*tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
-//  typedef void        * (*tsdbGetIdx(void *pMeta);
-//  typedef void        * (*tsdbGetIvtIdx(void *pMeta);
-//  typedef uint64_t      (*tsdbGetReaderMaxVersion(STsdbReader *pReader);
-//  typedef void          (*tsdbReaderSetCloseFlag(STsdbReader *pReader);
-//  typedef int64_t       (*tsdbGetLastTimestamp(void* pVnode, void* pTableList, int32_t numOfTables, const char* pIdStr);
-
-typedef int32_t (*__store_reader_open_fn_t)(void *pVnode, SQueryTableDataCond *pCond, void *pTableList,
-                                            int32_t numOfTables, SSDataBlock *pResBlock, void **ppReader,
-                                            const char *idstr, bool countOnly, SHashObj **pIgnoreTables);
-
 typedef struct TsdReader {
-  __store_reader_open_fn_t tsdReaderOpen;
+  int32_t (*tsdReaderOpen)(void* pVnode, SQueryTableDataCond* pCond, void* pTableList, int32_t numOfTables,
+                           SSDataBlock* pResBlock, void** ppReader, const char* idstr, bool countOnly,
+                           SHashObj** pIgnoreTables);
   void (*tsdReaderClose)();
   void (*tsdSetReaderTaskId)(void *pReader, const char *pId);
   int32_t (*tsdSetQueryTableList)();
@@ -241,22 +165,13 @@ typedef struct TsdReader {
   void (*tsdReaderNotifyClosing)();
 } TsdReader;
 
-
-/**
- * int32_t tsdbReuseCacherowsReader(void* pReader, void* pTableIdList, int32_t numOfTables);
-int32_t tsdbCacherowsReaderOpen(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
-                                SArray *pCidList, int32_t *pSlotIds, uint64_t suid, void **pReader, const char *idstr);
-int32_t tsdbRetrieveCacheRows(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, const int32_t *dstSlotIds,
-                              SArray *pTableUids);
-void   *tsdbCacherowsReaderClose(void *pReader);
- */
 typedef struct SStoreCacheReader {
-  int32_t (*openReader)(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
-                        SArray *pCidList, int32_t *pSlotIds, uint64_t suid, void **pReader, const char *idstr);
-  void *(*closeReader)(void *pReader);
-  int32_t (*retrieveRows)(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, const int32_t *dstSlotIds,
-                          SArray *pTableUidList);
-  int32_t (*reuseReader)(void *pReader, void *pTableIdList, int32_t numOfTables);
+  int32_t  (*openReader)(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
+                         SArray *pCidList, int32_t *pSlotIds, uint64_t suid, void **pReader, const char *idstr);
+  void    *(*closeReader)(void *pReader);
+  int32_t  (*retrieveRows)(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, const int32_t *dstSlotIds,
+                           SArray *pTableUidList);
+  int32_t  (*reuseReader)(void *pReader, void *pTableIdList, int32_t numOfTables);
 } SStoreCacheReader;
 
 /*------------------------------------------------------------------------------------------------------------------*/
@@ -309,16 +224,10 @@ typedef struct SStoreTqReader {
 } SStoreTqReader;
 
 typedef struct SStoreSnapshotFn {
-  /*
-  int32_t        getTableInfoFromSnapshot(SSnapContext *ctx, void **pBuf, int32_t *contLen, int16_t *type, int64_t *uid);
-  SMetaTableInfo getMetaTableInfoFromSnapshot(SSnapContext *ctx);
-  int32_t        setForSnapShot(SSnapContext *ctx, int64_t uid);
-  int32_t        destroySnapContext(SSnapContext *ctx);
-   */
-  int32_t (*createSnapshot)();
-  int32_t (*destroySnapshot)();
-  SMetaTableInfo (*getMetaTableInfoFromSnapshot)();
-  int32_t (*getTableInfoFromSnapshot)();
+  int32_t (*createSnapshot)(SSnapContext *ctx, int64_t uid);
+  int32_t (*destroySnapshot)(SSnapContext *ctx);
+  SMetaTableInfo (*getMetaTableInfoFromSnapshot)(SSnapContext* ctx);
+  int32_t (*getTableInfoFromSnapshot)(SSnapContext* ctx, void** pBuf, int32_t* contLen, int16_t* type, int64_t* uid);
 } SStoreSnapshotFn;
 
 /**
@@ -327,7 +236,6 @@ void        metaReaderReleaseLock(SMetaReader *pReader);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaReaderGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
 int32_t     metaReaderGetTableEntryByUidCache(SMetaReader *pReader, tb_uid_t uid);
-int         metaGetTableEntryByName(SMetaReader *pReader, const char *name);
 int32_t     metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList);
 const void *metaGetTableTagVal(void *tag, int16_t type, STagVal *tagVal);
 int         metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName);
@@ -340,7 +248,6 @@ int32_t  metaGetCachedTableUidList(SMeta *pMeta, tb_uid_t suid, const uint8_t *k
                                    bool *acquired);
 int32_t  metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
                                int32_t payloadLen, double selectivityRatio);
-int32_t  metaUidCacheClear(SMeta *pMeta, uint64_t suid);
 tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name);
 int32_t  metaGetCachedTbGroup(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
 int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
@@ -350,29 +257,28 @@ int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, in
 typedef struct SStoreMeta {
   SMTbCursor *(*openTableMetaCursor)(void *pVnode);   // metaOpenTbCursor
   void        (*closeTableMetaCursor)(SMTbCursor *pTbCur);  // metaCloseTbCursor
-  int32_t (*cursorNext)();                // metaTbCursorNext
-  int32_t (*cursorPrev)();                // metaTbCursorPrev
+  int32_t     (*cursorNext)(SMTbCursor *pTbCur, ETableType jumpTableType); // metaTbCursorNext
+  int32_t     (*cursorPrev)(SMTbCursor *pTbCur, ETableType jumpTableType); // metaTbCursorPrev
 
-  int32_t (*getTableTags)(void *pVnode, uint64_t suid, SArray *uidList);
-  int32_t (*getTableTagsByUid)(void *pVnode, int64_t suid, SArray *uidList);
+  int32_t     (*getTableTags)(void *pVnode, uint64_t suid, SArray *uidList);
+  int32_t     (*getTableTagsByUid)(void *pVnode, int64_t suid, SArray *uidList);
   const void *(*extractTagVal)(const void *tag, int16_t type, STagVal *tagVal);  // todo remove it
 
-  int32_t (*getTableUidByName)(void *pVnode, char *tbName, uint64_t *uid);
-  int32_t (*getTableTypeByName)(void *pVnode, char *tbName, ETableType *tbType);
-  int32_t (*getTableNameByUid)(void *pVnode, uint64_t uid, char *tbName);
-  bool (*isTableExisted)(void *pVnode, tb_uid_t uid);
+  int32_t     (*getTableUidByName)(void *pVnode, char *tbName, uint64_t *uid);
+  int32_t     (*getTableTypeByName)(void *pVnode, char *tbName, ETableType *tbType);
+  int32_t     (*getTableNameByUid)(void *pVnode, uint64_t uid, char *tbName);
+  bool        (*isTableExisted)(void *pVnode, tb_uid_t uid);
 
   /**
-   * int32_t  metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
-                               int32_t payloadLen, double selectivityRatio);
-int32_t  metaUidCacheClear(SMeta *pMeta, uint64_t suid);
-tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name);
 int32_t  metaGetCachedTbGroup(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
 int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
                                int32_t payloadLen);
    */
-  void (*getCachedTableList)();
-  void (*putTableListIntoCache)();
+  int32_t (*getCachedTableList)(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1,
+                                bool* acquireRes);
+  int32_t (*putCachedTableList)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
+                                int32_t payloadLen, double selectivityRatio);
+//  int32_t (*clearCachedTableList)(void* pVnode, uint64_t suid);
 
   /**
    *
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 72c8dce52fa19620aec6017b6bf5fc2c91a6e001..af9229145665a8495bf3f801b838a77074b609c7 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -100,18 +100,11 @@ void    vnodeApplyWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs
 void    vnodeProposeCommitOnNeed(SVnode *pVnode, bool atExit);
 
 // meta
-typedef struct SMeta       SMeta;  // todo: remove
-typedef struct SMetaReader SMetaReader;
-typedef struct SMetaEntry  SMetaEntry;
-
-#define META_READER_NOLOCK 0x1
-
 void        _metaReaderInit(SMetaReader *pReader, void *pVnode, int32_t flags, SStoreMeta* pAPI);
 void        metaReaderReleaseLock(SMetaReader *pReader);
 void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaReaderGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
 int32_t     metaReaderGetTableEntryByUidCache(SMetaReader *pReader, tb_uid_t uid);
-int         metaGetTableEntryByName(SMetaReader *pReader, const char *name);
 int32_t     metaGetTableTags(void *pVnode, uint64_t suid, SArray *uidList);
 int32_t     metaGetTableTagsByUids(void* pVnode, int64_t suid, SArray *uidList);
 int32_t     metaReadNext(SMetaReader *pReader);
@@ -122,11 +115,10 @@ int      metaGetTableSzNameByUid(void *meta, uint64_t uid, char *tbName);
 int      metaGetTableUidByName(void *pVnode, char *tbName, uint64_t *uid);
 int      metaGetTableTypeByName(void *meta, char *tbName, ETableType *tbType);
 bool     metaIsTableExist(void* pVnode, tb_uid_t uid);
-int32_t  metaGetCachedTableUidList(SMeta *pMeta, tb_uid_t suid, const uint8_t *key, int32_t keyLen, SArray *pList,
+int32_t  metaGetCachedTableUidList(void *pVnode, tb_uid_t suid, const uint8_t *key, int32_t keyLen, SArray *pList,
                                    bool *acquired);
-int32_t  metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
+int32_t  metaUidFilterCachePut(void *pVnode, uint64_t suid, const void *pKey, int32_t keyLen, void *pPayload,
                                int32_t payloadLen, double selectivityRatio);
-int32_t  metaUidCacheClear(SMeta *pMeta, uint64_t suid);
 tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name);
 int32_t  metaTbGroupCacheClear(SMeta *pMeta, uint64_t suid);
 int32_t  metaGetCachedTbGroup(SMeta *pMeta, tb_uid_t suid, const uint8_t *pKey, int32_t keyLen, SArray **pList);
@@ -135,24 +127,8 @@ int32_t  metaPutTbGroupToCache(SMeta *pMeta, uint64_t suid, const void *pKey, in
 
 int64_t  metaGetTbNum(SMeta *pMeta);
 int64_t  metaGetNtbNum(SMeta *pMeta);
-//typedef struct {
-//  int64_t uid;
-//  int64_t ctbNum;
-//} SMetaStbStats;
-int32_t metaGetStbStats(void *pVnode, int64_t uid, int64_t *numOfTables);
-
-#if 1  // refact APIs below (TODO)
-typedef SVCreateTbReq   STbCfg;
-typedef SVCreateTSmaReq SSmaCfg;
-
-typedef struct SMTbCursor SMTbCursor;
 
-SMTbCursor *metaOpenTbCursor(void *pVnode);
-void        metaCloseTbCursor(SMTbCursor *pTbCur);
-int32_t     metaTbCursorNext(SMTbCursor *pTbCur, ETableType jumpTableType);
-int32_t     metaTbCursorPrev(SMTbCursor *pTbCur, ETableType jumpTableType);
-
-#endif
+int32_t metaGetStbStats(void *pVnode, int64_t uid, int64_t *numOfTables);
 
 // tsdb
 typedef struct STsdbReader STsdbReader;
@@ -168,8 +144,8 @@ typedef struct STsdbReader STsdbReader;
 #define CACHESCAN_RETRIEVE_LAST_ROW    0x4
 #define CACHESCAN_RETRIEVE_LAST        0x8
 
-int32_t      tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, void *pTableList, int32_t numOfTables,
-                            SSDataBlock *pResBlock, STsdbReader **ppReader, const char *idstr, bool countOnly,
+int32_t      tsdbReaderOpen(void *pVnode, SQueryTableDataCond *pCond, void *pTableList, int32_t numOfTables,
+                            SSDataBlock *pResBlock, void **ppReader, const char *idstr, bool countOnly,
                             SHashObj **pIgnoreTables);
 int32_t      tsdbSetTableList(STsdbReader *pReader, const void *pTableList, int32_t num);
 void         tsdbReaderSetId(STsdbReader *pReader, const char *idstr);
@@ -201,32 +177,11 @@ size_t  tsdbCacheGetUsage(SVnode *pVnode);
 int32_t tsdbCacheGetElems(SVnode *pVnode);
 
 //// tq
-//typedef struct SMetaTableInfo {
-//  int64_t         suid;
-//  int64_t         uid;
-//  SSchemaWrapper *schema;
-//  char            tbName[TSDB_TABLE_NAME_LEN];
-//} SMetaTableInfo;
-
 typedef struct SIdInfo {
   int64_t version;
   int32_t index;
 } SIdInfo;
 
-//typedef struct SSnapContext {
-//  SMeta    *pMeta;
-//  int64_t   snapVersion;
-//  TBC      *pCur;
-//  int64_t   suid;
-//  int8_t    subType;
-//  SHashObj *idVersion;
-//  SHashObj *suidInfo;
-//  SArray   *idList;
-//  int32_t   index;
-//  bool      withMeta;
-//  bool      queryMeta;  // true-get meta, false-get data
-//} SSnapContext;
-
 typedef struct STqReader {
   SPackedData     msg;
   SSubmitReq2     submit;
@@ -345,59 +300,6 @@ struct SVnodeCfg {
 #define TABLE_ROLLUP_ON       ((int8_t)0x1)
 #define TABLE_IS_ROLLUP(FLG)  (((FLG) & (TABLE_ROLLUP_ON)) != 0)
 #define TABLE_SET_ROLLUP(FLG) ((FLG) |= TABLE_ROLLUP_ON)
-//struct SMetaEntry {
-//  int64_t  version;
-//  int8_t   type;
-//  int8_t   flags;  // TODO: need refactor?
-//  tb_uid_t uid;
-//  char    *name;
-//  union {
-//    struct {
-//      SSchemaWrapper schemaRow;
-//      SSchemaWrapper schemaTag;
-//      SRSmaParam     rsmaParam;
-//    } stbEntry;
-//    struct {
-//      int64_t  ctime;
-//      int32_t  ttlDays;
-//      int32_t  commentLen;
-//      char    *comment;
-//      tb_uid_t suid;
-//      uint8_t *pTags;
-//    } ctbEntry;
-//    struct {
-//      int64_t        ctime;
-//      int32_t        ttlDays;
-//      int32_t        commentLen;
-//      char          *comment;
-//      int32_t        ncid;  // next column id
-//      SSchemaWrapper schemaRow;
-//    } ntbEntry;
-//    struct {
-//      STSma *tsma;
-//    } smaEntry;
-//  };
-//
-//  uint8_t *pBuf;
-//};
-
-//struct SMetaReader {
-//  int32_t    flags;
-//  SMeta     *pMeta;
-//  SDecoder   coder;
-//  SMetaEntry me;
-//  void      *pBuf;
-//  int32_t    szBuf;
-//};
-
-//struct SMTbCursor {
-//  TBC        *pDbc;
-//  void       *pKey;
-//  void       *pVal;
-//  int32_t     kLen;
-//  int32_t     vLen;
-//  SMetaReader mr;
-//};
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 3f79fe5fd1f98e8912adc5dffbd707c20bf928c5..7ae05b95546c1c90c365014ed24399c23e6e9b82 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -103,6 +103,17 @@ struct SQueryNode {
   _query_reseek_func_t reseek;
 };
 
+#if 1  // refact APIs below (TODO)
+typedef SVCreateTbReq   STbCfg;
+typedef SVCreateTSmaReq SSmaCfg;
+
+SMTbCursor *metaOpenTbCursor(void *pVnode);
+void        metaCloseTbCursor(SMTbCursor *pTbCur);
+int32_t     metaTbCursorNext(SMTbCursor *pTbCur, ETableType jumpTableType);
+int32_t     metaTbCursorPrev(SMTbCursor *pTbCur, ETableType jumpTableType);
+
+#endif
+
 void* vnodeBufPoolMalloc(SVBufPool* pPool, int size);
 void* vnodeBufPoolMallocAligned(SVBufPool* pPool, int size);
 void  vnodeBufPoolFree(SVBufPool* pPool, void* p);
@@ -143,6 +154,8 @@ int32_t         metaGetTbTSchemaEx(SMeta* pMeta, tb_uid_t suid, tb_uid_t uid, in
 int             metaGetTableEntryByName(SMetaReader* pReader, const char* name);
 int             metaAlterCache(SMeta* pMeta, int32_t nPage);
 
+int32_t         metaUidCacheClear(SMeta* pMeta, uint64_t suid);
+
 int metaAddIndexToSTable(SMeta* pMeta, int64_t version, SVCreateStbReq* pReq);
 int metaDropIndexFromSTable(SMeta* pMeta, int64_t version, SDropIndexReq* pReq);
 
@@ -477,6 +490,7 @@ struct SCompactInfo {
 
 void initStorageAPI(SStorageAPI* pAPI);
 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/meta/metaCache.c b/source/dnode/vnode/src/meta/metaCache.c
index 436ca1abd3c7939488796b536c28aed03029da80..054b9f6f240b7d8f95e2bb0380b59e9577f1f553 100644
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
@@ -499,8 +499,9 @@ static void initCacheKey(uint64_t* buf, const SHashObj* pHashMap, uint64_t suid,
   ASSERT(keyLen == sizeof(uint64_t) * 2);
 }
 
-int32_t metaGetCachedTableUidList(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1,
+int32_t metaGetCachedTableUidList(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1,
                                   bool* acquireRes) {
+  SMeta* pMeta = ((SVnode*)pVnode)->pMeta;
   int32_t vgId = TD_VID(pMeta->pVnode);
 
   // generate the composed key for LRU cache
@@ -603,9 +604,10 @@ static int32_t addNewEntry(SHashObj* pTableEntry, const void* pKey, int32_t keyL
 }
 
 // check both the payload size and selectivity ratio
-int32_t metaUidFilterCachePut(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
+int32_t metaUidFilterCachePut(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
                               int32_t payloadLen, double selectivityRatio) {
   int32_t code = 0;
+  SMeta* pMeta = ((SVnode*)pVnode)->pMeta;
   int32_t vgId = TD_VID(pMeta->pVnode);
 
   if (selectivityRatio > tsSelectivityRatio) {
diff --git a/source/dnode/vnode/src/meta/metaSma.c b/source/dnode/vnode/src/meta/metaSma.c
index 3fb491848a2e75f260e83356fa1ebd0c9ebb614c..a49848f4421e1c0e103d2d083713582574aee609 100644
--- a/source/dnode/vnode/src/meta/metaSma.c
+++ b/source/dnode/vnode/src/meta/metaSma.c
@@ -13,8 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "vnodeInt.h"
 #include "meta.h"
 
+
 static int metaHandleSmaEntry(SMeta *pMeta, const SMetaEntry *pME);
 static int metaSaveSmaToDB(SMeta *pMeta, const SMetaEntry *pME);
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 268d17bacbecdfeccea4cdd2524beef913aad8d1..362934ec848fc70b212c2271faa21024a900ec1a 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -754,7 +754,7 @@ static int32_t initResBlockInfo(SResultBlockInfo* pResBlockInfo, int64_t capacit
   return terrno;
 }
 
-static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsdbReader** ppReader, int32_t capacity,
+static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, void** ppReader, int32_t capacity,
                                 SSDataBlock* pResBlock, const char* idstr) {
   int32_t      code = 0;
   int8_t       level = 0;
@@ -4396,11 +4396,12 @@ static void freeSchemaFunc(void* param) {
 }
 
 // ====================================== EXPOSED APIs ======================================
-int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableList, int32_t numOfTables,
-                       SSDataBlock* pResBlock, STsdbReader** ppReader, const char* idstr, bool countOnly, SHashObj** pIgnoreTables) {
+int32_t tsdbReaderOpen(void* pVnode, SQueryTableDataCond* pCond, void* pTableList, int32_t numOfTables,
+                       SSDataBlock* pResBlock, void** ppReader, const char* idstr, bool countOnly, SHashObj** pIgnoreTables) {
   STimeWindow window = pCond->twindows;
+  SVnodeCfg* pConf = &(((SVnode*)pVnode)->config);
 
-  int32_t capacity = pVnode->config.tsdbCfg.maxRows;
+  int32_t capacity = pConf->tsdbCfg.maxRows;
   if (pResBlock != NULL) {
     blockDataEnsureCapacity(pResBlock, capacity);
   }
@@ -4431,7 +4432,7 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableL
     }
 
     // here we only need one more row, so the capacity is set to be ONE.
-    code = tsdbReaderCreate(pVnode, pCond, &pReader->innerReader[0], 1, pResBlock, idstr);
+    code = tsdbReaderCreate(pVnode, pCond, (void**)&((STsdbReader*)pReader)->innerReader[0], 1, pResBlock, idstr);
     if (code != TSDB_CODE_SUCCESS) {
       goto _err;
     }
@@ -4445,7 +4446,7 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableL
     }
     pCond->order = order;
 
-    code = tsdbReaderCreate(pVnode, pCond, &pReader->innerReader[1], 1, pResBlock, idstr);
+    code = tsdbReaderCreate(pVnode, pCond, (void**)&((STsdbReader*)pReader)->innerReader[1], 1, pResBlock, idstr);
     if (code != TSDB_CODE_SUCCESS) {
       goto _err;
     }
@@ -4495,7 +4496,7 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableL
     goto _err;
   }
 
-  pReader->status.pLDataIter = taosMemoryCalloc(pVnode->config.sttTrigger, sizeof(SLDataIter));
+  pReader->status.pLDataIter = taosMemoryCalloc(pConf->sttTrigger, sizeof(SLDataIter));
   if (pReader->status.pLDataIter == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
@@ -5546,7 +5547,7 @@ int64_t tsdbGetLastTimestamp(SVnode* pVnode, void* pTableList, int32_t numOfTabl
   int64_t key = INT64_MIN;
 
   for(int32_t i = 0; i < numOfTables; ++i) {
-    int32_t code = tsdbReaderOpen(pVnode, &cond, &pTableKeyInfo[i], 1, pBlock, &pReader, pIdStr, false, NULL);
+    int32_t code = tsdbReaderOpen(pVnode, &cond, &pTableKeyInfo[i], 1, pBlock, (void**)&pReader, pIdStr, false, NULL);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
diff --git a/source/dnode/vnode/src/vnd/vnodeInitApi.c b/source/dnode/vnode/src/vnd/vnodeInitApi.c
index 1cc985f7dfac86357c1648bf90ebe2c2f0ee2a7b..7ca93df39e6c3c89b61a083c69e19afdbfcd9287 100644
--- a/source/dnode/vnode/src/vnd/vnodeInitApi.c
+++ b/source/dnode/vnode/src/vnd/vnodeInitApi.c
@@ -41,7 +41,8 @@ void initStorageAPI(SStorageAPI* pAPI) {
 }
 
 void initTsdbReaderAPI(TsdReader* pReader) {
-  pReader->tsdReaderOpen = (__store_reader_open_fn_t)tsdbReaderOpen;
+  pReader->tsdReaderOpen = (int32_t(*)(void*, SQueryTableDataCond*, void*, int32_t, SSDataBlock*, void**, const char*,
+                                       bool, SHashObj**))tsdbReaderOpen;
   pReader->tsdReaderClose = tsdbReaderClose;
 
   pReader->tsdNextDataBlock = tsdbNextDataBlock;
@@ -87,6 +88,9 @@ void initMetadataAPI(SStoreMeta* pMeta) {
 
   pMeta->getTableSchema = tsdbGetTableSchema;   // todo refactor
   pMeta->storeGetTableList = vnodeGetTableList;
+
+  pMeta->getCachedTableList = metaGetCachedTableUidList;
+  pMeta->putCachedTableList = metaUidFilterCachePut;
 }
 
 void initTqAPI(SStoreTqReader* pTq) {
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 562a6daf8ac2094a952fa618bafc1734183d413e..f51527b9445f7c3d1b100fc01154414c7cb51a93 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -494,8 +494,8 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
     listNode->pNodeList = group;
     genTbGroupDigest((SNode*)listNode, digest, &context);
     nodesFree(listNode);
-
-    pAPI->metaFn.getCachedTableList(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest), &tableList);
+    ASSERT(0);
+//    pAPI->metaFn.getCachedTableList(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest), &tableList, true);
     if (tableList) {
       taosArrayDestroy(pTableListInfo->pTableList);
       pTableListInfo->pTableList = tableList;
@@ -630,9 +630,10 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
     info->groupId = calcGroupId(keyBuf, len);
   }
 
+  ASSERT(0);
   if (tsTagFilterCache) {
     tableList = taosArrayDup(pTableListInfo->pTableList, NULL);
-    pAPI->metaFn.putTableListIntoCache(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest), tableList, taosArrayGetSize(tableList) * sizeof(STableKeyInfo));
+//    pAPI->metaFn.putCachedTableList(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest), tableList, taosArrayGetSize(tableList) * sizeof(STableKeyInfo));
   }
 
   //  int64_t st2 = taosGetTimestampUs();