From 8fbd3f49cabaeb0bda46bdc544b3a5c480919d9c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Nov 2021 17:54:55 +0800
Subject: [PATCH] refact

---
 source/dnode/vnode/meta/inc/metaCache.h |  4 ++++
 source/dnode/vnode/meta/inc/metaDB.h    |  4 ++++
 source/dnode/vnode/meta/inc/metaDef.h   | 17 +++++++++--------
 source/dnode/vnode/meta/inc/metaIdx.h   |  4 ++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/meta/inc/metaCache.h b/source/dnode/vnode/meta/inc/metaCache.h
index 60cedce29c..92c5a09c0c 100644
--- a/source/dnode/vnode/meta/inc/metaCache.h
+++ b/source/dnode/vnode/meta/inc/metaCache.h
@@ -16,12 +16,16 @@
 #ifndef _TD_META_CACHE_H_
 #define _TD_META_CACHE_H_
 
+#include "rocksdb/c.h"
+
 #include "meta.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef rocksdb_cache_t meta_cache_t;
+
 int  metaOpenCache(SMeta *pMeta);
 void metaCloseCache(SMeta *pMeta);
 
diff --git a/source/dnode/vnode/meta/inc/metaDB.h b/source/dnode/vnode/meta/inc/metaDB.h
index 2c075d751c..3381b05f22 100644
--- a/source/dnode/vnode/meta/inc/metaDB.h
+++ b/source/dnode/vnode/meta/inc/metaDB.h
@@ -16,12 +16,16 @@
 #ifndef _TD_META_DB_H_
 #define _TD_META_DB_H_
 
+#include "rocksdb/c.h"
+
 #include "meta.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef rocksdb_t meta_db_t;
+
 int  metaOpenDB(SMeta *pMeta);
 void metaCloseDB(SMeta *pMeta);
 
diff --git a/source/dnode/vnode/meta/inc/metaDef.h b/source/dnode/vnode/meta/inc/metaDef.h
index 395ca7c7bd..a81bd931e4 100644
--- a/source/dnode/vnode/meta/inc/metaDef.h
+++ b/source/dnode/vnode/meta/inc/metaDef.h
@@ -16,8 +16,9 @@
 #ifndef _TD_META_DEF_H_
 #define _TD_META_DEF_H_
 
-#include "rocksdb/c.h"
-
+#include "metaCache.h"
+#include "metaDB.h"
+#include "metaIdx.h"
 #include "metaTbUid.h"
 
 #ifdef __cplusplus
@@ -25,12 +26,12 @@ extern "C" {
 #endif
 
 struct SMeta {
-  char *           path;     // path of current meta
-  SMetaOptions     options;  // meta option
-  rocksdb_t *      pDB;
-  rocksdb_t *      pIdx;
-  rocksdb_cache_t *pCache;
-  STbUidGenerator  uidGnrt;  // meta table UID generator
+  char*           path;     // path of current meta
+  SMetaOptions    options;  // meta option
+  meta_db_t*      pDB;      // raw data db
+  meta_index_t*   pIdx;     // tag index
+  meta_cache_t*   pCache;   // LRU cache
+  STbUidGenerator uidGnrt;  // meta table UID generator
 };
 
 #ifdef __cplusplus
diff --git a/source/dnode/vnode/meta/inc/metaIdx.h b/source/dnode/vnode/meta/inc/metaIdx.h
index ed1f6ac94c..4a897228a9 100644
--- a/source/dnode/vnode/meta/inc/metaIdx.h
+++ b/source/dnode/vnode/meta/inc/metaIdx.h
@@ -16,12 +16,16 @@
 #ifndef _TD_META_IDX_H_
 #define _TD_META_IDX_H_
 
+#include "rocksdb/c.h"
+
 #include "meta.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef rocksdb_t meta_index_t;
+
 int  metaOpenIdx(SMeta *pMeta);
 void metaCloseIdx(SMeta *pMeta);