Merge pull request #9209 from taosdata/feature/vnode

Merge branch '3.0' into feature/vnode

cmake/cmake.options

@@ -44,6 +44,12 @@ option(
     OFF
 )
 
+option(
+    BUILD_WITH_UV
+    "If build with libuv" 
+    OFF
+)
+
 option(
     BUILD_WITH_CRAFT
     "If build with canonical-raft"

cmake/craft_CMakeLists.txt.in

@@ -4,9 +4,10 @@ ExternalProject_Add(craft
         GIT_REPOSITORY https://github.com/canonical/raft.git
         GIT_TAG v0.11.2
         SOURCE_DIR "${CMAKE_CONTRIB_DIR}/craft"
-        BINARY_DIR "${CMAKE_CONTRIB_DIR}/craft/.libs"
+        BINARY_DIR "${CMAKE_CONTRIB_DIR}/craft"
         #BUILD_IN_SOURCE TRUE
-        CONFIGURE_COMMAND "autoreconf -i && ./configure"
+        # https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
+        CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure --enable-example
         BUILD_COMMAND "$(MAKE)"
         INSTALL_COMMAND ""
         TEST_COMMAND ""

cmake/libuv_CMakeLists.txt.in

+
+# libuv
+ExternalProject_Add(libuv
+        GIT_REPOSITORY https://github.com/libuv/libuv.git
+        GIT_TAG v1.42.0
+        SOURCE_DIR "${CMAKE_CONTRIB_DIR}/libuv"
+        BINARY_DIR ""
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )
\ No newline at end of file

contrib/CMakeLists.txt

@@ -37,12 +37,18 @@ endif(${BUILD_WITH_ROCKSDB})
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
     cat("${CMAKE_SUPPORT_DIR}/craft_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    option(BUILD_WITH_UV "" ON)
 endif(${BUILD_WITH_CRAFT})
 
+#libuv
+if(${BUILD_WITH_UV})
+    cat("${CMAKE_SUPPORT_DIR}/libuv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+endif(${BUILD_WITH_UV})
+
 # bdb
 if(${BUILD_WITH_BDB})
     cat("${CMAKE_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(${BUILD_WITH_DBD})
+endif(${BUILD_WITH_BDB})
 
 # sqlite
 if(${BUILD_WITH_SQLITE})
@@ -154,13 +160,18 @@ if(${BUILD_WITH_CRAFT})
     add_library(craft STATIC IMPORTED GLOBAL)
     set_target_properties(craft PROPERTIES
         IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/craft/.libs/libraft.a"
-        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/craft"
-    )
-    target_link_libraries(craft
-        INTERFACE pthread
+        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/craft/include"
     )
+    # target_link_libraries(craft
+    #     INTERFACE pthread
+    # )
 endif(${BUILD_WITH_CRAFT})
 
+# LIBUV
+if(${BUILD_WITH_UV})
+    add_subdirectory(libuv)
+endif(${BUILD_WITH_UV})
+
 # BDB
 if(${BUILD_WITH_BDB})
     add_library(bdb STATIC IMPORTED GLOBAL)

contrib/test/CMakeLists.txt

@@ -15,4 +15,8 @@ if(${BUILD_WITH_SQLITE})
     add_subdirectory(sqlite)
 endif(${BUILD_WITH_SQLITE})
 
+if(${BUILD_WITH_CRAFT})
+    add_subdirectory(craft)
+endif(${BUILD_WITH_CRAFT})
+
 add_subdirectory(tdev)

contrib/test/craft/CMakeLists.txt

+add_executable(simulate_vnode "simulate_vnode.c")
+target_link_libraries(simulate_vnode PUBLIC craft lz4 uv_a)
\ No newline at end of file