From 6010516f58e09853b2c73f819e6169d4dd72ad5b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 12 Nov 2021 13:35:10 +0800
Subject: [PATCH] refact

---
 source/dnode/vnode/impl/inc/vnodeBufferPool.h |  8 ++------
 source/dnode/vnode/meta/inc/metaDef.h         | 15 +++++++++------
 source/dnode/vnode/tsdb/inc/tsdbDef.h         |  6 +++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/source/dnode/vnode/impl/inc/vnodeBufferPool.h b/source/dnode/vnode/impl/inc/vnodeBufferPool.h
index 5c65b4f614..3033862779 100644
--- a/source/dnode/vnode/impl/inc/vnodeBufferPool.h
+++ b/source/dnode/vnode/impl/inc/vnodeBufferPool.h
@@ -25,12 +25,8 @@ extern "C" {
 
 typedef struct SVBufPool SVBufPool;
 
-int            vnodeOpenBufPool(SVnode *pVnode);
-void           vnodeCloseBufPool(SVnode *pVnode);
-SMemAllocator *vnodeCreateMemAllocator(SVnode *pVnode);
-void           vnodeDestroyMemAllocator(SMemAllocator *pma);
-void           vnodeRefMemAllocator(SMemAllocator *pma);
-void           vnodeUnrefMemAllocator(SMemAllocator *pma);
+int  vnodeOpenBufPool(SVnode *pVnode);
+void vnodeCloseBufPool(SVnode *pVnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/meta/inc/metaDef.h b/source/dnode/vnode/meta/inc/metaDef.h
index 562476a439..b0d31de1b4 100644
--- a/source/dnode/vnode/meta/inc/metaDef.h
+++ b/source/dnode/vnode/meta/inc/metaDef.h
@@ -16,6 +16,8 @@
 #ifndef _TD_META_DEF_H_
 #define _TD_META_DEF_H_
 
+#include "mallocator.h"
+
 #include "meta.h"
 #include "metaCache.h"
 #include "metaDB.h"
@@ -30,12 +32,13 @@ extern "C" {
 #endif
 
 struct SMeta {
-  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
+  char*                 path;
+  SMetaOptions          options;
+  meta_db_t*            pDB;
+  meta_index_t*         pIdx;
+  meta_cache_t*         pCache;
+  STbUidGenerator       uidGnrt;
+  SMemAllocatorFactory* pmaf;
 };
 
 #ifdef __cplusplus
diff --git a/source/dnode/vnode/tsdb/inc/tsdbDef.h b/source/dnode/vnode/tsdb/inc/tsdbDef.h
index 0a17387ba7..ca3d0319c1 100644
--- a/source/dnode/vnode/tsdb/inc/tsdbDef.h
+++ b/source/dnode/vnode/tsdb/inc/tsdbDef.h
@@ -27,9 +27,9 @@ extern "C" {
 #endif
 
 struct STsdb {
-  char *             path;
-  STsdbOptions       options;
-  STsdbMemAllocator *pTMA;
+  char *                path;
+  STsdbOptions          options;
+  SMemAllocatorFactory *pmaf;
 };
 
 #ifdef __cplusplus