Merge branch '3.0_refact' into 3.0

CMakeLists.txt

@@ -29,6 +29,9 @@ endif(${BUILD_TEST})
 ## lz4
 cat("${CMAKE_SUPPORT_DIR}/lz4_CMakeLists.txt.in" ${DEPS_TMP_FILE})
 
+## zlib
+cat("${CMAKE_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${DEPS_TMP_FILE})
+
 ## cJson
 cat("${CMAKE_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${DEPS_TMP_FILE})
 

cmake/cjson_CMakeLists.txt.in

@@ -4,7 +4,7 @@ ExternalProject_Add(cjson
         GIT_REPOSITORY git@github.com:taosdata-contrib/cJSON.git
         GIT_TAG v1.7.15
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/cJson"
-        BINARY_DIR "${CMAKE_BINARY_DIR}/cJson-build"
+        BINARY_DIR ""
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ""

cmake/gtest_CMakeLists.txt.in

@@ -4,7 +4,7 @@ ExternalProject_Add(googletest
         GIT_REPOSITORY git@github.com:taosdata-contrib/googletest.git
         GIT_TAG release-1.11.0
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/googletest"
-        BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
+        BINARY_DIR ""
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ""

cmake/lz4_CMakeLists.txt.in

@@ -4,7 +4,7 @@ ExternalProject_Add(lz4
         GIT_REPOSITORY git@github.com:taosdata-contrib/lz4.git
         GIT_TAG v1.9.3
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/lz4"
-        BINARY_DIR "${CMAKE_BINARY_DIR}/lz4-build"
+        BINARY_DIR ""
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ""

cmake/zlib_CMakeLists.txt.in

@@ -0,0 +1,13 @@
+
+# zlib
+ExternalProject_Add(zlib
+        GIT_REPOSITORY git@github.com:taosdata-contrib/zlib.git
+        GIT_TAG v1.2.11
+        SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/zlib"
+        BINARY_DIR ""
+        #BUILD_IN_SOURCE TRUE
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+)

deps/CMakeLists.txt

@@ -4,3 +4,9 @@ endif(${BUILD_TEST})
 
 add_subdirectory(cJson)
 add_subdirectory(lz4/build/cmake)
+add_subdirectory(zlib)
+target_include_directories(
+    zlib
+    PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
+)

include/libs/transport/transport.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_ASVC_H_
+#ifndef _TD_TRANSPORT_H_
-#define _TD_ASVC_H_
+#define _TD_TRANSPORT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif
 
-#endif /*_TD_ASVC_H_*/
+#endif /*_TD_TRANSPORT_H_*/

source/libs/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory(asvc)
+add_subdirectory(transport)
 add_subdirectory(raft)
 add_subdirectory(tkv)
 add_subdirectory(index)

source/libs/asvc/CMakeLists.txt

@@ -1,7 +0,0 @@
-aux_source_directory(src ASVC_SRC)
-add_library(asvc ${ASVC_SRC})
-target_include_directories(
-    asvc
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/asvc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)

source/libs/transport/CMakeLists.txt

@@ -0,0 +1,7 @@
+aux_source_directory(src TRANSPORT_SRC)
+add_library(transport ${TRANSPORT_SRC})
+target_include_directories(
+    transport
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/transport"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)

source/libs/transport/inc/transportInt.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_ASVC_INT_H_
+#ifndef _TD_TRANSPORT_INT_H_
-#define _TD_ASVC_INT_H_
+#define _TD_TRANSPORT_INT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif
 
-#endif /*_TD_ASVC_INT_H_*/
+#endif /*_TD_TRANSPORT_INT_H_*/