diff --git a/include/server/vnode/vnode.h b/include/server/vnode/vnode.h index 44f8ffdc66057de3d2bc96c12d9ce03e24518aad..58894ca9570a2c2b7dc63315d660bdf91dd16cfb 100644 --- a/include/server/vnode/vnode.h +++ b/include/server/vnode/vnode.h @@ -52,6 +52,8 @@ struct SVnodeOptions { // STqOptions tqOptions; // TODO }; +/* ------------------------ FOR COMPILE ------------------------ */ + #if 1 #include "taosmsg.h" diff --git a/source/dnode/vnode/impl/inc/vnodeAllocatorPool.h b/source/dnode/vnode/impl/inc/vnodeAllocatorPool.h index 66790f8bb5949133759d253bd8fd2d864007f242..9fe4cbefca22ca00f34b12fcf6d9b0c4f1b92e23 100644 --- a/source/dnode/vnode/impl/inc/vnodeAllocatorPool.h +++ b/source/dnode/vnode/impl/inc/vnodeAllocatorPool.h @@ -17,7 +17,6 @@ #define _TD_VNODE_ALLOCATOR_POOL_H_ #include "vnode.h" -#include "vnodeMemAllocator.h" #ifdef __cplusplus extern "C" { @@ -26,7 +25,7 @@ extern "C" { typedef struct { int nexta; int enda; - SVMemAllocator allocators[3]; + SMemAllocator *allocators[3]; } SVAllocatorPool; int vnodeOpenAllocatorPool(SVnode *pVnode); diff --git a/source/dnode/vnode/impl/inc/vnodeMemAllocator.h b/source/dnode/vnode/impl/inc/vnodeMemAllocator.h index 784c70dd68c4cce0b998a2ba3acfc138be7e5e6f..7e9bd21fe3231a9414318019be2510849e7cd672 100644 --- a/source/dnode/vnode/impl/inc/vnodeMemAllocator.h +++ b/source/dnode/vnode/impl/inc/vnodeMemAllocator.h @@ -20,9 +20,6 @@ extern "C" { #endif -typedef struct { -} SVMemAllocator; - #ifdef __cplusplus } #endif diff --git a/source/dnode/vnode/impl/inc/vnodeSync.h b/source/dnode/vnode/impl/inc/vnodeSync.h index 712958bf564104f20f0e837a9ebd9812a2812883..a3eb004dfa7e1f948285dd306ae290927a525e7d 100644 --- a/source/dnode/vnode/impl/inc/vnodeSync.h +++ b/source/dnode/vnode/impl/inc/vnodeSync.h @@ -16,6 +16,8 @@ #ifndef _TD_VNODE_SYNC_H_ #define _TD_VNODE_SYNC_H_ +#include "sync.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/source/dnode/vnode/impl/src/vnodeAllocatorPool.c b/source/dnode/vnode/impl/src/vnodeAllocatorPool.c index 82dad85add3657cfdff87aa98c27763ff4395162..b5617210a04746721de582827374aea6f6912e46 100644 --- a/source/dnode/vnode/impl/src/vnodeAllocatorPool.c +++ b/source/dnode/vnode/impl/src/vnodeAllocatorPool.c @@ -21,5 +21,17 @@ int vnodeOpenAllocatorPool(SVnode *pVnode) { } void vnodeCloseAllocatorPool(SVnode *pVnode) { - // TODO + if (pVnode->pool) { + } +} + +/* ------------------------ STATIC METHODS ------------------------ */ +static SVAllocatorPool *vapCreate() { + SVAllocatorPool *pPool = NULL; + /* TODO */ + return pPool; +} + +static void vapDestroy() { + // TODO } \ No newline at end of file