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

merge: from main to 3.0 branch

CMakeLists.txt

@@ -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)
 

cmake/cmake.define

@@ -12,15 +12,15 @@ 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)
+IF(NOT DEFINED TD_GRANT)
     SET(TD_GRANT FALSE)
-endif()
+ENDIF()
 
 IF(NOT DEFINED BUILD_WITH_RAND_ERR)
     SET(BUILD_WITH_RAND_ERR FALSE)
 ELSE()
     SET(BUILD_WITH_RAND_ERR TRUE)
-endif()
+ENDIF()
 
 IF("${WEBSOCKET}" MATCHES "true")
     SET(TD_WEBSOCKET TRUE)
@@ -101,8 +101,10 @@ 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")
@@ -113,18 +115,22 @@ IF (TD_WINDOWS)
     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")
     # ENDIF ()
     IF(CMAKE_DEPFILE_FLAGS_C)
         SET(CMAKE_DEPFILE_FLAGS_C "")
     ENDIF()
+
     IF(CMAKE_DEPFILE_FLAGS_CXX)
         SET(CMAKE_DEPFILE_FLAGS_CXX "")
     ENDIF()
+
     IF(CMAKE_C_FLAGS_DEBUG)
         SET(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)
     ENDIF()
+
     IF(CMAKE_CXX_FLAGS_DEBUG)
         SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
     ENDIF()
@@ -136,6 +142,7 @@ ELSE ()
     IF(${TD_DARWIN})
         set(CMAKE_MACOSX_RPATH 0)
     ENDIF()
+
     IF(${COVER} MATCHES "true")
         MESSAGE(STATUS "Test coverage mode, add extra flags")
         SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
@@ -151,6 +158,7 @@ ELSE ()
     ENDIF()
 
     INCLUDE(CheckCCompilerFlag)
+
     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"))
@@ -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;
             }
           }
@@ -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;
             }
           }
@@ -224,11 +232,13 @@ ELSE ()
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfma")
             MESSAGE(STATUS "FMA instructions is ACTIVATED")
         ENDIF()
+
         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)
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
@@ -256,6 +266,7 @@ ELSE ()
 
     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!")
@@ -266,5 +277,4 @@ 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()

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,7 +10,6 @@ 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})
 
@@ -39,10 +38,8 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
     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})
 
@@ -115,7 +112,6 @@ cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 # lzma2
 cat("${TD_SUPPORT_DIR}/lzma_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
-
 if(${BUILD_CONTRIB})
     if(${BUILD_WITH_ROCKSDB})
         cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
@@ -163,7 +159,6 @@ elseif(${BUILD_WITH_COS})
     # 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
@@ -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,6 +234,7 @@ 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>
 )
@@ -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
@@ -296,7 +296,8 @@ 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})
@@ -306,10 +307,12 @@ 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 "")
                 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})
 
@@ -325,14 +328,15 @@ if (${BUILD_WITH_ROCKSDB})
             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)
@@ -361,6 +365,7 @@ if (${BUILD_WITH_ROCKSDB})
         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")
@@ -374,14 +379,15 @@ if (${BUILD_WITH_ROCKSDB})
                 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,22 +413,23 @@ 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")
 
+        # 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)
@@ -435,9 +442,7 @@ elseif(${BUILD_WITH_COS})
 
         set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
     else()
-
     endif(${TD_LINUX})
-
 endif()
 
 # pthread
@@ -445,6 +450,7 @@ if(${BUILD_PTHREAD})
     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,7 +458,6 @@ if(${BUILD_PTHREAD})
     target_link_libraries(pthread INTERFACE libpthreadVC3)
 endif()
 
-
 # jemalloc
 if(${JEMALLOC_ENABLED})
     include(ExternalProject)
@@ -521,6 +526,7 @@ if(${BUILD_WITH_UV})
         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()
+
     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
@@ -573,9 +580,11 @@ if(${BUILD_ADDR2LINE})
         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}")
@@ -593,18 +602,22 @@ 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 "")
             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})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     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>
@@ -622,7 +635,6 @@ endif()
 # ================================================================================================
 # Build test
 # ================================================================================================
-
 MESSAGE("build with dependency tests: ${BUILD_DEPENDENCY_TESTS}")
 
 if(${BUILD_DEPENDENCY_TESTS})

contrib/azure-cmake/CMakeLists.txt

@@ -37,21 +37,24 @@ target_compile_definitions(_azure_sdk PRIVATE BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 
 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(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)
-
 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}
 )

contrib/test/azure/CMakeLists.txt

@@ -8,12 +8,13 @@ add_executable (
 
 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(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)
-
 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/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     | 自定义    | 几何类型
+| 17  |      GEOMETRY     | 自定义    | 几何类型，3.1.0.0 版本开始支持
-| 18  |      VARBINARY     | 自定义    | 可变长的二进制数据|
+| 18  |      VARBINARY     | 自定义    | 可变长的二进制数据， 3.1.1.0 版本开始支持|
 
 :::note
 

source/client/CMakeLists.txt

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

source/common/CMakeLists.txt

@@ -1,7 +1,8 @@
 aux_source_directory(src COMMON_SRC)
-IF (TD_ENTERPRISE)
+
+if(TD_ENTERPRISE)
   LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c)
-ENDIF()
+endif()
 
 add_library(common STATIC ${COMMON_SRC})
 
@@ -9,22 +10,22 @@ 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(TD_ENTERPRISE)
-  IF(${BUILD_WITH_S3})
+  if(${BUILD_WITH_S3})
     add_definitions(-DUSE_S3)
   ELSEIF(${BUILD_WITH_COS})
     add_definitions(-DUSE_COS)
-  ENDIF()
+  endif()
-ENDIF()
+endif()
 
 target_include_directories(
   common
@@ -32,13 +33,14 @@ target_include_directories(
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
   PRIVATE "${GRANT_CFG_INCLUDE_DIR}"
 )
-IF(${TD_WINDOWS})
+
+if(${TD_WINDOWS})
   target_include_directories(
     common
     PRIVATE "${TD_SOURCE_DIR}/contrib/pthread"
     PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex"
   )
-ENDIF ()
+endif()
 
 target_link_libraries(
   common
@@ -48,7 +50,6 @@ target_link_libraries(
 )
 
 if(${BUILD_S3})
-
   if(${BUILD_WITH_S3})
     target_include_directories(
       common
@@ -78,7 +79,6 @@ if(${BUILD_S3})
   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/)
@@ -97,13 +97,15 @@ if(${BUILD_S3})
 
     # 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)
+
+    if(APR_CONFIG_BIN)
       EXECUTE_PROCESS(
         COMMAND ${APR_CONFIG_BIN} --includedir
         OUTPUT_VARIABLE APR_INCLUDE_DIR
         OUTPUT_STRIP_TRAILING_WHITESPACE
       )
-        ENDIF()
+    endif()
+
     include_directories(${APR_INCLUDE_DIR})
     target_include_directories(
       common
@@ -113,7 +115,6 @@ if(${BUILD_S3})
 
     add_definitions(-DUSE_COS)
   endif(${BUILD_WITH_COS})
-
 endif()
 
 if(${BUILD_TEST})

source/dnode/mgmt/CMakeLists.txt

@@ -35,4 +35,3 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
 ELSE()
   target_link_libraries(taosd dnode crypt)
 ENDIF()
-

source/dnode/mgmt/mgmt_dnode/CMakeLists.txt

@@ -1,18 +1,19 @@
 aux_source_directory(src MGMT_DNODE)
 add_library(mgmt_dnode STATIC ${MGMT_DNODE})
+
 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()
+else()
   MESSAGE(STATUS "BUILD_DM_MODULE")
-ENDIF()
+endif()
 
 target_include_directories(
   mgmt_dnode

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/mnode/impl/CMakeLists.txt

@@ -1,24 +1,26 @@
 aux_source_directory(src MNODE_SRC)
-IF (TD_PRIVILEGE)
+
+if(TD_PRIVILEGE)
   ADD_DEFINITIONS(-D_PRIVILEGE)
-ENDIF ()
+endif()
-IF (TD_ENTERPRISE)
+
+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(
@@ -30,14 +32,14 @@ target_link_libraries(
   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)

source/dnode/vnode/CMakeLists.txt

@@ -1,9 +1,11 @@
 # 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"
@@ -71,7 +73,6 @@ set(
     "src/tq/tqSnapshot.c"
     "src/tq/tqStreamStateSnap.c"
     "src/tq/tqStreamTaskSnap.c"
-    
 )
 
 aux_source_directory("src/tsdb/" TSDB_SOURCE_FILES)
@@ -87,7 +88,7 @@ target_sources(
     ${VNODE_SOURCE_FILES}
 )
 
-IF (TD_VNODE_PLUGINS)
+if(TD_VNODE_PLUGINS)
     target_sources(
         vnode
         PRIVATE
@@ -95,9 +96,9 @@ IF (TD_VNODE_PLUGINS)
         ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c
         ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c
     )
-ENDIF ()
+endif()
 
-# IF (NOT ${TD_LINUX})
+# if (NOT ${TD_LINUX})
 # target_include_directories(
 # vnode
 # PUBLIC "inc"
@@ -112,8 +113,7 @@ ENDIF ()
 # PUBLIC "src/inc"
 # PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
 # )
-#ENDIF(NOT ${TD_LINUX})
+# endif(NOT ${TD_LINUX})
-
 if(${BUILD_CONTRIB})
     target_include_directories(
         vnode
@@ -135,6 +135,7 @@ else()
         PUBLIC "${TD_SOURCE_DIR}/include/libs/crypt"
         PUBLIC "${TD_SOURCE_DIR}/include/dnode/vnode"
     )
+
     if(${TD_LINUX})
         target_include_directories(
             vnode
@@ -178,9 +179,9 @@ target_link_libraries(
     PUBLIC tqCommon
 )
 
-IF (TD_GRANT)
+if(TD_GRANT)
     TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
-ENDIF ()
+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,4 +1,5 @@
 aux_source_directory(src AUDIT_SRC)
+
 IF(TD_ENTERPRISE)
   LIST(APPEND AUDIT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/audit/src/audit.c)
 ENDIF()

source/libs/azure/CMakeLists.txt

@@ -29,4 +29,5 @@ target_link_libraries(
 if(${BUILD_TEST})
   add_subdirectory(test)
 endif(${BUILD_TEST})
+
 # endif(${TD_LINUX})

source/libs/azure/test/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(TD_LINUX)
-
     aux_source_directory(. AZ_TEST_SRC)
 
     add_executable(azTest ${AZ_TEST_SRC})
@@ -18,5 +17,4 @@ add_test(
         NAME az_test
         COMMAND azTest
     )
-
 endif(TD_LINUX)

source/libs/executor/CMakeLists.txt

@@ -1,13 +1,14 @@
 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)
 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

source/libs/function/CMakeLists.txt

@@ -79,7 +79,6 @@ ENDIF ()
 target_link_libraries(
     udf1 PUBLIC os ${LINK_JEMALLOC})
 
-
 add_library(udf1_dup STATIC MODULE test/udf1_dup.c)
 target_include_directories(
     udf1_dup
@@ -162,4 +161,3 @@ target_link_libraries(
     PUBLIC uv_a
     PRIVATE os util common nodes function ${LINK_JEMALLOC}
 )
-

source/libs/index/CMakeLists.txt

@@ -5,7 +5,6 @@ target_include_directories(
   PUBLIC "${TD_SOURCE_DIR}/include/libs/index"
   PUBLIC "${TD_SOURCE_DIR}/include/os"
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-    
 )
 target_link_libraries(
   index
@@ -33,8 +32,6 @@ if (${BUILD_WITH_INVERTEDINDEX})
   add_definitions(-DUSE_INVERTED_INDEX)
 endif(${BUILD_WITH_INVERTEDINDEX})
 
-
 if(${BUILD_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)
 endif(${TD_DARWIN})
+
 target_link_libraries(monitorfw os util common transport)

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,11 +886,12 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) {
       break;
     }
 
-    if (code && QW_EVENT_RECEIVED(ctx, QW_EVENT_FETCH)) {
-      QW_SET_EVENT_PROCESSED(ctx, QW_EVENT_FETCH);
     qwFreeFetchRsp(rsp);
     rsp = NULL;
 
+    if (code && QW_EVENT_RECEIVED(ctx, QW_EVENT_FETCH)) {
+      QW_SET_EVENT_PROCESSED(ctx, QW_EVENT_FETCH);
+
       qwMsg->connInfo = ctx->dataConnInfo;
       code = qwBuildAndSendFetchRsp(ctx->fetchMsgType + 1, &qwMsg->connInfo, NULL, 0, code);
       if (TSDB_CODE_SUCCESS != 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/stream/CMakeLists.txt

@@ -7,7 +7,6 @@ target_include_directories(
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
-
 if(${BUILD_WITH_ROCKSDB})
   if(${BUILD_CONTRIB})
     target_link_libraries(
@@ -46,16 +45,15 @@ if(${BUILD_WITH_ROCKSDB})
       )
     endif()
   endif()
+
   add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})
 
-
 # target_link_libraries(
 # stream
 # PUBLIC tdb
 # PRIVATE os util transport qcom executor
 # )
-
 if(${BUILD_TEST})
   ADD_SUBDIRECTORY(test)
 endif(${BUILD_TEST})

source/libs/stream/test/CMakeLists.txt

@@ -1,5 +1,3 @@
-
-
 # bloomFilterTest
 
 # TARGET_LINK_LIBRARIES(streamUpdateTest
@@ -56,7 +54,6 @@
 # COMMAND backendTest
 # )
 
-
 # add_executable(backendTest "")
 
 # target_sources(backendTest
@@ -76,7 +73,6 @@
 # PUBLIC os common gtest stream executor qcom index transport util
 # )
 
-
 MESSAGE(STATUS "build parser unit test")
 
 IF(NOT TD_DARWIN)

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,5 +1,4 @@
 if(TD_LINUX)
-
     aux_source_directory(. TCS_TEST_SRC)
 
     add_executable(tcsTest ${TCS_TEST_SRC})
@@ -18,5 +17,4 @@ add_test(
         NAME tcs_test
         COMMAND tcsTest
     )
-
 endif()

source/libs/transport/CMakeLists.txt

@@ -14,6 +14,7 @@ target_link_libraries(
   PUBLIC common
   PUBLIC zlibstatic
 )
+
 if(${BUILD_WITH_UV_TRANS})
   if(${BUILD_WITH_UV})
     target_link_libraries(
@@ -27,8 +28,3 @@ endif(${BUILD_WITH_UV_TRANS})
 if(${BUILD_TEST})
   add_subdirectory(test)
 endif(${BUILD_TEST})
-
-
-
-
-  

source/util/CMakeLists.txt

@@ -1,16 +1,17 @@
 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)
 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)

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
@@ -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

@@ -4,7 +4,9 @@ IF (TD_WEBSOCKET)
     ELSEIF(TD_DARWIN)
         SET(websocket_lib_file "libtaosws.dylib")
     ENDIF()
+
     MESSAGE("${Green} use libtaos-ws${ColourReset}")
+
     IF(TD_ALPINE)
         include(ExternalProject)
         ExternalProject_Add(taosws-rs
@@ -77,10 +79,12 @@ IF (TD_TAOS_TOOLS)
 ENDIF()
 
 add_subdirectory(shell)
+
 IF(TD_BUILD_HTTP)
     MESSAGE("")
     MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
     MESSAGE("")
+
 # ADD_SUBDIRECTORY(http)
 ELSEIF(TD_BUILD_TAOSA_INTERNAL)
     MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
@@ -103,6 +107,7 @@ ELSE ()
         STRING(CONCAT taos_version "_branch_" "${taos_version}")
         STRING(STRIP "${taos_version}" taos_version)
     ENDIF()
+
     EXECUTE_PROCESS(
         COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
     )
@@ -112,12 +117,14 @@ ELSE ()
         RESULT_VARIABLE commit_sha1
         OUTPUT_VARIABLE taosadapter_commit_sha1
     )
+
     IF("${taosadapter_commit_sha1}" STREQUAL "")
         SET(taosadapter_commit_sha1 "unknown")
     ELSE()
         # STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1)
         STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1)
     ENDIF()
+
     SET(taos_version ${TD_VER_NUMBER})
     MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}")
     EXECUTE_PROCESS(
@@ -193,8 +200,10 @@ ELSE ()
             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"
@@ -203,6 +212,7 @@ ELSE ()
             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
         )

utils/CMakeLists.txt

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

utils/TSZ/CMakeLists.txt

@@ -6,7 +6,6 @@ INCLUDE_DIRECTORIES(sz/inc)
 INCLUDE_DIRECTORIES(zstd/)
 INCLUDE_DIRECTORIES(zstd/common/)
 
-
 # source
 AUX_SOURCE_DIRECTORY(sz/src SRC1)
 AUX_SOURCE_DIRECTORY(zstd/dictBuilder SRC2)
@@ -16,7 +15,6 @@ 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)

utils/test/c/CMakeLists.txt

@@ -124,7 +124,6 @@ target_link_libraries(
     PUBLIC common
     PUBLIC os
     PUBLIC geometry
-
 )
 
 target_link_libraries(