start vnode refact

source/dnode/CMakeLists.txt

@@ -3,4 +3,5 @@ add_subdirectory(vnode)
 add_subdirectory(qnode)
 add_subdirectory(snode)
 add_subdirectory(bnode)
-add_subdirectory(mgmt)
\ No newline at end of file
+add_subdirectory(mgmt)
+add_subdirectory(vnode2)
\ No newline at end of file

source/dnode/vnode2/CMakeLists.txt

+# vnode
+add_library(vnode2 "")
+target_sources(
+    vnode2
+    PRIVATE
+    # vnode
+    "src/vnode/vnodeMain.c"
+)
+
+target_include_directories(
+    vnode2
+    PUBLIC "inc"
+    PRIVATE "src/inc"
+)
+
+target_link_libraries(
+    vnode2
+    os
+)
+

source/dnode/vnode2/inc/vnode.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_H_
+#define _TD_VNODE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SVnode SVnode;
+
+typedef struct {
+} SVnodeCfg;
+
+int vnodeOpen(const char *path, const SVnodeCfg *pCfg, SVnode **ppVnode);
+int vnodeClose(SVnode *pVnode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_VNODE_H_*/
\ No newline at end of file

source/dnode/vnode2/src/inc/vnodeInt.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_INT_H_
+#define _TD_VNODE_INT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+
+#include "vnode.h"
+
+typedef int8_t   i8;
+typedef int16_t  i16;
+typedef int32_t  i32;
+typedef int64_t  i64;
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef struct SMeta SMeta;
+typedef struct STsdb STsdb;
+typedef struct STQ   STQ;
+
+struct SVnode {
+  i32    vid;
+  char  *path;
+  SMeta *pMeta;
+  STsdb *pTsdb;
+  STQ   *pTq;
+};
+
+#include "vnodeMeta.h"
+
+#include "vnodeTsdb.h"
+
+#include "vnodeTq.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_VNODE_INT_H_*/
\ No newline at end of file

source/dnode/vnode2/src/inc/vnodeMeta.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_META_H_
+#define _TD_VNODE_META_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_VNODE_META_H_*/
\ No newline at end of file

source/dnode/vnode2/src/inc/vnodeTq.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_TQ_H_
+#define _TD_VNODE_TQ_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_VNODE_TQ_H_*/
\ No newline at end of file

source/dnode/vnode2/src/inc/vnodeTsdb.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_TSDB_H_
+#define _TD_VNODE_TSDB_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_VNODE_TSDB_H_*/
\ No newline at end of file

source/dnode/vnode2/src/vnode/vnodeMain.c

+/*
+ * 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/>.
+ */
+
+#include "vnodeInt.h"
+
+int vnodeOpen(const char *path, const SVnodeCfg *pCfg, SVnode **ppVnode) { 
+  return 0; 
+  }
+
+int vnodeClose(SVnode *pVnode) {
+  // TODO
+  return 0;
+}
\ No newline at end of file