refact

include/server/vnode/impl/vnodeImpl.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#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

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"

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" {

source/dnode/vnode/impl/inc/vnodeSync.h

@@ -20,6 +20,10 @@
 extern "C" {
 #endif
 
+typedef struct {
+  /* data */
+} SVnodeSync;
+
 #ifdef __cplusplus
 }
 #endif