diff --git a/include/server/vnode/impl/vnodeImpl.h b/include/server/vnode/impl/vnodeImpl.h deleted file mode 100644 index 1b09361bc9c44ed8283e8e5753c20b2d84331b90..0000000000000000000000000000000000000000 --- a/include/server/vnode/impl/vnodeImpl.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2019 TAOS Data, Inc. - * - * This program is free software: you can use, redistribute, and/or modify - * it under the terms of the GNU Affero General Public License, version 3 - * or later ("AGPL"), as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#ifndef _TD_VNODE_IMPL_H_ -#define _TD_VNODE_IMPL_H_ - -#include "os.h" -#include "trequest.h" - -#include "meta.h" -#include "tq.h" -#include "tsdb.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct SVnodeOptions { - size_t wsize; - STsdbOptions tsdbOptions; - SMetaOptions metaOptions; - // STqOptions tqOptions; // TODO -}; - -#ifdef __cplusplus -} -#endif - -#endif /*_TD_VNODE_IMPL_H_*/ \ No newline at end of file diff --git a/include/server/vnode/vnode.h b/include/server/vnode/vnode.h index 2b678751f6c620bad7d95e3a4a14b71e68d13009..44f8ffdc66057de3d2bc96c12d9ce03e24518aad 100644 --- a/include/server/vnode/vnode.h +++ b/include/server/vnode/vnode.h @@ -16,7 +16,12 @@ #ifndef _TD_VNODE_H_ #define _TD_VNODE_H_ -#include "impl/vnodeImpl.h" +#include "os.h" +#include "trequest.h" + +#include "meta.h" +#include "tq.h" +#include "tsdb.h" #ifdef __cplusplus extern "C" { @@ -39,6 +44,14 @@ int vnodeProcessSyncReq(SVnode *pVnode, SRequest *pReq); void vnodeOptionsInit(SVnodeOptions *); void vnodeOptionsClear(SVnodeOptions *); +/* ------------------------ STRUCT DEFINITIONS ------------------------ */ +struct SVnodeOptions { + size_t wsize; + STsdbOptions tsdbOptions; + SMetaOptions metaOptions; + // STqOptions tqOptions; // TODO +}; + #if 1 #include "taosmsg.h" diff --git a/source/dnode/vnode/impl/inc/vnodeDef.h b/source/dnode/vnode/impl/inc/vnodeDef.h index 3443c072d760570f83609887e5a5fccc1c6b002d..07a65ae4c09cafb433605347d6c2fc517e7bbe95 100644 --- a/source/dnode/vnode/impl/inc/vnodeDef.h +++ b/source/dnode/vnode/impl/inc/vnodeDef.h @@ -23,6 +23,7 @@ #include "vnodeCommit.h" #include "vnodeOptions.h" #include "vnodeStateMgr.h" +#include "vnodeSync.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/impl/inc/vnodeSync.h b/source/dnode/vnode/impl/inc/vnodeSync.h index 7831c8ca8044604807111325cf0fd74c79e4a271..712958bf564104f20f0e837a9ebd9812a2812883 100644 --- a/source/dnode/vnode/impl/inc/vnodeSync.h +++ b/source/dnode/vnode/impl/inc/vnodeSync.h @@ -20,6 +20,10 @@ extern "C" { #endif +typedef struct { + /* data */ +} SVnodeSync; + #ifdef __cplusplus } #endif