From 3550424ffee9a69af9b7dba49261341ec6b297ac Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Sun, 8 Mar 2020 22:10:08 +0800
Subject: [PATCH] fix some error in tsdb

---
 src/dnode/src/dnodeSystem.c                   |  9 +++----
 src/vnode/CMakeLists.txt                      | 14 +++++------
 src/vnode/common/CMakeLists.txt               | 17 ++++++++-----
 .../src/{vnodePeer.c => vnodePeer.c_del}      |  0
 src/vnode/tsdb/CMakeLists.txt                 | 25 +++++++++++--------
 5 files changed, 35 insertions(+), 30 deletions(-)
 rename src/vnode/common/src/{vnodePeer.c => vnodePeer.c_del} (100%)

diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index 65e5c35da1..be3e03a72c 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -50,6 +50,9 @@ static int32_t dnodeInitRpcQHandle();
 static int32_t dnodeInitQueryQHandle();
 static int32_t dnodeInitTmrCtl();
 
+
+int32_t (*dnodeInitStorage)() = NULL;
+void    (*dnodeCleanupStorage)() = NULL;
 int32_t (*dnodeInitPeers)(int32_t numOfThreads) = NULL;
 
 void     *tsDnodeTmr;
@@ -248,12 +251,6 @@ int32_t dnodeInitStorageImp() {
   return 0;
 }
 
-int32_t (*dnodeInitStorage)() = dnodeInitStorageImp;
-
-void dnodeCleanupStorageImp() {}
-
-void (*dnodeCleanupStorage)() = dnodeCleanupStorageImp;
-
 static int32_t dnodeInitQueryQHandle() {
   int32_t numOfThreads = tsRatioOfQueryThreads * tsNumOfCores * tsNumOfThreadsPerCore;
   if (numOfThreads < 1) {
diff --git a/src/vnode/CMakeLists.txt b/src/vnode/CMakeLists.txt
index 8224507f1c..8549fa478c 100644
--- a/src/vnode/CMakeLists.txt
+++ b/src/vnode/CMakeLists.txt
@@ -1,9 +1,7 @@
-cmake_minimum_required(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
 
-add_subdirectory(common)
-
-add_subdirectory(tsdb)
-
-enable_testing()
-
-# add_subdirectory(tests)
\ No newline at end of file
+ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(tsdb)
+# ENABLE_TESTING()
+# ADD_SUBDIRECTORY(tests)
diff --git a/src/vnode/common/CMakeLists.txt b/src/vnode/common/CMakeLists.txt
index 38803c2421..de84f1a496 100644
--- a/src/vnode/common/CMakeLists.txt
+++ b/src/vnode/common/CMakeLists.txt
@@ -1,8 +1,13 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
 
-list(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/src/vnodePeer.c)
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
 
-message(STATUS "Common source file ${SOURCE_LIST}")
-
-add_library(common ${SOURCE_LIST})
-target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc")
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
+  ADD_LIBRARY(common ${SRC})
+ENDIF ()
diff --git a/src/vnode/common/src/vnodePeer.c b/src/vnode/common/src/vnodePeer.c_del
similarity index 100%
rename from src/vnode/common/src/vnodePeer.c
rename to src/vnode/common/src/vnodePeer.c_del
diff --git a/src/vnode/tsdb/CMakeLists.txt b/src/vnode/tsdb/CMakeLists.txt
index 9736f2cb88..b80dcc5fb5 100644
--- a/src/vnode/tsdb/CMakeLists.txt
+++ b/src/vnode/tsdb/CMakeLists.txt
@@ -1,13 +1,18 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
 
-add_library(tsdb STATIC ${SOURCE_LIST})
-target_link_libraries(tsdb common tutil)
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/common/inc)
 
-target_include_directories(tsdb 
-  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc" 
-  PUBLIC "${CMAKE_SOURCE_DIR}/src/inc"
-  PUBLIC "${CMAKE_SOURCE_DIR}/src/util/inc"
-  PUBLIC "${CMAKE_SOURCE_DIR}/src/os/linux/inc"
-  )
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
 
-add_subdirectory(tests)
\ No newline at end of file
+  ADD_LIBRARY(tsdb ${SRC})
+  TARGET_LINK_LIBRARIES(tsdb common tutil)
+
+  # Someone has no gtest directory, so comment it
+  #ADD_SUBDIRECTORY(tests)
+ENDIF ()
-- 
GitLab