Merge pull request #28474 from taosdata/merge/mainto3.0

merge: from main to 3.0 branch

CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(
-    TDengine
-    VERSION 3.0
-    DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)"
+  TDengine
+  VERSION 3.0
+  DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)"
 )
 
-if (NOT DEFINED TD_SOURCE_DIR)
-  set( TD_SOURCE_DIR ${PROJECT_SOURCE_DIR} )
+if(NOT DEFINED TD_SOURCE_DIR)
+  set(TD_SOURCE_DIR ${PROJECT_SOURCE_DIR})
 endif()
 
 SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
@@ -15,13 +15,11 @@ SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
 set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake")
 set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib")
 
-
 include(${TD_SUPPORT_DIR}/cmake.platform)
 include(${TD_SUPPORT_DIR}/cmake.define)
 include(${TD_SUPPORT_DIR}/cmake.options)
 include(${TD_SUPPORT_DIR}/cmake.version)
 
-
 # contrib
 add_subdirectory(contrib)
 
@@ -33,8 +31,8 @@ target_include_directories(api INTERFACE "include/client")
 
 # src
 if(${BUILD_TEST})
-    include(CTest)
-    enable_testing()
+  include(CTest)
+  enable_testing()
 endif(${BUILD_TEST})
 
 add_subdirectory(source)
@@ -44,5 +42,5 @@ add_subdirectory(examples/c)
 add_subdirectory(tests)
 include(${TD_SUPPORT_DIR}/cmake.install)
 
-# docs 
+# docs
 add_subdirectory(docs/doxgen)

cmake/cmake.define

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE FALSE)
 set(TD_BUILD_TAOSA_INTERNAL FALSE)
 
-#set output directory
+# set output directory
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
 SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
@@ -12,170 +12,178 @@ MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
 MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
 MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
 
-if (NOT DEFINED TD_GRANT)
-  SET(TD_GRANT FALSE)
-endif()
+IF(NOT DEFINED TD_GRANT)
+    SET(TD_GRANT FALSE)
+ENDIF()
 
-IF (NOT DEFINED BUILD_WITH_RAND_ERR)
-  SET(BUILD_WITH_RAND_ERR FALSE)
-ELSE ()
-  SET(BUILD_WITH_RAND_ERR TRUE)
-endif()
+IF(NOT DEFINED BUILD_WITH_RAND_ERR)
+    SET(BUILD_WITH_RAND_ERR FALSE)
+ELSE()
+    SET(BUILD_WITH_RAND_ERR TRUE)
+ENDIF()
 
-IF ("${WEBSOCKET}" MATCHES "true")
+IF("${WEBSOCKET}" MATCHES "true")
     SET(TD_WEBSOCKET TRUE)
     MESSAGE("Enable websocket")
     ADD_DEFINITIONS(-DWEBSOCKET)
-ELSE ()
+ELSE()
     SET(TD_WEBSOCKET FALSE)
-ENDIF ()
+ENDIF()
 
-IF ("${BUILD_HTTP}" STREQUAL "")
-  IF (TD_LINUX)
-    IF (TD_ARM_32)
-      SET(TD_BUILD_HTTP TRUE)
-    ELSE ()
-      SET(TD_BUILD_HTTP TRUE)
-    ENDIF ()
-  ELSEIF (TD_DARWIN)
+IF("${BUILD_HTTP}" STREQUAL "")
+    IF(TD_LINUX)
+        IF(TD_ARM_32)
+            SET(TD_BUILD_HTTP TRUE)
+        ELSE()
+            SET(TD_BUILD_HTTP TRUE)
+        ENDIF()
+    ELSEIF(TD_DARWIN)
+        SET(TD_BUILD_HTTP TRUE)
+    ELSE()
+        SET(TD_BUILD_HTTP TRUE)
+    ENDIF()
+ELSEIF(${BUILD_HTTP} MATCHES "false")
+    SET(TD_BUILD_HTTP FALSE)
+ELSEIF(${BUILD_HTTP} MATCHES "true")
     SET(TD_BUILD_HTTP TRUE)
-  ELSE ()
+ELSEIF(${BUILD_HTTP} MATCHES "internal")
+    SET(TD_BUILD_HTTP FALSE)
+    SET(TD_BUILD_TAOSA_INTERNAL TRUE)
+ELSE()
     SET(TD_BUILD_HTTP TRUE)
-  ENDIF ()
-ELSEIF (${BUILD_HTTP} MATCHES "false")
-  SET(TD_BUILD_HTTP FALSE)
-ELSEIF (${BUILD_HTTP} MATCHES "true")
-  SET(TD_BUILD_HTTP TRUE)
-ELSEIF (${BUILD_HTTP} MATCHES "internal")
-  SET(TD_BUILD_HTTP FALSE)
-  SET(TD_BUILD_TAOSA_INTERNAL TRUE)
-ELSE ()
-  SET(TD_BUILD_HTTP TRUE)
-ENDIF ()
+ENDIF()
 
-IF (TD_BUILD_HTTP)
-  ADD_DEFINITIONS(-DHTTP_EMBEDDED)
-ENDIF ()
+IF(TD_BUILD_HTTP)
+    ADD_DEFINITIONS(-DHTTP_EMBEDDED)
+ENDIF()
 
-IF ("${BUILD_TOOLS}" STREQUAL "")
-  IF (TD_LINUX)
-    IF (TD_ARM_32)
-      SET(BUILD_TOOLS "false")
-    ELSEIF (TD_ARM_64)
-      SET(BUILD_TOOLS "false")
-    ELSE ()
-      SET(BUILD_TOOLS "false")
-    ENDIF ()
-  ELSEIF (TD_DARWIN)
-    SET(BUILD_TOOLS "false")
-  ELSE ()
-    SET(BUILD_TOOLS "false")
-  ENDIF ()
-ENDIF ()
+IF("${BUILD_TOOLS}" STREQUAL "")
+    IF(TD_LINUX)
+        IF(TD_ARM_32)
+            SET(BUILD_TOOLS "false")
+        ELSEIF(TD_ARM_64)
+            SET(BUILD_TOOLS "false")
+        ELSE()
+            SET(BUILD_TOOLS "false")
+        ENDIF()
+    ELSEIF(TD_DARWIN)
+        SET(BUILD_TOOLS "false")
+    ELSE()
+        SET(BUILD_TOOLS "false")
+    ENDIF()
+ENDIF()
 
-IF ("${BUILD_TOOLS}" MATCHES "false")
+IF("${BUILD_TOOLS}" MATCHES "false")
     MESSAGE("${Yellow} Will _not_ build taos_tools! ${ColourReset}")
     SET(TD_TAOS_TOOLS FALSE)
-ELSE ()
+ELSE()
     MESSAGE("")
     MESSAGE("${Green} Will build taos_tools! ${ColourReset}")
     MESSAGE("")
     SET(TD_TAOS_TOOLS TRUE)
-ENDIF ()
+ENDIF()
 
-IF (${TD_WINDOWS})
+IF(${TD_WINDOWS})
     SET(TAOS_LIB taos_static)
-ELSE ()
+ELSE()
     SET(TAOS_LIB taos)
-ENDIF ()
+ENDIF()
 
 # build TSZ by default
-IF ("${TSZ_ENABLED}" MATCHES "false")
-  set(VAR_TSZ "" CACHE INTERNAL "global variant empty" )
+IF("${TSZ_ENABLED}" MATCHES "false")
+    set(VAR_TSZ "" CACHE INTERNAL "global variant empty")
 ELSE()
-  # define add 
-  MESSAGE(STATUS "build with TSZ enabled")
-  ADD_DEFINITIONS(-DTD_TSZ)
-  set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz" )
+    # define add
+    MESSAGE(STATUS "build with TSZ enabled")
+    ADD_DEFINITIONS(-DTD_TSZ)
+    set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz")
 ENDIF()
 
 # force set all platform to JEMALLOC_ENABLED = false
 SET(JEMALLOC_ENABLED OFF)
-IF (TD_WINDOWS)
-    MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
-    IF (${CMAKE_BUILD_TYPE} MATCHES "Release")
-      MESSAGE("${Green} will build Release version! ${ColourReset}")
-      SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi- /O2 /GL /MD")
 
-    ELSE ()
-      MESSAGE("${Green} will build Debug version! ${ColourReset}")
-      SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
+IF(TD_WINDOWS)
+    MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
+
+    IF(${CMAKE_BUILD_TYPE} MATCHES "Release")
+        MESSAGE("${Green} will build Release version! ${ColourReset}")
+        SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi- /O2 /GL /MD")
+
+    ELSE()
+        MESSAGE("${Green} will build Debug version! ${ColourReset}")
+        SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
     ENDIF()
 
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+
     # IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
-    #  SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
+    # SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
     # ENDIF ()
-    IF (CMAKE_DEPFILE_FLAGS_C)
+    IF(CMAKE_DEPFILE_FLAGS_C)
         SET(CMAKE_DEPFILE_FLAGS_C "")
-    ENDIF ()
-    IF (CMAKE_DEPFILE_FLAGS_CXX)
+    ENDIF()
+
+    IF(CMAKE_DEPFILE_FLAGS_CXX)
         SET(CMAKE_DEPFILE_FLAGS_CXX "")
-    ENDIF ()
-    IF (CMAKE_C_FLAGS_DEBUG)
+    ENDIF()
+
+    IF(CMAKE_C_FLAGS_DEBUG)
         SET(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)
-    ENDIF ()
-    IF (CMAKE_CXX_FLAGS_DEBUG)
+    ENDIF()
+
+    IF(CMAKE_CXX_FLAGS_DEBUG)
         SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
-    ENDIF ()
+    ENDIF()
 
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
 
-ELSE ()
-    IF (${TD_DARWIN})
+ELSE()
+    IF(${TD_DARWIN})
         set(CMAKE_MACOSX_RPATH 0)
-    ENDIF ()
-    IF (${COVER} MATCHES "true")
+    ENDIF()
+
+    IF(${COVER} MATCHES "true")
         MESSAGE(STATUS "Test coverage mode, add extra flags")
         SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
-        SET(GCC_COVERAGE_LINK_FLAGS    "-lgcov --coverage")
+        SET(GCC_COVERAGE_LINK_FLAGS "-lgcov --coverage")
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-    ENDIF ()
+    ENDIF()
 
     # disable all assert
-    IF ((${DISABLE_ASSERT} MATCHES "true") OR (${DISABLE_ASSERTS} MATCHES "true"))
+    IF((${DISABLE_ASSERT} MATCHES "true") OR(${DISABLE_ASSERTS} MATCHES "true"))
         ADD_DEFINITIONS(-DDISABLE_ASSERT)
         MESSAGE(STATUS "Disable all asserts")
     ENDIF()
 
     INCLUDE(CheckCCompilerFlag)
-    IF (TD_ARM_64 OR TD_ARM_32)
+
+    IF(TD_ARM_64 OR TD_ARM_32)
         SET(COMPILER_SUPPORT_SSE42 false)
-    ELSEIF (("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang"))
+    ELSEIF(("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") OR("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang"))
         SET(COMPILER_SUPPORT_SSE42 true)
         MESSAGE(STATUS "Always enable sse4.2 for Clang/AppleClang")
     ELSE()
         CHECK_C_COMPILER_FLAG("-msse4.2" COMPILER_SUPPORT_SSE42)
     ENDIF()
 
-    IF (TD_ARM_64 OR TD_ARM_32)
-      SET(COMPILER_SUPPORT_FMA false)
-      SET(COMPILER_SUPPORT_AVX false)
-      SET(COMPILER_SUPPORT_AVX2 false)
-      SET(COMPILER_SUPPORT_AVX512F false)
-      SET(COMPILER_SUPPORT_AVX512BMI false)
-      SET(COMPILER_SUPPORT_AVX512VL false)
+    IF(TD_ARM_64 OR TD_ARM_32)
+        SET(COMPILER_SUPPORT_FMA false)
+        SET(COMPILER_SUPPORT_AVX false)
+        SET(COMPILER_SUPPORT_AVX2 false)
+        SET(COMPILER_SUPPORT_AVX512F false)
+        SET(COMPILER_SUPPORT_AVX512BMI false)
+        SET(COMPILER_SUPPORT_AVX512VL false)
     ELSE()
-      CHECK_C_COMPILER_FLAG("-mfma" COMPILER_SUPPORT_FMA)
-      CHECK_C_COMPILER_FLAG("-mavx512f" COMPILER_SUPPORT_AVX512F)
-      CHECK_C_COMPILER_FLAG("-mavx512vbmi" COMPILER_SUPPORT_AVX512BMI)
-      CHECK_C_COMPILER_FLAG("-mavx512vl" COMPILER_SUPPORT_AVX512VL)
+        CHECK_C_COMPILER_FLAG("-mfma" COMPILER_SUPPORT_FMA)
+        CHECK_C_COMPILER_FLAG("-mavx512f" COMPILER_SUPPORT_AVX512F)
+        CHECK_C_COMPILER_FLAG("-mavx512vbmi" COMPILER_SUPPORT_AVX512BMI)
+        CHECK_C_COMPILER_FLAG("-mavx512vl" COMPILER_SUPPORT_AVX512VL)
 
-      INCLUDE(CheckCSourceRuns)
-      SET(CMAKE_REQUIRED_FLAGS "-mavx")
-      check_c_source_runs("
+        INCLUDE(CheckCSourceRuns)
+        SET(CMAKE_REQUIRED_FLAGS "-mavx")
+        check_c_source_runs("
         #include <immintrin.h>
         int main() {
           __m256d a, b, c;
@@ -185,7 +193,7 @@ ELSE ()
           c = _mm256_add_pd(a, b);
           _mm256_storeu_pd(buf, c);
           for (int i = 0; i < sizeof(buf) / sizeof(buf[0]); ++i) {
-            if (buf[i] != 0) {
+            IF (buf[i] != 0) {
               return 1;
             }
           }
@@ -193,8 +201,8 @@ ELSE ()
         }
       " COMPILER_SUPPORT_AVX)
 
-      SET(CMAKE_REQUIRED_FLAGS "-mavx2")
-      check_c_source_runs("
+        SET(CMAKE_REQUIRED_FLAGS "-mavx2")
+        check_c_source_runs("
         #include <immintrin.h>
         int main() {
           __m256i a, b, c;
@@ -204,7 +212,7 @@ ELSE ()
           c = _mm256_and_si256(a, b);
           _mm256_storeu_si256((__m256i *)buf, c);
           for (int i = 0; i < sizeof(buf) / sizeof(buf[0]); ++i) {
-            if (buf[i] != 0) {
+            IF (buf[i] != 0) {
               return 1;
             }
           }
@@ -213,40 +221,42 @@ ELSE ()
       " COMPILER_SUPPORT_AVX2)
     ENDIF()
 
-    IF (COMPILER_SUPPORT_SSE42)
+    IF(COMPILER_SUPPORT_SSE42)
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
     ENDIF()
 
-    IF ("${SIMD_SUPPORT}" MATCHES "true")
-        IF (COMPILER_SUPPORT_FMA)
+    IF("${SIMD_SUPPORT}" MATCHES "true")
+        IF(COMPILER_SUPPORT_FMA)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfma")
             MESSAGE(STATUS "FMA instructions is ACTIVATED")
         ENDIF()
-        IF (COMPILER_SUPPORT_AVX)
+
+        IF(COMPILER_SUPPORT_AVX)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
             MESSAGE(STATUS "AVX instructions is ACTIVATED")
         ENDIF()
-        IF (COMPILER_SUPPORT_AVX2)
+
+        IF(COMPILER_SUPPORT_AVX2)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
             MESSAGE(STATUS "AVX2 instructions is ACTIVATED")
         ENDIF()
     ENDIF()
 
-    IF ("${SIMD_AVX512_SUPPORT}" MATCHES "true")
-        IF (COMPILER_SUPPORT_AVX512F AND COMPILER_SUPPORT_AVX512BMI)
+    IF("${SIMD_AVX512_SUPPORT}" MATCHES "true")
+        IF(COMPILER_SUPPORT_AVX512F AND COMPILER_SUPPORT_AVX512BMI)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx512f -mavx512vbmi")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -mavx512vbmi")
             MESSAGE(STATUS "avx512f/avx512bmi enabled by compiler")
         ENDIF()
 
-        IF (COMPILER_SUPPORT_AVX512VL)
+        IF(COMPILER_SUPPORT_AVX512VL)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx512vl")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512vl")
-        MESSAGE(STATUS "avx512vl enabled by compiler")
+            MESSAGE(STATUS "avx512vl enabled by compiler")
         ENDIF()
     ENDIF()
 
@@ -254,17 +264,17 @@ ELSE ()
     SET(CMAKE_C_FLAGS_REL "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     SET(CMAKE_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
 
-    IF (${BUILD_SANITIZER})
+    IF(${BUILD_SANITIZER})
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-        #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-	      MESSAGE(STATUS "Compile with Address Sanitizer!")
-    ELSEIF (${BUILD_RELEASE})
+
+        # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
+        MESSAGE(STATUS "Compile with Address Sanitizer!")
+    ELSEIF(${BUILD_RELEASE})
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-    ELSE ()
+    ELSE()
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-    ENDIF ()
-
-ENDIF ()
+    ENDIF()
+ENDIF()

cmake/taosadapter_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG 3.0
+        GIT_TAG main
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 3.0
+        GIT_TAG main
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

contrib/CMakeLists.txt

@@ -10,39 +10,36 @@ if(${BUILD_WITH_S3})
     file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.2/)
 
 elseif(${BUILD_WITH_COS})
+    set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
+    configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
 
-set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
-configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+    if(${BUILD_WITH_COS})
+        file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
+        cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+        cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+        cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+    endif(${BUILD_WITH_COS})
 
-if(${BUILD_WITH_COS})
-    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
-    cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-    cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-    cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-endif(${BUILD_WITH_COS})
-
-configure_file(${CONTRIB_TMP_FILE3} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+    configure_file(${CONTRIB_TMP_FILE3} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
+    execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 
-set(CONTRIB_TMP_FILE2 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in2")
-configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
+    set(CONTRIB_TMP_FILE2 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in2")
+    configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
 
-if(${BUILD_WITH_COS})
-    cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
-endif(${BUILD_WITH_COS})
+    if(${BUILD_WITH_COS})
+        cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
+    endif(${BUILD_WITH_COS})
 
-configure_file(${CONTRIB_TMP_FILE2} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+    configure_file(${CONTRIB_TMP_FILE2} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
+    execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-
 endif()
 
-
 set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
@@ -59,7 +56,7 @@ endif()
 # taosadapter
 if(${BUILD_HTTP})
     MESSAGE("BUILD_HTTP is on")
-else ()
+else()
     MESSAGE("BUILD_HTTP is off, use taosAdapter")
     cat("${TD_SUPPORT_DIR}/taosadapter_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
@@ -110,19 +107,18 @@ cat("${TD_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
 # xz
-#cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+# cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
-#lzma2
+# lzma2
 cat("${TD_SUPPORT_DIR}/lzma_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
-
-if (${BUILD_CONTRIB})
+if(${BUILD_CONTRIB})
     if(${BUILD_WITH_ROCKSDB})
         cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
         add_definitions(-DUSE_ROCKSDB)
     endif()
 else()
-    if (NOT ${TD_LINUX})
+    if(NOT ${TD_LINUX})
         if(${BUILD_WITH_ROCKSDB})
             cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
             add_definitions(-DUSE_ROCKSDB)
@@ -134,9 +130,9 @@ else()
     endif()
 endif()
 
-#cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+# cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
-#libuv
+# libuv
 if(${BUILD_WITH_UV})
     cat("${TD_SUPPORT_DIR}/libuv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif(${BUILD_WITH_UV})
@@ -157,13 +153,12 @@ if(${BUILD_WITH_S3})
 
 # cos
 elseif(${BUILD_WITH_COS})
-    #cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     cat("${TD_SUPPORT_DIR}/cos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     add_definitions(-DUSE_COS)
-
 endif()
 
 # crashdump
@@ -192,9 +187,9 @@ endif()
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
+    WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
+    WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 
 # ================================================================================================
 # Build
@@ -207,25 +202,27 @@ if(${BUILD_TEST})
         gtest
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src>
     )
+
     if(${TD_WINDOWS})
         target_include_directories(
             gtest
             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_win>
         )
     endif(${TD_WINDOWS})
+
     if(${TD_LINUX})
         target_include_directories(
             gtest
             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_linux>
         )
     endif(${TD_LINUX})
+
     if(${TD_DARWIN})
         target_include_directories(
             gtest
             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_darwin>
         )
     endif(${TD_DARWIN})
-
 endif(${BUILD_TEST})
 
 # cJson
@@ -237,15 +234,16 @@ option(CJSON_BUILD_SHARED_LIBS "Overrides BUILD_SHARED_LIBS if CJSON_OVERRIDE_BU
 add_subdirectory(cJson EXCLUDE_FROM_ALL)
 target_include_directories(
     cjson
+
     # see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cJson>
 )
 unset(CMAKE_PROJECT_INCLUDE_BEFORE)
 
 # xml2
-#if(${BUILD_WITH_S3})
-#  add_subdirectory(xml2 EXCLUDE_FROM_ALL)
-#endif()
+# if(${BUILD_WITH_S3})
+# add_subdirectory(xml2 EXCLUDE_FROM_ALL)
+# endif()
 
 # lz4
 add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL)
@@ -256,10 +254,12 @@ target_include_directories(
 
 # zlib
 set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
+
 if(${TD_DARWIN})
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-non-prototype")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-non-prototype")
 endif(${TD_DARWIN})
+
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
 target_include_directories(
     zlibstatic
@@ -275,9 +275,9 @@ unset(CMAKE_PROJECT_INCLUDE_BEFORE)
 
 # add_subdirectory(xz EXCLUDE_FROM_ALL)
 # target_include_directories(
-#     xz
-#     PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz
-#     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz
+# xz
+# PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz
+# PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz
 # )
 
 # leveldb
@@ -292,24 +292,27 @@ endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
-if (${BUILD_WITH_UV})
+if(${BUILD_WITH_UV})
     if(${TD_LINUX})
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-        IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "")
             SET(CMAKE_BUILD_TYPE Release)
         endif()
     endif(${TD_LINUX})
-endif (${BUILD_WITH_UV})
+endif(${BUILD_WITH_UV})
 
-if (${BUILD_WITH_ROCKSDB})
-    if (${BUILD_CONTRIB})
+if(${BUILD_WITH_ROCKSDB})
+    if(${BUILD_CONTRIB})
         if(${TD_LINUX})
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
-            if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+            if("${CMAKE_BUILD_TYPE}" STREQUAL "")
                 SET(CMAKE_BUILD_TYPE Release)
             endif()
         endif(${TD_LINUX})
+
         MESSAGE(STATUS "ROCKSDB CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
         MESSAGE(STATUS "ROCKSDB C STATUS CONFIG: " ${CMAKE_C_FLAGS})
 
@@ -317,22 +320,23 @@ if (${BUILD_WITH_ROCKSDB})
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
         endif(${TD_DARWIN})
 
-        if (${TD_DARWIN_ARM64})
+        if(${TD_DARWIN_ARM64})
             set(HAS_ARMV8_CRC true)
         endif(${TD_DARWIN_ARM64})
 
-        if (${TD_WINDOWS})
+        if(${TD_WINDOWS})
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819 /std:c++17")
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4819")
             option(WITH_JNI "" OFF)
+
             if(CMAKE_C_FLAGS MATCHES "/MT" OR CMAKE_C_FLAGS MATCHES "/MTd")
-               message("Rocksdb build runtime lib use /MT or /MTd")
-               option(WITH_MD_LIBRARY "build with MD" OFF)
+                message("Rocksdb build runtime lib use /MT or /MTd")
+                option(WITH_MD_LIBRARY "build with MD" OFF)
             endif()
+
             set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
         endif(${TD_WINDOWS})
 
-
         if(${TD_DARWIN})
             option(HAVE_THREAD_LOCAL "" OFF)
             option(WITH_IOSTATS_CONTEXT "" OFF)
@@ -358,30 +362,32 @@ if (${BUILD_WITH_ROCKSDB})
             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
         )
     else()
-        if (NOT ${TD_LINUX})
+        if(NOT ${TD_LINUX})
             MESSAGE(STATUS "ROCKSDB CXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
             MESSAGE(STATUS "ROCKSDB C STATUS CONFIG: " ${CMAKE_C_FLAGS})
+
             if(${TD_DARWIN})
                 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
                 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=maybe-uninitialized")
             endif(${TD_DARWIN})
 
-            if (${TD_DARWIN_ARM64})
+            if(${TD_DARWIN_ARM64})
                 set(HAS_ARMV8_CRC true)
             endif(${TD_DARWIN_ARM64})
 
-            if (${TD_WINDOWS})
+            if(${TD_WINDOWS})
                 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819 /std:c++17")
                 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4819")
                 option(WITH_JNI "" OFF)
+
                 if(CMAKE_C_FLAGS MATCHES "/MT" OR CMAKE_C_FLAGS MATCHES "/MTd")
                     message("Rocksdb build runtime lib use /MT or /MTd")
                     option(WITH_MD_LIBRARY "build with MD" OFF)
                 endif()
+
                 set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
             endif(${TD_WINDOWS})
 
-
             if(${TD_DARWIN})
                 option(HAVE_THREAD_LOCAL "" OFF)
                 option(WITH_IOSTATS_CONTEXT "" OFF)
@@ -407,44 +413,44 @@ if (${BUILD_WITH_ROCKSDB})
                 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
             )
         endif()
-
     endif()
 endif()
 
 if(${BUILD_WITH_S3})
     INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.2/include)
     MESSAGE("build with s3: ${BUILD_WITH_S3}")
+
 # cos
 elseif(${BUILD_WITH_COS})
-  if(${TD_LINUX})
-    set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
-    #ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
-    option(ENABLE_TEST "Enable the tests" OFF)
-    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)
-    #MESSAGE("$ENV{HOME}/.cos-local.1/include")
+    if(${TD_LINUX})
+        set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
 
-    set(CMAKE_BUILD_TYPE Release)
-    set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
-    set(CMAKE_PROJECT_NAME cos_c_sdk)
+        # ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
+        option(ENABLE_TEST "Enable the tests" OFF)
+        INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)
 
-    add_subdirectory(cos-c-sdk-v5 EXCLUDE_FROM_ALL)
-    target_include_directories(
-      cos_c_sdk
-      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
-      )
+        # MESSAGE("$ENV{HOME}/.cos-local.1/include")
+        set(CMAKE_BUILD_TYPE Release)
+        set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
+        set(CMAKE_PROJECT_NAME cos_c_sdk)
 
-    set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
-  else()
-
-  endif(${TD_LINUX})
+        add_subdirectory(cos-c-sdk-v5 EXCLUDE_FROM_ALL)
+        target_include_directories(
+            cos_c_sdk
+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
+        )
 
+        set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
+    else()
+    endif(${TD_LINUX})
 endif()
 
 # pthread
 if(${BUILD_PTHREAD})
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    SET(CMAKE_BUILD_TYPE Release)
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+        SET(CMAKE_BUILD_TYPE Release)
     endif()
+
     add_definitions(-DPTW32_STATIC_LIB)
     add_subdirectory(pthread EXCLUDE_FROM_ALL)
     set_target_properties(libpthreadVC3 PROPERTIES OUTPUT_NAME pthread)
@@ -452,16 +458,15 @@ if(${BUILD_PTHREAD})
     target_link_libraries(pthread INTERFACE libpthreadVC3)
 endif()
 
-
 # jemalloc
 if(${JEMALLOC_ENABLED})
     include(ExternalProject)
     ExternalProject_Add(jemalloc
-        PREFIX        "jemalloc"
-        SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
-        BUILD_IN_SOURCE     1
-        CONFIGURE_COMMAND  ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --disable-initial-exec-tls
-        BUILD_COMMAND       ${MAKE}
+        PREFIX "jemalloc"
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
+        BUILD_IN_SOURCE 1
+        CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --disable-initial-exec-tls
+        BUILD_COMMAND ${MAKE}
     )
     INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
 endif()
@@ -515,12 +520,13 @@ endif(${BUILD_WCWIDTH})
 
 # LIBUV
 if(${BUILD_WITH_UV})
-    if (TD_WINDOWS)
+    if(TD_WINDOWS)
         # There is no GetHostNameW function on win7.
         file(READ "libuv/src/win/util.c" LIBUV_WIN_UTIL_CONTENT)
         string(REPLACE "if (GetHostNameW(buf, UV_MAXHOSTNAMESIZE" "DWORD  nSize = UV_MAXHOSTNAMESIZE;\n  if (GetComputerNameW(buf, &nSize" LIBUV_WIN_UTIL_CONTENT "${LIBUV_WIN_UTIL_CONTENT}")
         file(WRITE "libuv/src/win/util.c" "${LIBUV_WIN_UTIL_CONTENT}")
-    endif ()
+    endif()
+
     add_subdirectory(libuv EXCLUDE_FROM_ALL)
 endif(${BUILD_WITH_UV})
 
@@ -536,6 +542,7 @@ if(${BUILD_WITH_SQLITE})
         INTERFACE m
         INTERFACE pthread
     )
+
     if(NOT TD_WINDOWS)
         target_link_libraries(sqlite
             INTERFACE dl
@@ -546,36 +553,38 @@ endif(${BUILD_WITH_SQLITE})
 # addr2line
 if(${BUILD_ADDR2LINE})
     if(NOT ${TD_WINDOWS})
-        check_include_file( "sys/types.h"     HAVE_SYS_TYPES_H)
-        check_include_file( "sys/stat.h"      HAVE_SYS_STAT_H )
-        check_include_file( "inttypes.h"      HAVE_INTTYPES_H   )
-        check_include_file( "stddef.h"        HAVE_STDDEF_H   )
-        check_include_file( "stdlib.h"        HAVE_STDLIB_H   )
-        check_include_file( "string.h"        HAVE_STRING_H   )
-        check_include_file( "memory.h"        HAVE_MEMORY_H   )
-        check_include_file( "strings.h"       HAVE_STRINGS_H  )
-        check_include_file( "stdint.h"        HAVE_STDINT_H   )
-        check_include_file( "unistd.h"        HAVE_UNISTD_H   )
-        check_include_file( "sgidefs.h"       HAVE_SGIDEFS_H  )
-        check_include_file( "stdafx.h"        HAVE_STDAFX_H   )
-        check_include_file( "elf.h"           HAVE_ELF_H      )
-        check_include_file( "libelf.h"        HAVE_LIBELF_H   )
-        check_include_file( "libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
-        check_include_file( "alloca.h"        HAVE_ALLOCA_H   )
-        check_include_file( "elfaccess.h"     HAVE_ELFACCESS_H)
-        check_include_file( "sys/elf_386.h"   HAVE_SYS_ELF_386_H  )
-        check_include_file( "sys/elf_amd64.h" HAVE_SYS_ELF_AMD64_H)
-        check_include_file( "sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
-        check_include_file( "sys/ia64/elf.h"  HAVE_SYS_IA64_ELF_H )
+        check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
+        check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
+        check_include_file("inttypes.h" HAVE_INTTYPES_H)
+        check_include_file("stddef.h" HAVE_STDDEF_H)
+        check_include_file("stdlib.h" HAVE_STDLIB_H)
+        check_include_file("string.h" HAVE_STRING_H)
+        check_include_file("memory.h" HAVE_MEMORY_H)
+        check_include_file("strings.h" HAVE_STRINGS_H)
+        check_include_file("stdint.h" HAVE_STDINT_H)
+        check_include_file("unistd.h" HAVE_UNISTD_H)
+        check_include_file("sgidefs.h" HAVE_SGIDEFS_H)
+        check_include_file("stdafx.h" HAVE_STDAFX_H)
+        check_include_file("elf.h" HAVE_ELF_H)
+        check_include_file("libelf.h" HAVE_LIBELF_H)
+        check_include_file("libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
+        check_include_file("alloca.h" HAVE_ALLOCA_H)
+        check_include_file("elfaccess.h" HAVE_ELFACCESS_H)
+        check_include_file("sys/elf_386.h" HAVE_SYS_ELF_386_H)
+        check_include_file("sys/elf_amd64.h" HAVE_SYS_ELF_AMD64_H)
+        check_include_file("sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
+        check_include_file("sys/ia64/elf.h" HAVE_SYS_IA64_ELF_H)
         set(VERSION 0.3.1)
         set(PACKAGE_VERSION "\"${VERSION}\"")
         configure_file(libdwarf/cmake/config.h.cmake config.h)
         file(GLOB_RECURSE LIBDWARF_SOURCES "libdwarf/src/lib/libdwarf/*.c")
         add_library(libdwarf STATIC ${LIBDWARF_SOURCES})
         set_target_properties(libdwarf PROPERTIES OUTPUT_NAME "libdwarf")
+
         if(HAVE_LIBELF_H OR HAVE_LIBELF_LIBELF_H)
             target_link_libraries(libdwarf PUBLIC libelf)
         endif()
+
         target_include_directories(libdwarf SYSTEM PUBLIC "libdwarf/src/lib/libdwarf" ${CMAKE_CURRENT_BINARY_DIR})
         file(READ "addr2line/addr2line.c" ADDR2LINE_CONTENT)
         string(REPLACE "static int" "int" ADDR2LINE_CONTENT "${ADDR2LINE_CONTENT}")
@@ -584,7 +593,7 @@ if(${BUILD_ADDR2LINE})
         file(WRITE "addr2line/addr2line.c" "${ADDR2LINE_CONTENT}")
         add_library(addr2line STATIC "addr2line/addr2line.c")
         target_link_libraries(addr2line PUBLIC libdwarf dl z)
-        target_include_directories(addr2line PUBLIC "libdwarf/src/lib/libdwarf" )
+        target_include_directories(addr2line PUBLIC "libdwarf/src/lib/libdwarf")
     endif(NOT ${TD_WINDOWS})
 endif(${BUILD_ADDR2LINE})
 
@@ -593,36 +602,39 @@ if(${BUILD_GEOS})
     if(${TD_LINUX})
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-        if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "")
             SET(CMAKE_BUILD_TYPE Release)
         endif()
     endif(${TD_LINUX})
+
     option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" OFF)
     add_subdirectory(geos EXCLUDE_FROM_ALL)
-    if (${TD_WINDOWS})
+
+    if(${TD_WINDOWS})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    else ()
+    else()
         unset(CMAKE_CXX_STANDARD CACHE) # undo libgeos's setting of global CMAKE_CXX_STANDARD
     endif(${TD_WINDOWS})
+
     target_include_directories(
         geos_c
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/geos/include>
     )
 endif(${BUILD_GEOS})
 
-if (${BUILD_PCRE2})
+if(${BUILD_PCRE2})
     add_subdirectory(pcre2 EXCLUDE_FROM_ALL)
 endif(${BUILD_PCRE2})
 
 if(${TD_LINUX} AND ${BUILD_WITH_S3})
-  add_subdirectory(azure-cmake EXCLUDE_FROM_ALL)
+    add_subdirectory(azure-cmake EXCLUDE_FROM_ALL)
 endif()
 
 # ================================================================================================
 # Build test
 # ================================================================================================
-
 MESSAGE("build with dependency tests: ${BUILD_DEPENDENCY_TESTS}")
 
 if(${BUILD_DEPENDENCY_TESTS})

contrib/azure-cmake/CMakeLists.txt

@@ -30,39 +30,42 @@ set(AZURE_SDK_INCLUDES
 add_library(_azure_sdk STATIC ${AZURE_SDK_UNIFIED_SRC})
 target_compile_definitions(_azure_sdk PRIVATE BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 
- target_include_directories(
-		_azure_sdk 
-                 PUBLIC "$ENV{HOME}/.cos-local.2/include"
-         )
+target_include_directories(
+    _azure_sdk
+    PUBLIC "$ENV{HOME}/.cos-local.2/include"
+)
 
 find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
 find_library(XML2_LIBRARY xml2 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-#find_library(CURL_LIBRARY curl)
-#find_library(XML2_LIBRARY xml2)
+
+# find_library(CURL_LIBRARY curl)
+# find_library(XML2_LIBRARY xml2)
 find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
 find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-#find_library(CoreFoundation_Library CoreFoundation)
-#find_library(SystemConfiguration_Library SystemConfiguration)
 
+# find_library(CoreFoundation_Library CoreFoundation)
+# find_library(SystemConfiguration_Library SystemConfiguration)
 target_link_libraries(
-		_azure_sdk 
-                 PRIVATE ${CURL_LIBRARY}
-                 PRIVATE ${SSL_LIBRARY}
-                 PRIVATE ${CRYPTO_LIBRARY}
-		 PRIVATE ${XML2_LIBRARY}
-		 #PRIVATE xml2
-		 PRIVATE zlib
-# PRIVATE ${CoreFoundation_Library}
-# PRIVATE ${SystemConfiguration_Library}
+    _azure_sdk
+    PRIVATE ${CURL_LIBRARY}
+    PRIVATE ${SSL_LIBRARY}
+    PRIVATE ${CRYPTO_LIBRARY}
+    PRIVATE ${XML2_LIBRARY}
+
+    # PRIVATE xml2
+    PRIVATE zlib
+
+    # PRIVATE ${CoreFoundation_Library}
+    # PRIVATE ${SystemConfiguration_Library}
 )
 
 # Originally, on Windows azure-core is built with bcrypt and crypt32 by default
-if (TARGET OpenSSL::SSL)
+if(TARGET OpenSSL::SSL)
     target_link_libraries(_azure_sdk PRIVATE OpenSSL::Crypto OpenSSL::SSL)
 endif()
 
 # Originally, on Windows azure-core is built with winhttp by default
-if (TARGET td_contrib::curl)
+if(TARGET td_contrib::curl)
     target_link_libraries(_azure_sdk PRIVATE td_contrib::curl)
 endif()
 

contrib/test/azure/CMakeLists.txt

@@ -1,19 +1,20 @@
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-add_executable (
-     azure-test
-     main.cpp
+add_executable(
+  azure-test
+  main.cpp
 )
 
 find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
 find_library(XML2_LIBRARY xml2 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-#find_library(XML2_LIBRARY xml2)
+
+# find_library(XML2_LIBRARY xml2)
 find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
 find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-#find_library(CoreFoundation_Library CoreFoundation)
-#find_library(SystemConfiguration_Library SystemConfiguration)
 
+# find_library(CoreFoundation_Library CoreFoundation)
+# find_library(SystemConfiguration_Library SystemConfiguration)
 target_link_libraries(
   azure-test
   PRIVATE _azure_sdk

docs/zh/05-basic/02-insert.md

@@ -111,7 +111,7 @@ TDengine 还支持直接向超级表写入数据。需要注意的是，超级
 
 ```sql
 insert into meters (tbname, ts, current, voltage, phase, location, group_id)
-values( "d1001v, "2018-10-03 14:38:05", 10.2, 220, 0.23, "California.SanFrancisco", 2)
+values( "d1001, "2018-10-03 14:38:05", 10.2, 220, 0.23, "California.SanFrancisco", 2)
 ```
 
 ### 零代码写入

docs/zh/14-reference/01-components/02-taosc.md

@@ -10,7 +10,7 @@ TDengine 客户端驱动提供了应用编程所需要的全部 API，并且在
 
 | 参数名称     | 参数含义                                                    |
 |:-----------:|:----------------------------------------------------------:|
-|firstEp | taos 启动时，主动连接的集群中首个 dnode 的 endpoint，缺省值：localhost:6030 |
+|firstEp | taos 启动时，主动连接的集群中首个 dnode 的 endpoint，缺省值：${hostname}:6030,若无法获取 ${hostname}，则赋值为 localhost  |
 |secondEp | 启动时，如果 firstEp 连接不上，尝试连接集群中第二个 dnode 的 endpoint，没有缺省值 |
 |numOfRpcSessions | 一个客户端能创建的最大连接数，取值范围：10-50000000(单位为毫秒)；缺省值：500000 |
 |telemetryReporting | 是否上传 telemetry，0: 不上传，1： 上传；缺省值：1 |

docs/zh/14-reference/01-components/03-taosadapter.md

@@ -330,7 +330,7 @@ taosAdapter 采集 REST/WebSocket 相关请求的监控指标。将监控指标
 | other\_fail        | INT UNSIGNED |         | 其他失败请求数                      |
 | query\_in\_process | INT UNSIGNED |         | 正在处理查询请求数                  |
 | write\_in\_process | INT UNSIGNED |         | 正在处理写入请求数                  |
-| endpoint           | VARCHAR      |         | 请求端点                            |
+| endpoint           | VARCHAR      |         | 请求端点                           |
 | req\_type          | NCHAR        | TAG     | 请求类型：0 为 REST，1 为 WebSocket |
 
 ## 结果返回条数限制

docs/zh/14-reference/02-tools/08-taos-cli.md

@@ -4,11 +4,11 @@ sidebar_label: taos
 toc_max_heading_level: 4
 ---
 
-TDengine 命令行程序（以下简称 TDengine CLI）是用户操作 TDengine 实例并与之交互的最简洁最常用的方式。 使用前需要安装 TDengine Server 安装包或 TDengine Client 安装包。
+TDengine 命令行程序（以下简称 TDengine CLI）是用户操作 TDengine 实例并与之交互的最简洁最常用工具。 使用前需要安装 TDengine Server 安装包或 TDengine Client 安装包。
 
 ## 启动
 
-要进入 TDengine CLI，您只要在终端执行 `taos` 即可。
+要进入 TDengine CLI，您在终端执行 `taos` 即可。
 
 ```bash
 taos
@@ -23,6 +23,11 @@ taos>
 ```
 
 进入 TDengine CLI 后，你可执行各种 SQL 语句，包括插入、查询以及各种管理命令。
+退出 TDengine CLI， 执行 `q` 或 `quit` 或 `exit` 回车即可
+```shell
+taos> quit
+```
+
 
 ## 执行 SQL 脚本
 
@@ -66,7 +71,7 @@ taos> SET MAX_BINARY_DISPLAY_WIDTH <nn>;
 - -l PKTLEN: 网络测试时使用的测试包大小
 - -n NETROLE: 网络连接测试时的测试范围，默认为 `client`, 可选值为 `client`、`server`
 - -N PKTNUM: 网络测试时使用的测试包数量
-- -r: 将时间输出出无符号 64 位整数类型(即 C 语音中 uint64_t)
+- -r: 将时间列转化为无符号 64 位整数类型输出(即 C 语言中 uint64_t)
 - -R: 使用 RESTful 模式连接服务端
 - -s COMMAND: 以非交互模式执行的 SQL 命令
 - -t: 测试服务端启动状态，状态同-k
@@ -84,6 +89,13 @@ taos -h h1.taos.com -s "use db; show tables;"
 
 也可以通过配置文件中的参数设置来控制 TDengine CLI 的行为。可用配置参数请参考[客户端配置](../../components/taosc)
 
+## TDengine CLI TAB 键补全
+
+- TAB 键前为空命令状态下按 TAB 键，会列出 TDengine CLI 支持的所有命令
+- TAB 键前为空格状态下按 TAB 键，会显示此位置可以出现的所有命令词的第一个，再次按 TAB 键切为下一个
+- TAB 键前为字符串，会搜索与此字符串前缀匹配的所有可出现命令词，并显示第一个，再次按 TAB 键切为下一个
+- 输入反斜杠 `\` + TAB 键, 会自动补全为列显示模式命令词 `\G;` 
+
 ## TDengine CLI 小技巧
 
 - 可以使用上下光标键查看历史输入的指令
@@ -91,7 +103,6 @@ taos -h h1.taos.com -s "use db; show tables;"
 - Ctrl+C 中止正在进行中的查询
 - 执行 `RESET QUERY CACHE` 可清除本地表 Schema 的缓存
 - 批量执行 SQL 语句。可以将一系列的 TDengine CLI 命令（以英文 ; 结尾，每个 SQL 语句为一行）按行存放在文件里，在 TDengine CLI 里执行命令 `source <file-name>` 自动执行该文件里所有的 SQL 语句
-- 输入 `q` 或 `quit` 或 `exit` 回车，可以退出 TDengine CLI
 
 ## TDengine CLI 导出查询结果到文件中
 

docs/zh/14-reference/03-taos-sql/01-data-type.md

@@ -42,8 +42,8 @@ CREATE DATABASE db_name PRECISION 'ns';
 | 14  |       NCHAR       | 自定义    | 记录包含多字节字符在内的字符串，如中文字符。每个 NCHAR 字符占用 4 字节的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 `\'`。NCHAR 使用时须指定字符串大小，类型为 NCHAR(10) 的列表示此列的字符串最多存储 10 个 NCHAR 字符。如果用户字符串长度超出声明长度，将会报错。 |
 | 15  |       JSON        |           | JSON 数据类型， 只有 Tag 可以是 JSON 格式                                                                                                                                                                                                                                                                         |
 | 16  |      VARCHAR      | 自定义    | BINARY 类型的别名                                                                                                                                                                                                                                                                                                 |
-| 17  |      GEOMETRY     | 自定义    | 几何类型
-| 18  |      VARBINARY     | 自定义    | 可变长的二进制数据|
+| 17  |      GEOMETRY     | 自定义    | 几何类型，3.1.0.0 版本开始支持
+| 18  |      VARBINARY     | 自定义    | 可变长的二进制数据， 3.1.1.0 版本开始支持|
 
 :::note
 

docs/zh/14-reference/03-taos-sql/14-stream.md

@@ -153,7 +153,7 @@ SELECT * from information_schema.`ins_streams`;
 
 由于窗口关闭是由事件时间决定的，如事件流中断、或持续延迟，则事件时间无法更新，可能导致无法得到最新的计算结果。
 
-因此，流式计算提供了以事件时间结合处理时间计算的 MAX_DELAY 触发模式。MAX_DELAY最小时间是5s，如果低于5s，创建流计算时会报错。
+因此，流式计算提供了以事件时间结合处理时间计算的 MAX_DELAY 触发模式。MAX_DELAY 最小时间是 5s，如果低于 5s，创建流计算时会报错。
 
 MAX_DELAY 模式在窗口关闭时会立即触发计算。此外，当数据写入后，计算触发的时间超过 max delay 指定的时间，则立即触发计算
 

source/client/CMakeLists.txt

@@ -1,8 +1,8 @@
 aux_source_directory(src CLIENT_SRC)
 
-IF (TD_ENTERPRISE)
-  LIST(APPEND CLIENT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/clientView.c)
-ENDIF ()
+if(TD_ENTERPRISE)
+    LIST(APPEND CLIENT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/clientView.c)
+endif()
 
 if(TD_WINDOWS)
     add_library(taos SHARED ${CLIENT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/taos.rc.in)

source/common/CMakeLists.txt

@@ -1,121 +1,122 @@
 aux_source_directory(src COMMON_SRC)
-IF (TD_ENTERPRISE)
-LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c)
-ENDIF()
+
+if(TD_ENTERPRISE)
+  LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c)
+endif()
 
 add_library(common STATIC ${COMMON_SRC})
 
-if (DEFINED GRANT_CFG_INCLUDE_DIR)
+if(DEFINED GRANT_CFG_INCLUDE_DIR)
   add_definitions(-DGRANTS_CFG)
 endif()
 
-IF (TD_GRANT)
+if(TD_GRANT)
   ADD_DEFINITIONS(-D_GRANT)
-ENDIF ()
+endif()
 
-IF (TD_STORAGE)
+if(TD_STORAGE)
   ADD_DEFINITIONS(-D_STORAGE)
   TARGET_LINK_LIBRARIES(common PRIVATE storage)
-ENDIF ()
+endif()
 
-IF (TD_ENTERPRISE)
-  IF(${BUILD_WITH_S3})
+if(TD_ENTERPRISE)
+  if(${BUILD_WITH_S3})
     add_definitions(-DUSE_S3)
   ELSEIF(${BUILD_WITH_COS})
     add_definitions(-DUSE_COS)
-  ENDIF()
-ENDIF()
+  endif()
+endif()
 
 target_include_directories(
-    common
-    PUBLIC "${TD_SOURCE_DIR}/include/common"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-    PRIVATE "${GRANT_CFG_INCLUDE_DIR}"
+  common
+  PUBLIC "${TD_SOURCE_DIR}/include/common"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  PRIVATE "${GRANT_CFG_INCLUDE_DIR}"
 )
-IF(${TD_WINDOWS})
-    target_include_directories(
-        common
-        PRIVATE "${TD_SOURCE_DIR}/contrib/pthread"
-        PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex"
-    )
-ENDIF ()
+
+if(${TD_WINDOWS})
+  target_include_directories(
+    common
+    PRIVATE "${TD_SOURCE_DIR}/contrib/pthread"
+    PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex"
+  )
+endif()
 
 target_link_libraries(
-    common
-    PUBLIC os
-    PUBLIC util
-    INTERFACE api
+  common
+  PUBLIC os
+  PUBLIC util
+  INTERFACE api
 )
 
 if(${BUILD_S3})
+  if(${BUILD_WITH_S3})
+    target_include_directories(
+      common
 
-    if(${BUILD_WITH_S3})
-        target_include_directories(
-                common
+      PUBLIC "$ENV{HOME}/.cos-local.2/include"
+    )
 
-                PUBLIC "$ENV{HOME}/.cos-local.2/include"
-        )
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+    set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
+    find_library(S3_LIBRARY s3)
+    find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+    find_library(XML2_LIBRARY xml2)
+    find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+    find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+    target_link_libraries(
+      common
 
-        set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-        set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
-        find_library(S3_LIBRARY s3)
-        find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-        find_library(XML2_LIBRARY xml2)
-        find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-        find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-        target_link_libraries(
-                common
+      # s3
+      PUBLIC ${S3_LIBRARY}
+      PUBLIC ${CURL_LIBRARY}
+      PUBLIC ${SSL_LIBRARY}
+      PUBLIC ${CRYPTO_LIBRARY}
+      PUBLIC ${XML2_LIBRARY}
+    )
 
-                # s3
-                PUBLIC ${S3_LIBRARY}
-                PUBLIC ${CURL_LIBRARY}
-                PUBLIC ${SSL_LIBRARY}
-                PUBLIC ${CRYPTO_LIBRARY}
-                PUBLIC ${XML2_LIBRARY}
-        )
+    add_definitions(-DUSE_S3)
+  endif()
 
-        add_definitions(-DUSE_S3)
+  if(${BUILD_WITH_COS})
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+    find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
+    find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
+    find_library(MINIXML_LIBRARY mxml)
+    find_library(CURL_LIBRARY curl)
+    target_link_libraries(
+      common
+
+      # s3
+      PUBLIC cos_c_sdk_static
+      PUBLIC ${APR_UTIL_LIBRARY}
+      PUBLIC ${APR_LIBRARY}
+      PUBLIC ${MINIXML_LIBRARY}
+      PUBLIC ${CURL_LIBRARY}
+    )
+
+    # s3
+    FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/)
+
+    if(APR_CONFIG_BIN)
+      EXECUTE_PROCESS(
+        COMMAND ${APR_CONFIG_BIN} --includedir
+        OUTPUT_VARIABLE APR_INCLUDE_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
     endif()
 
-    if(${BUILD_WITH_COS})
-
-        set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-        find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
-        find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
-        find_library(MINIXML_LIBRARY mxml)
-        find_library(CURL_LIBRARY curl)
-        target_link_libraries(
-                common
-
-                # s3
-                PUBLIC cos_c_sdk_static
-                PUBLIC ${APR_UTIL_LIBRARY}
-                PUBLIC ${APR_LIBRARY}
-                PUBLIC ${MINIXML_LIBRARY}
-                PUBLIC ${CURL_LIBRARY}
-        )
-
-        # s3
-        FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/)
-        IF (APR_CONFIG_BIN)
-            EXECUTE_PROCESS(
-                    COMMAND ${APR_CONFIG_BIN} --includedir
-                    OUTPUT_VARIABLE APR_INCLUDE_DIR
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-        ENDIF()
-        include_directories (${APR_INCLUDE_DIR})
-        target_include_directories(
-                common
-                PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
-                PUBLIC "$ENV{HOME}/.cos-local.1/include"
-        )
-
-        add_definitions(-DUSE_COS)
-    endif(${BUILD_WITH_COS})
+    include_directories(${APR_INCLUDE_DIR})
+    target_include_directories(
+      common
+      PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
+      PUBLIC "$ENV{HOME}/.cos-local.1/include"
+    )
 
+    add_definitions(-DUSE_COS)
+  endif(${BUILD_WITH_COS})
 endif()
 
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+  ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/dnode/mgmt/CMakeLists.txt

@@ -10,29 +10,28 @@ add_subdirectory(test)
 aux_source_directory(exe EXEC_SRC)
 add_executable(taosd ${EXEC_SRC})
 target_include_directories(
-    taosd
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc"
+  taosd
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc"
 )
 
-IF (TD_ENTERPRISE)
+IF(TD_ENTERPRISE)
   IF(${BUILD_WITH_S3})
-      add_definitions(-DUSE_S3)
+    add_definitions(-DUSE_S3)
   ELSEIF(${BUILD_WITH_COS})
-      add_definitions(-DUSE_COS)
+    add_definitions(-DUSE_COS)
   ENDIF()
 ENDIF()
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
   ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
   SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
-ELSE ()
+ELSE()
   SET(LINK_JEMALLOC "")
-ENDIF ()
-
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
-    ADD_DEPENDENCIES(taosd jemalloc)
-    target_link_libraries(taosd dnode crypt ${LINK_JEMALLOC})
-ELSE ()
-    target_link_libraries(taosd dnode crypt)
-ENDIF ()
+ENDIF()
 
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
+  ADD_DEPENDENCIES(taosd jemalloc)
+  target_link_libraries(taosd dnode crypt ${LINK_JEMALLOC})
+ELSE()
+  target_link_libraries(taosd dnode crypt)
+ENDIF()

source/dnode/mgmt/mgmt_dnode/CMakeLists.txt

@@ -1,24 +1,25 @@
 aux_source_directory(src MGMT_DNODE)
 add_library(mgmt_dnode STATIC ${MGMT_DNODE})
-if (DEFINED GRANT_CFG_INCLUDE_DIR)
+
+if(DEFINED GRANT_CFG_INCLUDE_DIR)
   add_definitions(-DGRANTS_CFG)
 endif()
 
-IF (NOT BUILD_DM_MODULE)
+if(NOT BUILD_DM_MODULE)
   MESSAGE(STATUS "NOT BUILD_DM_MODULE")
   target_link_directories(
     mgmt_dnode
     PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/dm_static"
   )
-ELSE()
-  MESSAGE(STATUS "BUILD_DM_MODULE")  
-ENDIF()
+else()
+  MESSAGE(STATUS "BUILD_DM_MODULE")
+endif()
 
 target_include_directories(
-    mgmt_dnode
-    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-    PUBLIC "${GRANT_CFG_INCLUDE_DIR}"
+  mgmt_dnode
+  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  PUBLIC "${GRANT_CFG_INCLUDE_DIR}"
 )
 target_link_libraries(
-    mgmt_dnode node_util dmodule
+  mgmt_dnode node_util dmodule
 )

source/dnode/mgmt/mgmt_vnode/src/vmInt.c

@@ -213,13 +213,13 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode, bool commitAndRemoveWal)
         taosQueueGetThreadId(pVnode->pApplyW.queue));
   tMultiWorkerCleanup(&pVnode->pApplyW);
 
-  dInfo("vgId:%d, wait for vnode query queue:%p is empty", pVnode->vgId, pVnode->pQueryQ);
-  while (!taosQueueEmpty(pVnode->pQueryQ)) taosMsleep(10);
-
   dInfo("vgId:%d, wait for vnode fetch queue:%p is empty, thread:%08" PRId64, pVnode->vgId, pVnode->pFetchQ,
         taosQueueGetThreadId(pVnode->pFetchQ));
   while (!taosQueueEmpty(pVnode->pFetchQ)) taosMsleep(10);
 
+  dInfo("vgId:%d, wait for vnode query queue:%p is empty", pVnode->vgId, pVnode->pQueryQ);
+  while (!taosQueueEmpty(pVnode->pQueryQ)) taosMsleep(10);
+
   tqNotifyClose(pVnode->pImpl->pTq);
   dInfo("vgId:%d, wait for vnode stream queue:%p is empty", pVnode->vgId, pVnode->pStreamQ);
   while (!taosQueueEmpty(pVnode->pStreamQ)) taosMsleep(10);

source/dnode/mgmt/node_mgmt/CMakeLists.txt

@@ -1,22 +1,22 @@
 aux_source_directory(src IMPLEMENT_SRC)
 add_library(dnode STATIC ${IMPLEMENT_SRC})
 target_link_libraries(
-    dnode mgmt_mnode mgmt_qnode mgmt_snode mgmt_vnode mgmt_dnode monitorfw tcs
+  dnode mgmt_mnode mgmt_qnode mgmt_snode mgmt_vnode mgmt_dnode monitorfw tcs
 )
 
-IF (TD_ENTERPRISE)
+IF(TD_ENTERPRISE)
   IF(${BUILD_WITH_S3})
-      add_definitions(-DUSE_S3)
+    add_definitions(-DUSE_S3)
   ELSEIF(${BUILD_WITH_COS})
-      add_definitions(-DUSE_COS)
+    add_definitions(-DUSE_COS)
   ENDIF()
 ENDIF()
 
-IF (DEFINED GRANT_CFG_INCLUDE_DIR)
+IF(DEFINED GRANT_CFG_INCLUDE_DIR)
   add_definitions(-DGRANTS_CFG)
 ENDIF()
 
 target_include_directories(
-    dnode
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  dnode
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )

source/dnode/mnode/impl/CMakeLists.txt

@@ -1,44 +1,46 @@
 aux_source_directory(src MNODE_SRC)
-IF (TD_PRIVILEGE)
+
+if(TD_PRIVILEGE)
   ADD_DEFINITIONS(-D_PRIVILEGE)
-ENDIF ()
-IF (TD_ENTERPRISE)
+endif()
+
+if(TD_ENTERPRISE)
   LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/privilege/src/privilege.c)
   LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDb.c)
   LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndVgroup.c)
   LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDnode.c)
   LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/mndView.c)
 
-  IF(${BUILD_WITH_S3})
+  if(${BUILD_WITH_S3})
     add_definitions(-DUSE_S3)
   ELSEIF(${BUILD_WITH_COS})
     add_definitions(-DUSE_COS)
-  ENDIF()
+  endif()
 
-  IF(${BUILD_WITH_ANALYSIS})
+  if(${BUILD_WITH_ANALYSIS})
     add_definitions(-DUSE_ANAL)
-  ENDIF()
-ENDIF ()
+  endif()
+endif()
 
 add_library(mnode STATIC ${MNODE_SRC})
 target_include_directories(
-    mnode
-    PUBLIC "${TD_SOURCE_DIR}/include/dnode/mnode"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  mnode
+  PUBLIC "${TD_SOURCE_DIR}/include/dnode/mnode"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser audit monitorfw
+  mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser audit monitorfw
 )
 
-IF (DEFINED GRANT_CFG_INCLUDE_DIR)
+if(DEFINED GRANT_CFG_INCLUDE_DIR)
   add_definitions(-DGRANTS_CFG)
-ENDIF()
+endif()
 
-IF (TD_GRANT)
+if(TD_GRANT)
   TARGET_LINK_LIBRARIES(mnode grant)
   ADD_DEFINITIONS(-D_GRANT)
-ENDIF ()
+endif()
 
 if(${BUILD_TEST})
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif(${BUILD_TEST})

source/dnode/vnode/CMakeLists.txt

@@ -1,24 +1,26 @@
 # vnode
 add_subdirectory(src/tqCommon)
 add_library(vnode STATIC "")
+
 if(${TD_DARWIN})
     target_compile_options(vnode PRIVATE -Wno-error=single-bit-bitfield-constant-conversion)
 endif(${TD_DARWIN})
+
 set(
-  VNODE_SOURCE_FILES
-  "src/vnd/vnodeOpen.c"
-  "src/vnd/vnodeBufPool.c"
-  "src/vnd/vnodeCfg.c"
-  "src/vnd/vnodeCommit.c"
-  "src/vnd/vnodeQuery.c"
-  "src/vnd/vnodeModule.c"
-  "src/vnd/vnodeSvr.c"
-  "src/vnd/vnodeSync.c"
-  "src/vnd/vnodeSnapshot.c"
-  "src/vnd/vnodeRetention.c"
-  "src/vnd/vnodeInitApi.c"
-  "src/vnd/vnodeAsync.c"
-  "src/vnd/vnodeHash.c"
+    VNODE_SOURCE_FILES
+    "src/vnd/vnodeOpen.c"
+    "src/vnd/vnodeBufPool.c"
+    "src/vnd/vnodeCfg.c"
+    "src/vnd/vnodeCommit.c"
+    "src/vnd/vnodeQuery.c"
+    "src/vnd/vnodeModule.c"
+    "src/vnd/vnodeSvr.c"
+    "src/vnd/vnodeSync.c"
+    "src/vnd/vnodeSnapshot.c"
+    "src/vnd/vnodeRetention.c"
+    "src/vnd/vnodeInitApi.c"
+    "src/vnd/vnodeAsync.c"
+    "src/vnd/vnodeHash.c"
 
     # meta
     "src/meta/metaOpen.c"
@@ -40,23 +42,23 @@ set(
     "src/sma/smaSnapshot.c"
     "src/sma/smaTimeRange.c"
 
-  # # tsdb
-  # "src/tsdb/tsdbCommit.c"
-  # "src/tsdb/tsdbFile.c"
-  # "src/tsdb/tsdbFS.c"
-  # "src/tsdb/tsdbOpen.c"
-  # "src/tsdb/tsdbMemTable.c"
-  # "src/tsdb/tsdbRead.c"
-  # "src/tsdb/tsdbCache.c"
-  # "src/tsdb/tsdbWrite.c"
-  # "src/tsdb/tsdbReaderWriter.c"
-  # "src/tsdb/tsdbUtil.c"
-  # "src/tsdb/tsdbSnapshot.c"
-  # "src/tsdb/tsdbCacheRead.c"
-  # "src/tsdb/tsdbRetention.c"
-  # "src/tsdb/tsdbDiskData.c"
-  # "src/tsdb/tsdbMergeTree.c"
-  # "src/tsdb/tsdbDataIter.c"
+    # # tsdb
+    # "src/tsdb/tsdbCommit.c"
+    # "src/tsdb/tsdbFile.c"
+    # "src/tsdb/tsdbFS.c"
+    # "src/tsdb/tsdbOpen.c"
+    # "src/tsdb/tsdbMemTable.c"
+    # "src/tsdb/tsdbRead.c"
+    # "src/tsdb/tsdbCache.c"
+    # "src/tsdb/tsdbWrite.c"
+    # "src/tsdb/tsdbReaderWriter.c"
+    # "src/tsdb/tsdbUtil.c"
+    # "src/tsdb/tsdbSnapshot.c"
+    # "src/tsdb/tsdbCacheRead.c"
+    # "src/tsdb/tsdbRetention.c"
+    # "src/tsdb/tsdbDiskData.c"
+    # "src/tsdb/tsdbMergeTree.c"
+    # "src/tsdb/tsdbDataIter.c"
 
     # tq
     "src/tq/tq.c"
@@ -71,14 +73,13 @@ set(
     "src/tq/tqSnapshot.c"
     "src/tq/tqStreamStateSnap.c"
     "src/tq/tqStreamTaskSnap.c"
-    
 )
 
 aux_source_directory("src/tsdb/" TSDB_SOURCE_FILES)
 list(
-  APPEND
-  VNODE_SOURCE_FILES
-  ${TSDB_SOURCE_FILES}
+    APPEND
+    VNODE_SOURCE_FILES
+    ${TSDB_SOURCE_FILES}
 )
 
 target_sources(
@@ -87,34 +88,33 @@ target_sources(
     ${VNODE_SOURCE_FILES}
 )
 
-IF (TD_VNODE_PLUGINS)
-  target_sources(
-    vnode
-    PRIVATE
-    ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c
-    ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c
-    ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c
-  )
-ENDIF ()
+if(TD_VNODE_PLUGINS)
+    target_sources(
+        vnode
+        PRIVATE
+        ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c
+        ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c
+        ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c
+    )
+endif()
 
-# IF (NOT ${TD_LINUX})
+# if (NOT ${TD_LINUX})
 # target_include_directories(
-#     vnode
-#     PUBLIC "inc"
-#     PUBLIC "src/inc"
-#     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
-#     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+# vnode
+# PUBLIC "inc"
+# PUBLIC "src/inc"
+# PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+# PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
 # )
 # ELSE()
 # target_include_directories(
-#     vnode
-#     PUBLIC "inc"
-#     PUBLIC "src/inc"
-#     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+# vnode
+# PUBLIC "inc"
+# PUBLIC "src/inc"
+# PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
 # )
-#ENDIF(NOT ${TD_LINUX})
-
-if (${BUILD_CONTRIB})
+# endif(NOT ${TD_LINUX})
+if(${BUILD_CONTRIB})
     target_include_directories(
         vnode
         PUBLIC "inc"
@@ -135,20 +135,21 @@ else()
         PUBLIC "${TD_SOURCE_DIR}/include/libs/crypt"
         PUBLIC "${TD_SOURCE_DIR}/include/dnode/vnode"
     )
-    if (${TD_LINUX})
-    target_include_directories(
-            vnode 
+
+    if(${TD_LINUX})
+        target_include_directories(
+            vnode
             PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
         )
         target_link_directories(
-            vnode 
+            vnode
             PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
         )
     endif()
 endif()
 
 target_link_directories(
-    vnode 
+    vnode
     PUBLIC "${CMAKE_BINARY_DIR}/build/lib"
 )
 
@@ -170,7 +171,7 @@ target_link_libraries(
 
     # PUBLIC bdb
     # PUBLIC scalar
-    #PUBLIC zstd
+    # PUBLIC zstd
     PUBLIC rocksdb
     PUBLIC transport
     PUBLIC stream
@@ -178,9 +179,9 @@ target_link_libraries(
     PUBLIC tqCommon
 )
 
-IF (TD_GRANT)
-  TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
-ENDIF ()
+if(TD_GRANT)
+    TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
+endif()
 
 target_compile_definitions(vnode PUBLIC -DMETA_REFACT)
 

source/dnode/vnode/src/meta/metaOpen.c

@@ -496,6 +496,7 @@ void metaULock(SMeta *pMeta) {
 static void metaCleanup(SMeta **ppMeta) {
   SMeta *pMeta = *ppMeta;
   if (pMeta) {
+    metaInfo("vgId:%d meta clean up, path:%s", TD_VID(pMeta->pVnode), pMeta->path);
     if (pMeta->pEnv) metaAbort(pMeta);
     if (pMeta->pCache) metaCacheClose(pMeta);
 #ifdef BUILD_NO_CALL

source/dnode/vnode/src/tsdb/tsdbCache.c

@@ -3064,9 +3064,8 @@ static int32_t nextRowIterGet(CacheNextRowIter *pIter, TSDBROW **ppRow, bool *pI
 
           iMax[nMax] = i;
           max[nMax++] = pIter->input[i].pRow;
-        } else {
-          pIter->input[i].next = false;
         }
+        pIter->input[i].next = false;
       }
     }
 

source/libs/audit/CMakeLists.txt

@@ -1,7 +1,8 @@
 aux_source_directory(src AUDIT_SRC)
-IF (TD_ENTERPRISE)
+
+IF(TD_ENTERPRISE)
   LIST(APPEND AUDIT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/audit/src/audit.c)
-ENDIF ()
+ENDIF()
 
 add_library(audit STATIC ${AUDIT_SRC})
 target_include_directories(

source/libs/azure/CMakeLists.txt

@@ -1,4 +1,4 @@
-#if(${TD_LINUX})
+# if(${TD_LINUX})
 aux_source_directory(src AZ_SRC)
 
 add_library(az STATIC ${AZ_SRC})
@@ -13,20 +13,21 @@ if(${BUILD_S3})
 endif()
 
 target_include_directories(
-    az
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/azure"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  az
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/azure"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
 target_link_libraries(
-    az
-    PUBLIC cjson
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
+  az
+  PUBLIC cjson
+  PUBLIC os
+  PUBLIC util
+  PUBLIC common
 )
 
 if(${BUILD_TEST})
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif(${BUILD_TEST})
-#endif(${TD_LINUX})
+
+# endif(${TD_LINUX})

source/libs/azure/test/CMakeLists.txt

@@ -1,22 +1,20 @@
-if (TD_LINUX)
+if(TD_LINUX)
+    aux_source_directory(. AZ_TEST_SRC)
 
-aux_source_directory(. AZ_TEST_SRC)
-
-add_executable(azTest ${AZ_TEST_SRC})
-target_include_directories(azTest
-    PUBLIC
-    "${TD_SOURCE_DIR}/include/libs/azure"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
-)
-
-target_link_libraries(azTest
-    az
-    gtest_main
-)
-enable_testing()
-add_test(
-    NAME az_test
-    COMMAND azTest
-)
+    add_executable(azTest ${AZ_TEST_SRC})
+    target_include_directories(azTest
+        PUBLIC
+        "${TD_SOURCE_DIR}/include/libs/azure"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+    )
 
+    target_link_libraries(azTest
+        az
+        gtest_main
+    )
+    enable_testing()
+    add_test(
+        NAME az_test
+        COMMAND azTest
+    )
 endif(TD_LINUX)

source/libs/catalog/CMakeLists.txt

@@ -7,10 +7,10 @@ target_include_directories(
 )
 
 target_link_libraries(
-   catalog
-   PRIVATE os util transport qcom nodes
+    catalog
+    PRIVATE os util transport qcom nodes
 )
 
 # if(${BUILD_TEST})
-#     ADD_SUBDIRECTORY(test)
+# ADD_SUBDIRECTORY(test)
 # endif(${BUILD_TEST})

source/libs/command/CMakeLists.txt

@@ -12,5 +12,5 @@ target_link_libraries(
 )
 
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+        ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/crypt/CMakeLists.txt

@@ -1,8 +1,8 @@
 aux_source_directory(src CRYPT_SRC)
 
-IF (TD_ENTERPRISE)
+IF(TD_ENTERPRISE)
   LIST(APPEND CRYPT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/crypt/cryptImpl.c)
-ENDIF ()
+ENDIF()
 
 add_library(crypt STATIC ${CRYPT_SRC})
 target_include_directories(

source/libs/executor/CMakeLists.txt

@@ -1,24 +1,25 @@
 aux_source_directory(src EXECUTOR_SRC)
 
 add_library(executor STATIC ${EXECUTOR_SRC})
+
 if(${TD_DARWIN})
-    target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype)
+  target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype)
 endif(${TD_DARWIN})
 
-IF(${BUILD_WITH_ANALYSIS})
+if(${BUILD_WITH_ANALYSIS})
   add_definitions(-DUSE_ANAL)
-ENDIF()
+endif()
 
 target_link_libraries(executor
-        PRIVATE os util common function parser planner qcom scalar nodes index wal tdb geometry
-        )
+  PRIVATE os util common function parser planner qcom scalar nodes index wal tdb geometry
+)
 
 target_include_directories(
-        executor
-        PUBLIC "${TD_SOURCE_DIR}/include/libs/executor"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  executor
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/executor"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+  ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/function/CMakeLists.txt

@@ -5,115 +5,114 @@ add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL})
 target_include_directories(
     function
     PUBLIC
-        "${TD_SOURCE_DIR}/include/libs/function"
-        "${TD_SOURCE_DIR}/include/util"
-        "${TD_SOURCE_DIR}/include/common"
-        "${TD_SOURCE_DIR}/include/client"
-        "${TD_SOURCE_DIR}/contrib/libuv/include"
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/contrib/libuv/include"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
-  ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
-  SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
-ELSE ()
-  SET(LINK_JEMALLOC "")
-ENDIF ()
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
+    ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
+    SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
+ELSE()
+    SET(LINK_JEMALLOC "")
+ENDIF()
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(function jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     function
-    PRIVATE os 
-    PRIVATE util 
-    PRIVATE common 
-    PRIVATE nodes 
-    PRIVATE qcom 
-    PRIVATE scalar 
-    PRIVATE geometry 
-    PRIVATE transport 
+    PRIVATE os
+    PRIVATE util
+    PRIVATE common
+    PRIVATE nodes
+    PRIVATE qcom
+    PRIVATE scalar
+    PRIVATE geometry
+    PRIVATE transport
     PUBLIC uv_a
 )
 
 add_executable(runUdf test/runUdf.c)
 target_include_directories(
-        runUdf
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/contrib/libuv/include"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/client"
-            "${TD_SOURCE_DIR}/include/os"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    runUdf
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/contrib/libuv/include"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(runUdf jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
-        runUdf
-        PUBLIC uv_a
-        PRIVATE os util common nodes function ${LINK_JEMALLOC}
+    runUdf
+    PUBLIC uv_a
+    PRIVATE os util common nodes function ${LINK_JEMALLOC}
 )
 
 add_library(udf1 STATIC MODULE test/udf1.c)
 target_include_directories(
-        udf1
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/client"
-            "${TD_SOURCE_DIR}/include/os"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    udf1
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(udf1 jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     udf1 PUBLIC os ${LINK_JEMALLOC})
 
-
 add_library(udf1_dup STATIC MODULE test/udf1_dup.c)
 target_include_directories(
-        udf1_dup
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/client"
-            "${TD_SOURCE_DIR}/include/os"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    udf1_dup
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(udf1_dup jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     udf1_dup PUBLIC os ${LINK_JEMALLOC})
 
 add_library(udf2 STATIC MODULE test/udf2.c)
 target_include_directories(
-        udf2
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/client"
-            "${TD_SOURCE_DIR}/include/os"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    udf2
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(udf2 jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     udf2 PUBLIC os ${LINK_JEMALLOC}
@@ -121,45 +120,44 @@ target_link_libraries(
 
 add_library(udf2_dup STATIC MODULE test/udf2_dup.c)
 target_include_directories(
-        udf2_dup
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/client"
-            "${TD_SOURCE_DIR}/include/os"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    udf2_dup
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/client"
+    "${TD_SOURCE_DIR}/include/os"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(udf2_dup jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     udf2_dup PUBLIC os ${LINK_JEMALLOC}
 )
 
-#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
+# SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
 add_executable(udfd src/udfd.c)
 target_include_directories(
-        udfd
-        PUBLIC
-            "${TD_SOURCE_DIR}/include/libs/function"
-            "${TD_SOURCE_DIR}/contrib/libuv/include"
-            "${TD_SOURCE_DIR}/include/util"
-            "${TD_SOURCE_DIR}/include/common"
-            "${TD_SOURCE_DIR}/include/libs/transport"
-            "${TD_SOURCE_DIR}/include/client"
-        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    udfd
+    PUBLIC
+    "${TD_SOURCE_DIR}/include/libs/function"
+    "${TD_SOURCE_DIR}/contrib/libuv/include"
+    "${TD_SOURCE_DIR}/include/util"
+    "${TD_SOURCE_DIR}/include/common"
+    "${TD_SOURCE_DIR}/include/libs/transport"
+    "${TD_SOURCE_DIR}/include/client"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEPENDENCIES(udfd jemalloc)
-ENDIF ()
+ENDIF()
 
 target_link_libraries(
     udfd
     PUBLIC uv_a
     PRIVATE os util common nodes function ${LINK_JEMALLOC}
-    )
-
+)

source/libs/index/CMakeLists.txt

@@ -1,23 +1,22 @@
 aux_source_directory(src INDEX_SRC)
 add_library(index STATIC ${INDEX_SRC})
 target_include_directories(
-    index
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/index"
-    PUBLIC "${TD_SOURCE_DIR}/include/os"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-    
+  index
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/index"
+  PUBLIC "${TD_SOURCE_DIR}/include/os"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    index 
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
-    PUBLIC nodes
-    PUBLIC scalar 
-    PUBLIC function 
+  index
+  PUBLIC os
+  PUBLIC util
+  PUBLIC common
+  PUBLIC nodes
+  PUBLIC scalar
+  PUBLIC function
 )
 
-if (${BUILD_WITH_LUCENE})
+if(${BUILD_WITH_LUCENE})
   target_include_directories(
     index
     PUBLIC "${TD_SOURCE_DIR}/deps/lucene/include"
@@ -29,12 +28,10 @@ if (${BUILD_WITH_LUCENE})
   )
 endif(${BUILD_WITH_LUCENE})
 
-if (${BUILD_WITH_INVERTEDINDEX})
-  add_definitions(-DUSE_INVERTED_INDEX) 
+if(${BUILD_WITH_INVERTEDINDEX})
+  add_definitions(-DUSE_INVERTED_INDEX)
 endif(${BUILD_WITH_INVERTEDINDEX})
 
-
-if (${BUILD_TEST})
-   add_subdirectory(test)
+if(${BUILD_TEST})
+  add_subdirectory(test)
 endif(${BUILD_TEST})
-

source/libs/monitor/CMakeLists.txt

@@ -9,5 +9,5 @@ target_include_directories(
 target_link_libraries(monitor os util common qcom transport monitorfw)
 
 if(${BUILD_TEST})
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif(${BUILD_TEST})

source/libs/monitorfw/CMakeLists.txt

@@ -5,7 +5,9 @@ target_include_directories(
   PUBLIC "${TD_SOURCE_DIR}/include/libs/monitorfw"
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
+
 if(${TD_DARWIN})
-    target_compile_options(monitorfw PRIVATE -Wno-error=deprecated-pragma)
+  target_compile_options(monitorfw PRIVATE -Wno-error=deprecated-pragma)
 endif(${TD_DARWIN})
+
 target_link_libraries(monitorfw os util common transport)

source/libs/parser/CMakeLists.txt

@@ -1,8 +1,8 @@
 aux_source_directory(src PARSER_SRC)
 
-IF (TD_ENTERPRISE)
-  LIST(APPEND PARSER_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/parserView.c)
-ENDIF ()
+IF(TD_ENTERPRISE)
+        LIST(APPEND PARSER_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/parserView.c)
+ENDIF()
 
 add_library(parser STATIC ${PARSER_SRC})
 target_include_directories(
@@ -17,5 +17,5 @@ target_link_libraries(
 )
 
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+        ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/qworker/CMakeLists.txt

@@ -8,8 +8,8 @@ target_include_directories(
 )
 
 TARGET_LINK_LIBRARIES(qworker
-        PRIVATE os util transport nodes planner qcom executor index
-        )
+    PRIVATE os util transport nodes planner qcom executor index
+)
 
 if(${BUILD_TEST})
     ADD_SUBDIRECTORY(test)

source/libs/qworker/src/qwMsg.c

@@ -502,6 +502,10 @@ int32_t qWorkerProcessQueryMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg, int
 }
 
 int32_t qWorkerProcessCQueryMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg, int64_t ts) {
+  if (NULL == node || NULL == qWorkerMgmt || NULL == pMsg) {
+    QW_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
+  }
+
   int32_t            code = 0;
   int8_t             status = 0;
   bool               queryDone = false;

source/libs/qworker/src/qworker.c

@@ -329,7 +329,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
 
     if (len < 0) {
       QW_TASK_ELOG("invalid length from dsGetDataLength, length:%" PRId64 "", len);
-      QW_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
+      QW_ERR_JRET(TSDB_CODE_QRY_INVALID_INPUT);
     }
 
     if (len == 0) {
@@ -337,18 +337,18 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
         code = dsGetDataBlock(ctx->sinkHandle, &output);
         if (code) {
           QW_TASK_ELOG("dsGetDataBlock failed, code:%x - %s", code, tstrerror(code));
-          QW_ERR_RET(code);
+          QW_ERR_JRET(code);
         }
 
         QW_TASK_DLOG("no more data in sink and query end, fetched blocks %d rows %" PRId64, pOutput->numOfBlocks,
                      pOutput->numOfRows);
 
         if (!ctx->dynamicTask) {
-          QW_ERR_RET(qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC, ctx->dynamicTask));
+          QW_ERR_JRET(qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC, ctx->dynamicTask));
         }
 
         if (NULL == pRsp) {
-          QW_ERR_RET(qwMallocFetchRsp(!ctx->localExec, len, &pRsp));
+          QW_ERR_JRET(qwMallocFetchRsp(!ctx->localExec, len, &pRsp));
           *pOutput = output;
         } else {
           pOutput->queryEnd = output.queryEnd;
@@ -368,7 +368,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
     *dataLen += len + PAYLOAD_PREFIX_LEN;
     *pRawDataLen += rawLen + PAYLOAD_PREFIX_LEN;
 
-    QW_ERR_RET(qwMallocFetchRsp(!ctx->localExec, *dataLen, &pRsp));
+    QW_ERR_JRET(qwMallocFetchRsp(!ctx->localExec, *dataLen, &pRsp));
 
     // set the serialize start position
     output.pData = pRsp->data + *dataLen - (len + PAYLOAD_PREFIX_LEN);
@@ -380,7 +380,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
     code = dsGetDataBlock(ctx->sinkHandle, &output);
     if (code) {
       QW_TASK_ELOG("dsGetDataBlock failed, code:%x - %s", code, tstrerror(code));
-      QW_ERR_RET(code);
+      QW_ERR_JRET(code);
     }
 
     pOutput->queryEnd = output.queryEnd;
@@ -399,7 +399,7 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
     if (DS_BUF_EMPTY == pOutput->bufStatus && pOutput->queryEnd) {
       QW_TASK_DLOG("task all data fetched and done, fetched blocks %d rows %" PRId64, pOutput->numOfBlocks,
                    pOutput->numOfRows);
-      QW_ERR_RET(qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC, ctx->dynamicTask));
+      QW_ERR_JRET(qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC, ctx->dynamicTask));
       break;
     }
 
@@ -416,8 +416,11 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
     }
   }
 
+_return:
+
   *rspMsg = pRsp;
-  return TSDB_CODE_SUCCESS;
+  
+  return code;
 }
 
 int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SDeleteRes *pRes) {
@@ -472,6 +475,12 @@ int32_t qwQuickRspFetchReq(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SQWMsg *qwMsg, int32
         code = qwGetQueryResFromSink(QW_FPARAMS(), ctx, &dataLen, &rawLen, &rsp, &sOutput);
       }
 
+      if (code) {
+        qwFreeFetchRsp(rsp);
+        rsp = NULL;
+        dataLen = 0;
+      }
+
       if (NULL == rsp && TSDB_CODE_SUCCESS == code) {
         return TSDB_CODE_SUCCESS;
       }
@@ -877,10 +886,11 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) {
       break;
     }
 
+    qwFreeFetchRsp(rsp);
+    rsp = NULL;
+
     if (code && QW_EVENT_RECEIVED(ctx, QW_EVENT_FETCH)) {
       QW_SET_EVENT_PROCESSED(ctx, QW_EVENT_FETCH);
-      qwFreeFetchRsp(rsp);
-      rsp = NULL;
 
       qwMsg->connInfo = ctx->dataConnInfo;
       code = qwBuildAndSendFetchRsp(ctx->fetchMsgType + 1, &qwMsg->connInfo, NULL, 0, code);
@@ -1432,6 +1442,8 @@ void qWorkerDestroy(void **qWorkerMgmt) {
   while (0 == destroyed) {
     taosMsleep(2);
   }
+
+  *qWorkerMgmt = NULL;
 }
 
 int32_t qWorkerGetStat(SReadHandle *handle, void *qWorkerMgmt, SQWorkerStat *pStat) {

source/libs/scheduler/CMakeLists.txt

@@ -13,5 +13,5 @@ target_link_libraries(
 )
 
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+        ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/stream/CMakeLists.txt

@@ -1,61 +1,59 @@
 aux_source_directory(src STREAM_SRC)
 add_library(stream STATIC ${STREAM_SRC})
 target_include_directories(
-    stream
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/stream"
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/tcs"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  stream
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/stream"
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/tcs"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-
 if(${BUILD_WITH_ROCKSDB})
-  if (${BUILD_CONTRIB})
+  if(${BUILD_CONTRIB})
     target_link_libraries(
       stream
       PUBLIC rocksdb tdb tcs
-      PRIVATE  os util transport qcom executor wal index
+      PRIVATE os util transport qcom executor wal index
     )
     target_include_directories(
       stream
       PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
     )
   else()
-    if (TD_LINUX)
+    if(TD_LINUX)
       target_include_directories(
-      stream
-      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-    )
-    target_link_directories(
-      stream 
-      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
-    )
-    target_link_libraries(
-      stream
-      PUBLIC rocksdb tdb tcs
-      PRIVATE  os util transport qcom executor wal index
-    )
-    else() 
+        stream
+        PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+      )
+      target_link_directories(
+        stream
+        PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+      )
       target_link_libraries(
         stream
         PUBLIC rocksdb tdb tcs
-        PRIVATE  os util transport qcom executor wal index
+        PRIVATE os util transport qcom executor wal index
+      )
+    else()
+      target_link_libraries(
+        stream
+        PUBLIC rocksdb tdb tcs
+        PRIVATE os util transport qcom executor wal index
       )
       target_include_directories(
         stream
         PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
       )
     endif()
-  endif() 
+  endif()
+
   add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})
 
-
-#target_link_libraries(
-#    stream
-#    PUBLIC tdb
-#    PRIVATE os util transport qcom executor
-#)
-
+# target_link_libraries(
+# stream
+# PUBLIC tdb
+# PRIVATE os util transport qcom executor
+# )
 if(${BUILD_TEST})
-    ADD_SUBDIRECTORY(test)
+  ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/stream/test/CMakeLists.txt

@@ -1,81 +1,77 @@
-
-
 # bloomFilterTest
 
-#TARGET_LINK_LIBRARIES(streamUpdateTest
-        #PUBLIC os util common gtest gtest_main stream executor index
-        #)
+# TARGET_LINK_LIBRARIES(streamUpdateTest
+# PUBLIC os util common gtest gtest_main stream executor index
+# )
 
-#TARGET_INCLUDE_DIRECTORIES(
-  #streamUpdateTest
-  #PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
-  #PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
-#)
+# TARGET_INCLUDE_DIRECTORIES(
+# streamUpdateTest
+# PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
+# PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
+# )
 
-#ADD_EXECUTABLE(checkpointTest checkpointTest.cpp)
-#TARGET_LINK_LIBRARIES(
-        #checkpointTest
-        #PUBLIC os common gtest stream executor qcom index transport util
-#)
+# ADD_EXECUTABLE(checkpointTest checkpointTest.cpp)
+# TARGET_LINK_LIBRARIES(
+# checkpointTest
+# PUBLIC os common gtest stream executor qcom index transport util
+# )
 
-#TARGET_INCLUDE_DIRECTORIES(
-        #checkpointTest
-        #PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
-#)
+# TARGET_INCLUDE_DIRECTORIES(
+# checkpointTest
+# PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
+# )
 
-#add_executable(backendTest "")
+# add_executable(backendTest "")
 
-#target_sources(backendTest 
-        #PRIVATE
-        #"backendTest.cpp"
-#)
+# target_sources(backendTest
+# PRIVATE
+# "backendTest.cpp"
+# )
 
-#TARGET_LINK_LIBRARIES(
-        #backendTest
-        #PUBLIC rocksdb
-        #PUBLIC os common gtest stream executor qcom index transport util
-#)
+# TARGET_LINK_LIBRARIES(
+# backendTest
+# PUBLIC rocksdb
+# PUBLIC os common gtest stream executor qcom index transport util
+# )
 
-#TARGET_INCLUDE_DIRECTORIES(
-        #backendTest
-        #PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
-        #PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
-#)
+# TARGET_INCLUDE_DIRECTORIES(
+# backendTest
+# PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
+# PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
+# )
 
-#add_test(
-  #NAME streamUpdateTest
-  #COMMAND streamUpdateTest
-#)
+# add_test(
+# NAME streamUpdateTest
+# COMMAND streamUpdateTest
+# )
 
-#add_test(
-  #NAME checkpointTest
-  #COMMAND checkpointTest
-#)
-#add_test(
-  #NAME backendTest
-  #COMMAND backendTest
-#)
+# add_test(
+# NAME checkpointTest
+# COMMAND checkpointTest
+# )
+# add_test(
+# NAME backendTest
+# COMMAND backendTest
+# )
 
+# add_executable(backendTest "")
 
-#add_executable(backendTest "")
+# target_sources(backendTest
+# PUBLIC
+# "backendTest.cpp"
+# )
 
-#target_sources(backendTest
-  #PUBLIC 
-  #"backendTest.cpp"
-#)
-
-#target_include_directories(
-  #backendTest
-  #PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
-  #PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
-#)
-
-#target_link_libraries(
-        #backendTest
-        #PUBLIC rocksdb
-        #PUBLIC os common gtest stream executor qcom index transport util
-#)
+# target_include_directories(
+# backendTest
+# PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
+# PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
+# )
 
+# target_link_libraries(
+# backendTest
+# PUBLIC rocksdb
+# PUBLIC os common gtest stream executor qcom index transport util
+# )
 
 MESSAGE(STATUS "build parser unit test")
 
@@ -86,19 +82,19 @@ IF(NOT TD_DARWIN)
 
         ADD_EXECUTABLE(backendTest ${SOURCE_LIST})
         TARGET_LINK_LIBRARIES(
-          backendTest
-          PUBLIC rocksdb
-          PUBLIC os common gtest stream executor qcom index transport util vnode
+                backendTest
+                PUBLIC rocksdb
+                PUBLIC os common gtest stream executor qcom index transport util vnode
         )
 
         TARGET_INCLUDE_DIRECTORIES(
-                backendTest 
+                backendTest
                 PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
                 PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
         )
 
         ADD_TEST(
-          NAME backendTest 
-          COMMAND backendTest 
+                NAME backendTest
+                COMMAND backendTest
         )
-ENDIF ()
+ENDIF()

source/libs/tcs/CMakeLists.txt

@@ -11,6 +11,7 @@ target_link_libraries(
     tcs
     PUBLIC az
     PUBLIC common
+
     # PUBLIC cjson
     # PUBLIC os
     # PUBLIC util

source/libs/tcs/test/CMakeLists.txt

@@ -1,22 +1,20 @@
-if (TD_LINUX)
+if(TD_LINUX)
+    aux_source_directory(. TCS_TEST_SRC)
 
-aux_source_directory(. TCS_TEST_SRC)
-
-add_executable(tcsTest ${TCS_TEST_SRC})
-target_include_directories(tcsTest
-    PUBLIC
-    "${TD_SOURCE_DIR}/include/libs/tcs"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
-)
-
-target_link_libraries(tcsTest
-    tcs
-    gtest_main
-)
-enable_testing()
-add_test(
-    NAME tcs_test
-    COMMAND tcsTest
-)
+    add_executable(tcsTest ${TCS_TEST_SRC})
+    target_include_directories(tcsTest
+        PUBLIC
+        "${TD_SOURCE_DIR}/include/libs/tcs"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+    )
 
+    target_link_libraries(tcsTest
+        tcs
+        gtest_main
+    )
+    enable_testing()
+    add_test(
+        NAME tcs_test
+        COMMAND tcsTest
+    )
 endif()

source/libs/tfs/CMakeLists.txt

@@ -9,5 +9,5 @@ target_include_directories(
 target_link_libraries(tfs os util common monitor)
 
 if(${BUILD_TEST})
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif(${BUILD_TEST})

source/libs/transport/CMakeLists.txt

@@ -1,34 +1,30 @@
 aux_source_directory(src TRANSPORT_SRC)
 add_library(transport STATIC ${TRANSPORT_SRC})
 target_include_directories(
-    transport
-    PUBLIC "${TD_SOURCE_DIR}/include/libs/transport"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+  transport
+  PUBLIC "${TD_SOURCE_DIR}/include/libs/transport"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
 target_link_libraries(
-    transport
-    PUBLIC lz4_static
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
-    PUBLIC zlibstatic
+  transport
+  PUBLIC lz4_static
+  PUBLIC os
+  PUBLIC util
+  PUBLIC common
+  PUBLIC zlibstatic
 )
-if (${BUILD_WITH_UV_TRANS}) 
-if (${BUILD_WITH_UV})
-  target_link_libraries(
-    transport    
-    PUBLIC uv_a
-  )
-  add_definitions(-DUSE_UV) 
-endif(${BUILD_WITH_UV})
-endif(${BUILD_WITH_UV_TRANS})  
 
-if (${BUILD_TEST})
+if(${BUILD_WITH_UV_TRANS})
+  if(${BUILD_WITH_UV})
+    target_link_libraries(
+      transport
+      PUBLIC uv_a
+    )
+    add_definitions(-DUSE_UV)
+  endif(${BUILD_WITH_UV})
+endif(${BUILD_WITH_UV_TRANS})
+
+if(${BUILD_TEST})
   add_subdirectory(test)
 endif(${BUILD_TEST})
-
-
-
-
-  

source/util/CMakeLists.txt

@@ -1,19 +1,20 @@
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.c.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.c")
 aux_source_directory(src UTIL_SRC)
 add_library(util STATIC ${UTIL_SRC})
-if (DEFINED GRANT_CFG_INCLUDE_DIR)
-  add_definitions(-DGRANTS_CFG)
+
+if(DEFINED GRANT_CFG_INCLUDE_DIR)
+    add_definitions(-DGRANTS_CFG)
 endif()
 
-IF (${ASSERT_NOT_CORE})
+if(${ASSERT_NOT_CORE})
     ADD_DEFINITIONS(-DASSERT_NOT_CORE)
     MESSAGE(STATUS "disable assert core")
-ELSE ()
+else()
     MESSAGE(STATUS "enable assert core")
-ENDIF (${ASSERT_NOT_CORE})
+endif(${ASSERT_NOT_CORE})
 
 if(${BUILD_WITH_ANALYSIS})
-  add_definitions(-DUSE_ANAL)
+    add_definitions(-DUSE_ANAL)
 endif()
 
 target_include_directories(
@@ -34,7 +35,7 @@ target_link_directories(
     PUBLIC "${TD_SOURCE_DIR}/contrib/pcre2"
 )
 
-if (TD_LINUX)
+if(TD_LINUX)
     target_link_libraries(
         util
         PUBLIC os common
@@ -43,10 +44,10 @@ if (TD_LINUX)
     )
 else()
     target_link_libraries(
-    util
-    PUBLIC os common
-    PUBLIC lz4_static pcre2-8
-    PUBLIC api cjson geos_c TSZ
+        util
+        PUBLIC os common
+        PUBLIC lz4_static pcre2-8
+        PUBLIC api cjson geos_c TSZ
     )
 endif()
 

tests/parallel_test/cases.task

@@ -223,6 +223,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/agg_group_NotReturnValue.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/agg_group_NotReturnValue.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/agg_group_NotReturnValue.py -Q 4
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/td-32548.py
 
 ,,y,system-test,./pytest.sh python3 ./test.py -f 3-enterprise/restore/restoreDnode.py -N 5 -M 3 -i False
 ,,y,system-test,./pytest.sh python3 ./test.py -f 3-enterprise/restore/restoreVnode.py -N 5 -M 3 -i False
@@ -1254,7 +1255,7 @@
 ,,y,script,./test.sh -f tsim/query/unionall_as_table.sim
 ,,y,script,./test.sh -f tsim/query/multi_order_by.sim
 ,,y,script,./test.sh -f tsim/query/sys_tbname.sim
-,,y,script,./test.sh -f tsim/query/sort-pre-cols.sim 
+,,y,script,./test.sh -f tsim/query/sort-pre-cols.sim
 ,,y,script,./test.sh -f tsim/query/groupby.sim
 ,,y,script,./test.sh -f tsim/query/groupby_distinct.sim
 ,,y,script,./test.sh -f tsim/query/event.sim
@@ -1262,7 +1263,7 @@
 ,,y,script,./test.sh -f tsim/query/emptyTsRange.sim
 ,,y,script,./test.sh -f tsim/query/emptyTsRange_scl.sim
 ,,y,script,./test.sh -f tsim/query/partitionby.sim
-,,y,script,./test.sh -f tsim/query/tableCount.sim 
+,,y,script,./test.sh -f tsim/query/tableCount.sim
 ,,y,script,./test.sh -f tsim/query/show_db_table_kind.sim
 ,,y,script,./test.sh -f tsim/query/bi_star_table.sim
 ,,y,script,./test.sh -f tsim/query/bi_tag_scan.sim
@@ -1532,8 +1533,8 @@
 ,,n,script,./test.sh -f tsim/tagindex/sma_and_tag_index.sim
 ,,y,script,./test.sh -f tsim/tagindex/indexOverflow.sim
 ,,y,script,./test.sh -f tsim/view/view.sim
-,,y,script,./test.sh -f tsim/query/cache_last.sim 
-,,y,script,./test.sh -f tsim/query/const.sim 
+,,y,script,./test.sh -f tsim/query/cache_last.sim
+,,y,script,./test.sh -f tsim/query/const.sim
 ,,y,script,./test.sh -f tsim/query/nestedJoinView.sim
 
 
@@ -1566,4 +1567,3 @@
 ,,n,docs-examples-test,bash rust.sh
 ,,n,docs-examples-test,bash go.sh
 ,,n,docs-examples-test,bash test_R.sh
-

tests/system-test/2-query/td-32548.py

@@ -0,0 +1,32 @@
+from util.cases import *
+from util.sql import *
+
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), True)
+
+        tdSql.execute("drop database if exists td_32548;")
+        tdSql.execute("create database td_32548 cachemodel 'last_row' keep 3650,3650,3650;")
+
+    def run(self):
+        tdSql.execute("use td_32548;")
+
+        tdSql.execute("create table ntb1 (ts timestamp, ival int);")
+        tdSql.execute("insert into ntb1 values ('2024-07-08 17:54:49.675', 54);")
+
+        tdSql.execute("flush database td_32548;")
+
+        tdSql.execute("insert into ntb1 values ('2024-07-08 17:53:49.675', 53);")
+        tdSql.execute("insert into ntb1 values ('2024-07-08 17:52:49.675', 52);")
+        tdSql.execute("delete from ntb1 where ts = '2024-07-08 17:54:49.675';")
+
+        tdSql.query('select last_row(ts) from ntb1;')
+        tdSql.checkData(0, 0, '2024-07-08 17:53:49.675')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

tools/CMakeLists.txt

@@ -1,21 +1,23 @@
-IF (TD_WEBSOCKET)
-    IF (TD_LINUX)
+IF(TD_WEBSOCKET)
+    IF(TD_LINUX)
         SET(websocket_lib_file "libtaosws.so")
-    ELSEIF (TD_DARWIN)
+    ELSEIF(TD_DARWIN)
         SET(websocket_lib_file "libtaosws.dylib")
-    ENDIF ()
+    ENDIF()
+
     MESSAGE("${Green} use libtaos-ws${ColourReset}")
-    IF (TD_ALPINE)
+
+    IF(TD_ALPINE)
         include(ExternalProject)
         ExternalProject_Add(taosws-rs
-            PREFIX        "taosws-rs"
-            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
-            BUILD_ALWAYS        off
-            DEPENDS             taos
-            BUILD_IN_SOURCE     1
+            PREFIX "taosws-rs"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
             CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
             PATCH_COMMAND
-            COMMAND     git clean -f -d
+            COMMAND git clean -f -d
             BUILD_COMMAND
             COMMAND cargo update
             COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls
@@ -23,18 +25,18 @@ IF (TD_WEBSOCKET)
             COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
             COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
-            )
-    ELSEIF (TD_WINDOWS)
+        )
+    ELSEIF(TD_WINDOWS)
         include(ExternalProject)
         ExternalProject_Add(taosws-rs
-            PREFIX        "taosws-rs"
-            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
-            BUILD_ALWAYS        off
-            DEPENDS             taos
-            BUILD_IN_SOURCE     1
+            PREFIX "taosws-rs"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
             CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
             PATCH_COMMAND
-            COMMAND     git clean -f -d
+            COMMAND git clean -f -d
             BUILD_COMMAND
             COMMAND cargo update
             COMMAND cargo build --release -p taos-ws-sys --features rustls
@@ -43,18 +45,18 @@ IF (TD_WEBSOCKET)
             COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
             COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
-            )
+        )
     ELSE()
         include(ExternalProject)
         ExternalProject_Add(taosws-rs
-            PREFIX        "taosws-rs"
-            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
-            BUILD_ALWAYS        off
-            DEPENDS             taos
-            BUILD_IN_SOURCE     1
+            PREFIX "taosws-rs"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
             CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
             PATCH_COMMAND
-            COMMAND     git clean -f -d
+            COMMAND git clean -f -d
             BUILD_COMMAND
             COMMAND cargo update
             COMMAND cargo build --release -p taos-ws-sys --features rustls
@@ -62,11 +64,11 @@ IF (TD_WEBSOCKET)
             COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
             COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
-            )
-    ENDIF ()
-ENDIF ()
+        )
+    ENDIF()
+ENDIF()
 
-IF (TD_TAOS_TOOLS)
+IF(TD_TAOS_TOOLS)
     INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/tools/taos_tools/deps/avro/lang/c/src)
     INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/client)
     INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common)
@@ -74,69 +76,74 @@ IF (TD_TAOS_TOOLS)
     INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/os)
     INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/libs/transport)
     ADD_SUBDIRECTORY(taos-tools)
-ENDIF ()
+ENDIF()
 
 add_subdirectory(shell)
-IF (TD_BUILD_HTTP)
+
+IF(TD_BUILD_HTTP)
     MESSAGE("")
     MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
     MESSAGE("")
-    #    ADD_SUBDIRECTORY(http)
+
+# ADD_SUBDIRECTORY(http)
 ELSEIF(TD_BUILD_TAOSA_INTERNAL)
     MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
-ELSE ()
+ELSE()
     MESSAGE("")
     MESSAGE("${Green} use taosadapter as httpd, platform is ${PLATFORM_ARCH_STR} ${ColourReset}")
 
     EXECUTE_PROCESS(
-            COMMAND  git rev-parse --abbrev-ref HEAD
-            RESULT_VARIABLE result_taos_version
-            OUTPUT_VARIABLE taos_version
+        COMMAND git rev-parse --abbrev-ref HEAD
+        RESULT_VARIABLE result_taos_version
+        OUTPUT_VARIABLE taos_version
     )
 
     STRING(FIND ${taos_version} release is_release_branch)
 
-    IF ("${is_release_branch}" STREQUAL "0")
+    IF("${is_release_branch}" STREQUAL "0")
         STRING(SUBSTRING "${taos_version}" 12 -1 taos_version)
         STRING(STRIP "${taos_version}" taos_version)
-    ELSE ()
+    ELSE()
         STRING(CONCAT taos_version "_branch_" "${taos_version}")
         STRING(STRIP "${taos_version}" taos_version)
-    ENDIF ()
+    ENDIF()
+
     EXECUTE_PROCESS(
-            COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
     )
     EXECUTE_PROCESS(
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
-            COMMAND git rev-parse HEAD
-            RESULT_VARIABLE commit_sha1
-            OUTPUT_VARIABLE taosadapter_commit_sha1
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+        COMMAND git rev-parse HEAD
+        RESULT_VARIABLE commit_sha1
+        OUTPUT_VARIABLE taosadapter_commit_sha1
     )
-    IF ("${taosadapter_commit_sha1}" STREQUAL "")
+
+    IF("${taosadapter_commit_sha1}" STREQUAL "")
         SET(taosadapter_commit_sha1 "unknown")
-    ELSE ()
-#        STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1)
+    ELSE()
+        # STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1)
         STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1)
-    ENDIF ()
+    ENDIF()
+
     SET(taos_version ${TD_VER_NUMBER})
     MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}")
     EXECUTE_PROCESS(
-            COMMAND cd ..
+        COMMAND cd ..
     )
     MESSAGE("CURRENT SOURCE DIR ${CMAKE_CURRENT_SOURCE_DIR}")
 
-    IF (TD_WINDOWS)
+    IF(TD_WINDOWS)
         MESSAGE("Building taosAdapter on Windows")
         INCLUDE(ExternalProject)
         ExternalProject_Add(taosadapter
-            PREFIX        "taosadapter"
-            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
-            BUILD_ALWAYS         off
-            DEPENDS             taos
-            BUILD_IN_SOURCE     1
+            PREFIX "taosadapter"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
             CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
             PATCH_COMMAND
-            COMMAND     git clean -f -d
+            COMMAND git clean -f -d
             BUILD_COMMAND
             COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client
             COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib
@@ -153,58 +160,61 @@ ELSE ()
             COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
             COMMAND cmake -E echo "Copy taosadapter-debug.exe"
             COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
-            )
-    ELSEIF (TD_DARWIN)
+        )
+    ELSEIF(TD_DARWIN)
         MESSAGE("Building taosAdapter on MACOS")
         INCLUDE(ExternalProject)
         ExternalProject_Add(taosadapter
-                PREFIX        "taosadapter"
-                SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
-                BUILD_ALWAYS         off
-                DEPENDS             taos
-                BUILD_IN_SOURCE     1
-                CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
-                PATCH_COMMAND
-                COMMAND     git clean -f -d
-                BUILD_COMMAND
-                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
-                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
-                INSTALL_COMMAND
-                COMMAND cmake -E echo "Copy taosadapter"
-                COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
-                COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
-                COMMAND cmake -E echo "Copy taosadapter.toml"
-                COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
-                COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
-                COMMAND cmake -E echo "Copy taosadapter-debug"
-                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
-                )
-    ELSE ()
-        MESSAGE("Building taosAdapter on non-Windows")
-        INCLUDE(ExternalProject)
-        ExternalProject_Add(taosadapter
-            PREFIX        "taosadapter"
-            SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
-            BUILD_ALWAYS         off
-            DEPENDS             taos
-            BUILD_IN_SOURCE     1
+            PREFIX "taosadapter"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
             CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
             PATCH_COMMAND
-            COMMAND     git clean -f -d
+            COMMAND git clean -f -d
             BUILD_COMMAND
-            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
-#            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
+            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-s -w -X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
+            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
             INSTALL_COMMAND
-#            COMMAND cmake -E echo "Comparessing taosadapter.exe"
-#            COMMAND upx taosadapter || :
             COMMAND cmake -E echo "Copy taosadapter"
             COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
             COMMAND cmake -E echo "Copy taosadapter.toml"
             COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
             COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
-#            COMMAND cmake -E echo "Copy taosadapter-debug"
-#            COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
-            )
-    ENDIF ()
-ENDIF ()
+            COMMAND cmake -E echo "Copy taosadapter-debug"
+            COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+        )
+    ELSE()
+        MESSAGE("Building taosAdapter on non-Windows")
+        INCLUDE(ExternalProject)
+        ExternalProject_Add(taosadapter
+            PREFIX "taosadapter"
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+            BUILD_ALWAYS off
+            DEPENDS taos
+            BUILD_IN_SOURCE 1
+            CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+            PATCH_COMMAND
+            COMMAND git clean -f -d
+            BUILD_COMMAND
+            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
+
+            # COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
+            INSTALL_COMMAND
+
+            # COMMAND cmake -E echo "Comparessing taosadapter.exe"
+            # COMMAND upx taosadapter || :
+            COMMAND cmake -E echo "Copy taosadapter"
+            COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
+            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+            COMMAND cmake -E echo "Copy taosadapter.toml"
+            COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+            COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+
+            # COMMAND cmake -E echo "Copy taosadapter-debug"
+            # COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+        )
+    ENDIF()
+ENDIF()

tools/shell/CMakeLists.txt

@@ -2,41 +2,41 @@ aux_source_directory(src SHELL_SRC)
 
 add_executable(shell ${SHELL_SRC})
 
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
     ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
     SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
     ADD_DEPENDENCIES(shell jemalloc)
-ELSE ()
+ELSE()
     SET(LINK_JEMALLOC "")
-ENDIF ()
+ENDIF()
 
-IF (TD_LINUX AND TD_WEBSOCKET)
+IF(TD_LINUX AND TD_WEBSOCKET)
     ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include -ltaosws)
     SET(LINK_WEBSOCKET "-L${CMAKE_BINARY_DIR}/build/lib -ltaosws")
     ADD_DEPENDENCIES(shell taosws-rs)
-ELSEIF (TD_DARWIN AND TD_WEBSOCKET)
+ELSEIF(TD_DARWIN AND TD_WEBSOCKET)
     ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
     SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/libtaosws.dylib")
     ADD_DEPENDENCIES(shell taosws-rs)
-ELSEIF (TD_WINDOWS AND TD_WEBSOCKET)
+ELSEIF(TD_WINDOWS AND TD_WEBSOCKET)
     ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
     SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/taosws.lib")
     ADD_DEPENDENCIES(shell taosws-rs)
-ELSE ()
+ELSE()
     SET(LINK_WEBSOCKET "")
-ENDIF ()
+ENDIF()
 
-IF (TD_LINUX AND TD_ALPINE)
+IF(TD_LINUX AND TD_ALPINE)
     SET(LINK_ARGP "/usr/lib/libargp.a")
-ELSE ()
+ELSE()
     SET(LINK_ARGP "")
-ENDIF ()
+ENDIF()
 
 if(TD_WINDOWS)
     target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET})
 else()
     target_link_libraries(shell PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
-endif ()
+endif()
 
 target_link_libraries(
     shell

utils/CMakeLists.txt

@@ -1,8 +1,8 @@
-#ADD_SUBDIRECTORY(examples/c)
+# ADD_SUBDIRECTORY(examples/c)
 ADD_SUBDIRECTORY(tsim)
 ADD_SUBDIRECTORY(test/c)
-#ADD_SUBDIRECTORY(comparisonTest/tdengine)
 
-IF (NOT "${TSZ_ENABLED}" MATCHES "false")
+# ADD_SUBDIRECTORY(comparisonTest/tdengine)
+IF(NOT "${TSZ_ENABLED}" MATCHES "false")
   ADD_SUBDIRECTORY(TSZ)
 ENDIF()

utils/TSZ/CMakeLists.txt

@@ -6,22 +6,20 @@ INCLUDE_DIRECTORIES(sz/inc)
 INCLUDE_DIRECTORIES(zstd/)
 INCLUDE_DIRECTORIES(zstd/common/)
 
-
 # source
-AUX_SOURCE_DIRECTORY(sz/src           SRC1)
+AUX_SOURCE_DIRECTORY(sz/src SRC1)
 AUX_SOURCE_DIRECTORY(zstd/dictBuilder SRC2)
-AUX_SOURCE_DIRECTORY(zstd/common      SRC3)
-AUX_SOURCE_DIRECTORY(zstd/compress    SRC4)
-AUX_SOURCE_DIRECTORY(zstd/decompress  SRC5)
-AUX_SOURCE_DIRECTORY(zstd/deprecated  SRC6)
-AUX_SOURCE_DIRECTORY(zstd/legacy      SRC7)
-
+AUX_SOURCE_DIRECTORY(zstd/common SRC3)
+AUX_SOURCE_DIRECTORY(zstd/compress SRC4)
+AUX_SOURCE_DIRECTORY(zstd/decompress SRC5)
+AUX_SOURCE_DIRECTORY(zstd/deprecated SRC6)
+AUX_SOURCE_DIRECTORY(zstd/legacy SRC7)
 
 # archive
 ADD_LIBRARY(TSZ STATIC ${SRC1} ${SRC2} ${SRC3} ${SRC4} ${SRC5} ${SRC6} ${SRC7})
 TARGET_INCLUDE_DIRECTORIES(TSZ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/sz/inc ${TD_SOURCE_DIR}/include)
 
 # windows ignore warning
-IF (TD_WINDOWS)
- SET_TARGET_PROPERTIES(TSZ PROPERTIES COMPILE_FLAGS -w)
-ENDIF ()
+IF(TD_WINDOWS)
+    SET_TARGET_PROPERTIES(TSZ PROPERTIES COMPILE_FLAGS -w)
+ENDIF()

utils/test/c/CMakeLists.txt

@@ -17,7 +17,7 @@ add_executable(varbinary_test varbinary_test.c)
 add_executable(replay_test replay_test.c)
 
 if(${TD_LINUX})
-add_executable(tsz_test tsz_test.c)
+    add_executable(tsz_test tsz_test.c)
 endif(${TD_LINUX})
 
 target_link_libraries(
@@ -124,7 +124,6 @@ target_link_libraries(
     PUBLIC common
     PUBLIC os
     PUBLIC geometry
-
 )
 
 target_link_libraries(
@@ -144,11 +143,11 @@ target_link_libraries(
 )
 
 if(${TD_LINUX})
-target_link_libraries(
-    tsz_test
-    PUBLIC taos
-    PUBLIC util
-    PUBLIC common
-    PUBLIC os
-)
+    target_link_libraries(
+        tsz_test
+        PUBLIC taos
+        PUBLIC util
+        PUBLIC common
+        PUBLIC os
+    )
 endif(${TD_LINUX})