chore: merge 3.0

d093b0e2 · kailixu · 9faefb74 · 9b3e34d5 · d093b0e2 · d093b0e2
784 changed file
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ debug/
 release/
 target/
 debs/
-deps/
 rpms/
 mac/
 *.pyc
@@ -131,3 +130,4 @@ tools/BUGS
 tools/taos-tools
 tools/taosws-rs
 tags
+.clangd
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-yaml
+      - id: check-json
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+repos:
+  - repo: https://github.com/psf/black
+    rev: stable
+    hooks:
+      - id: black
+repos:
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: master
+    hooks:
+      - id: cppcheck
+        args: ["--error-exitcode=0"]
+repos:
+  - repo: https://github.com/crate-ci/typos
+    rev: v1.15.7
+    hooks:
+      - id: typos
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,15 @@ 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)

--- a/CONTRIBUTING-CN.md
+++ b/CONTRIBUTING-CN.md
@@ -18,7 +18,7 @@
   注意：修改文档的分支要以`docs/`为开头，以免进行不必要的测试。
 4. 创建pull request，将自己的分支合并到开发分支`3.0`，我们开发团队将尽快审核。
-如遇任何问题，请添加官方微信TDengineECO。我们的团队会帮忙解决。
+如遇任何问题，请添加官方微信 tdengine1。我们的团队会帮忙解决。
 ## 给贡献者的礼品
@@ -48,4 +48,4 @@ TDengine 社区致力于让更多的开发者理解和使用它。
 ## 联系我们
-如果您有什么问题需要解决，或者有什么问题需要解答，可以添加微信：TDengineECO
+如果您有什么问题需要解决，或者有什么问题需要解答，可以添加微信：tdengine1。
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -314,7 +314,7 @@ def pre_test_build_win() {
        cd %WIN_CONNECTOR_ROOT%
        python.exe -m pip install --upgrade pip
        python -m pip uninstall taospy -y 
-        python -m pip install taospy==2.7.6
+        python -m pip install taospy==2.7.10
        xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
    '''
    return 1

--- a/README-CN.md
+++ b/README-CN.md
@@ -15,7 +15,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=develop)](https://coveralls.io/github/taosdata/TDengine?branch=develop)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4201/badge)](https://bestpractices.coreinfrastructure.org/projects/4201)
-简体中文 | [English](README.md) | 很多职位正在热招中，请看[这里](https://www.taosdata.com/cn/careers/)
+简体中文 | [English](README.md) | [TDengine 云服务](https://cloud.taosdata.com/?utm_medium=cn&utm_source=github) | 很多职位正在热招中，请看[这里](https://www.taosdata.com/cn/careers/)
 # TDengine 简介
@@ -68,14 +68,14 @@ sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-d
 ```bash
 sudo yum install epel-release
 sudo yum update
-sudo yum install -y gcc gcc-c++ make cmake3 git openssl-devel
+sudo yum install -y gcc gcc-c++ make cmake3 gflags git openssl-devel
 sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake
 ```
-### CentOS 8 & Fedora
+### CentOS 8/Fedora/Rocky Linux
 ```bash
-sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
+sudo dnf install -y gcc gcc-c++ gflags make cmake epel-release git openssl-devel
 ```
 #### 在 CentOS 上构建 taosTools 安装依赖软件
@@ -88,7 +88,7 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
 sudo yum install -y zlib-devel zlib-static xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libatomic-static libstdc++-static openssl-devel
 ```
-#### CentOS 8/Rocky Linux 
+#### CentOS 8/Fedora/Rocky Linux 
 ```
 sudo yum install -y epel-release
@@ -101,7 +101,7 @@ sudo yum install -y zlib-devel zlib-static xz-devel snappy-devel jansson jansson
 若 powertools 安装失败，可以尝试改用：
 ```
-sudo yum config-manager --set-enabled Powertools
+sudo yum config-manager --set-enabled powertools
 ```
 #### CentOS + devtoolset
@@ -117,7 +117,7 @@ scl enable devtoolset-9 -- bash
 ### macOS
 ```
-brew install argp-standalone pkgconfig
+brew install argp-standalone gflags pkgconfig
 ```
 ### 设置 golang 开发环境

--- a/README.md
+++ b/README.md
@@ -76,14 +76,14 @@ sudo apt install build-essential libjansson-dev libsnappy-dev liblzma-dev libz-d
 ```bash
 sudo yum install epel-release
 sudo yum update
-sudo yum install -y gcc gcc-c++ make cmake3 git openssl-devel
+sudo yum install -y gcc gcc-c++ make cmake3 gflags git openssl-devel
 sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake
 ```
-### CentOS 8 & Fedora
+### CentOS 8/Fedora/Rocky Linux
 ```bash
-sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
+sudo dnf install -y gcc gcc-c++ make cmake epel-release gflags git openssl-devel
 ```
 #### Install build dependencies for taosTools on CentOS
@@ -94,7 +94,7 @@ sudo dnf install -y gcc gcc-c++ make cmake epel-release git openssl-devel
 sudo yum install -y zlib-devel zlib-static xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libatomic-static libstdc++-static openssl-devel
 ```
-#### CentOS 8/Rocky Linux
+#### CentOS 8/Fedora/Rocky Linux
 ```
 sudo yum install -y epel-release
@@ -124,7 +124,7 @@ scl enable devtoolset-9 -- bash
 ### macOS
 ```
-brew install argp-standalone pkgconfig
+brew install argp-standalone gflags pkgconfig
 ```
 ### Setup golang environment

--- a/cmake/cmake.define
+++ b/cmake/cmake.define
 cmake_minimum_required(VERSION 3.0)
-set(CMAKE_VERBOSE_MAKEFILE OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON)
 set(TD_BUILD_TAOSA_INTERNAL FALSE)
 #set output directory
@@ -115,15 +115,6 @@ ELSE ()
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
    ENDIF ()
-    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} -Werror -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")
-	      MESSAGE(STATUS "Compile with Address Sanitizer!")
-    ELSE ()
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-    ENDIF ()
    # disable all assert
    IF ((${DISABLE_ASSERT} MATCHES "true") OR (${DISABLE_ASSERTS} MATCHES "true"))
        ADD_DEFINITIONS(-DDISABLE_ASSERT)
@@ -165,4 +156,20 @@ ELSE ()
        MESSAGE(STATUS "SIMD instructions (FMA/AVX/AVX2) is ACTIVATED")
    ENDIF()
+    # build mode
+    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})
+        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")
+	      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 ()
+        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 ()
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -64,12 +64,25 @@ IF(${TD_WINDOWS})
            ON
        )
+    MESSAGE("build geos Win32")
+    option(
+            BUILD_GEOS
+            "If build geos on Windows"
+            ON
+        )
 ELSEIF (TD_DARWIN_64)
    IF(${BUILD_TEST})
        add_definitions(-DCOMPILER_SUPPORTS_CXX13)
    ENDIF ()
 ENDIF ()
+option(
+        BUILD_GEOS
+        "If build geos on Windows"
+        ON
+    )
 option(
    BUILD_SHARED_LIBS
    ""
@@ -109,7 +122,7 @@ option(
 option(
    BUILD_WITH_ROCKSDB 
    "If build with rocksdb" 
-    OFF
+    ON
 )
 option(
@@ -171,3 +184,14 @@ option(
   ON 
 )
+option(
+   BUILD_RELEASE
+   "If build release version"
+   OFF
+)
+option(
+   BUILD_CONTRIB
+   "If build thirdpart from source"
+   OFF
+)
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -121,6 +121,12 @@ IF ("${CPUTYPE}" STREQUAL "")
    SET(TD_LOONGARCH_64 TRUE)
    ADD_DEFINITIONS("-D_TD_LOONGARCH_")
    ADD_DEFINITIONS("-D_TD_LOONGARCH_64")
+  ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
+    SET(PLATFORM_ARCH_STR "mips")
+    MESSAGE(STATUS "input cpuType: mips64")
+    SET(TD_MIPS_64 TRUE)
+    ADD_DEFINITIONS("-D_TD_MIPS_")
+    ADD_DEFINITIONS("-D_TD_MIPS_64")
  ENDIF ()
 ELSE ()
  # if generate ARM version:
@@ -162,7 +168,27 @@ ELSE ()
  ENDIF ()
 ENDIF ()
+IF(APPLE)
+    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+    set(CMAKE_HAVE_THREADS_LIBRARY 1)
+    set(CMAKE_USE_WIN32_THREADS_INIT 0)
+    set(CMAKE_USE_PTHREADS 1)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+ENDIF()
 MESSAGE(STATUS "Platform arch:" ${PLATFORM_ARCH_STR})
+set(TD_DEPS_DIR "x86")
+if (TD_LINUX)
+  IF (TD_ARM_64 OR TD_ARM_32)
+    set(TD_DEPS_DIR "arm")
+  ELSEIF (TD_MIPS_64)
+    set(TD_DEPS_DIR "mips")
+  ELSE() 
+    set(TD_DEPS_DIR "x86")
+  ENDIF()
+endif()
+MESSAGE(STATUS "DEPS_DIR: " ${TD_DEPS_DIR})
 MESSAGE("C Compiler: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_C_COMPILER_VERSION})")
 MESSAGE("CXX Compiler: ${CMAKE_CXX_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_CXX_COMPILER_VERSION})")
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.4.1")
+  SET(TD_VER_NUMBER "3.1.0.0.alpha")
 ENDIF ()
 IF (DEFINED VERCOMPATIBLE)

--- a/cmake/geos_CMakeLists.txt.in
+++ b/cmake/geos_CMakeLists.txt.in
+# geos
+ExternalProject_Add(geos
+        GIT_REPOSITORY https://github.com/libgeos/geos.git
+        GIT_TAG 3.12.0
+        SOURCE_DIR "${TD_CONTRIB_DIR}/geos"
+        BINARY_DIR ""
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )
--- a/cmake/rocksdb_CMakeLists.txt.in
+++ b/cmake/rocksdb_CMakeLists.txt.in
 # rocksdb
-ExternalProject_Add(rocksdb
+if (${BUILD_CONTRIB})
-        GIT_REPOSITORY https://github.com/taosdata-contrib/rocksdb.git
+        ExternalProject_Add(rocksdb
-        GIT_TAG v6.23.3
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
 	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb"
            CONFIGURE_COMMAND ""
            BUILD_COMMAND ""
            INSTALL_COMMAND ""
            TEST_COMMAND ""
        )
+else()
+    if (NOT ${TD_LINUX})
+        ExternalProject_Add(rocksdb
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
+	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb"
+            CONFIGURE_COMMAND ""
+            BUILD_COMMAND ""
+            INSTALL_COMMAND ""
+            TEST_COMMAND ""
+        )
+    endif()
+endif()
--- a/cmake/stub_CMakeLists.txt.in
+++ b/cmake/stub_CMakeLists.txt.in
@@ -2,6 +2,7 @@
 # stub
 ExternalProject_Add(stub
        GIT_REPOSITORY https://github.com/coolxv/cpp-stub.git
+        GIT_TAG 5e903b8e
        GIT_SUBMODULES "src"
        SOURCE_DIR "${TD_CONTRIB_DIR}/cpp-stub"
        BINARY_DIR "${TD_CONTRIB_DIR}/cpp-stub/src"

--- a/cmake/taosadapter_CMakeLists.txt.in
+++ b/cmake/taosadapter_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
        GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG 565ca21
+        GIT_TAG main
        SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE

--- a/cmake/taostools_CMakeLists.txt.in
+++ b/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 4378702
+        GIT_TAG 3.0
        SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE

--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -77,11 +77,23 @@ if(${BUILD_WITH_LEVELDB})
    cat("${TD_SUPPORT_DIR}/leveldb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif(${BUILD_WITH_LEVELDB})
-# rocksdb
+if (${BUILD_CONTRIB})
-if(${BUILD_WITH_ROCKSDB})
+    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(${BUILD_WITH_ROCKSDB})
            cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
            add_definitions(-DUSE_ROCKSDB)
-endif(${BUILD_WITH_ROCKSDB})
+        endif(${BUILD_WITH_ROCKSDB})
+    else()
+        if(${BUILD_WITH_ROCKSDB})
+            add_definitions(-DUSE_ROCKSDB)
+        endif(${BUILD_WITH_ROCKSDB})
+    endif()
+endif()
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
@@ -134,6 +146,11 @@ if(${BUILD_ADDR2LINE})
    endif(NOT ${TD_WINDOWS})
 endif(${BUILD_ADDR2LINE})
+# geos
+if(${BUILD_GEOS})
+    cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+endif()
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
@@ -222,19 +239,113 @@ endif(${BUILD_WITH_LEVELDB})
 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
-if(${BUILD_WITH_ROCKSDB})
+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 "")
+            SET(CMAKE_BUILD_TYPE Release)
+        endif()
+    endif(${TD_LINUX})
+endif (${BUILD_WITH_UV})
+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 "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
+        if(${TD_DARWIN})
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+        endif(${TD_DARWIN})
+        if (${TD_DARWIN_ARM64})
+            set(HAS_ARMV8_CRC true)
+        endif(${TD_DARWIN_ARM64})
+        if (${TD_WINDOWS})
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+            option(WITH_JNI "" OFF)
+            option(WITH_MD_LIBRARY "build with MD" OFF)
+            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)
+            option(WITH_PERF_CONTEXT "" OFF)
+        endif(${TD_DARWIN})
+        option(WITH_FALLOCATE "" OFF)
+        option(WITH_JEMALLOC "" OFF)
+        option(WITH_GFLAGS "" OFF)
+        option(PORTABLE "" ON)
+        option(WITH_LIBURING "" OFF)
+        option(FAIL_ON_WARNINGS OFF)
        option(WITH_TESTS "" OFF)
        option(WITH_BENCHMARK_TOOLS "" OFF)
        option(WITH_TOOLS "" OFF)
        option(WITH_LIBURING "" OFF)
        option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
        add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
        target_include_directories(
            rocksdb
            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
        )
-endif(${BUILD_WITH_ROCKSDB})
+    else() 
+        if (NOT ${TD_LINUX})
+            MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
+            if(${TD_DARWIN})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+            endif(${TD_DARWIN})
+            if (${TD_DARWIN_ARM64})
+                set(HAS_ARMV8_CRC true)
+            endif(${TD_DARWIN_ARM64})
+            if (${TD_WINDOWS})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+                option(WITH_JNI "" OFF)
+                option(WITH_MD_LIBRARY "build with MD" OFF)
+                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)
+                option(WITH_PERF_CONTEXT "" OFF)
+            endif(${TD_DARWIN})
+            option(WITH_FALLOCATE "" OFF)
+            option(WITH_JEMALLOC "" OFF)
+            option(WITH_GFLAGS "" OFF)
+            option(PORTABLE "" ON)
+            option(WITH_LIBURING "" OFF)
+            option(FAIL_ON_WARNINGS OFF)
+            option(WITH_TESTS "" OFF)
+            option(WITH_BENCHMARK_TOOLS "" OFF)
+            option(WITH_TOOLS "" OFF)
+            option(WITH_LIBURING "" OFF)
+            option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+            add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
+            target_include_directories(
+                rocksdb
+                PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
+            )
+        endif() 
+    endif()
+endif()
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev
@@ -434,6 +545,23 @@ if(${BUILD_ADDR2LINE})
    endif(NOT ${TD_WINDOWS})
 endif(${BUILD_ADDR2LINE})
+# geos
+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)
+    unset(CMAKE_CXX_STANDARD CACHE) # undo libgeos's setting of global CMAKE_CXX_STANDARD
+    target_include_directories(
+        geos_c
+        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/geos/include>
+    )
+endif(${BUILD_GEOS})
 # ================================================================================================
 # Build test

--- a/contrib/test/rocksdb/CMakeLists.txt
+++ b/contrib/test/rocksdb/CMakeLists.txt
+message("contrib test/rocksdb:" ${BUILD_DEPENDENCY_TESTS})
 add_executable(rocksdbTest "")
 target_sources(rocksdbTest
    PRIVATE

--- a/contrib/test/rocksdb/main.c
+++ b/contrib/test/rocksdb/main.c
 #include <assert.h>
+#include <bits/stdint-uintn.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,38 +10,307 @@
 const char DBPath[] = "rocksdb_c_simple_example";
 const char DBBackupPath[] = "/tmp/rocksdb_c_simple_example_backup";
+static const int32_t endian_test_var = 1;
+#define IS_LITTLE_ENDIAN() (*(uint8_t *)(&endian_test_var) != 0)
+#define TD_RT_ENDIAN()     (IS_LITTLE_ENDIAN() ? TD_LITTLE_ENDIAN : TD_BIG_ENDIAN)
+#define POINTER_SHIFT(p, b) ((void *)((char *)(p) + (b)))
+static void *taosDecodeFixedU64(const void *buf, uint64_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[7] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[6] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[5] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[4] = ((uint8_t *)buf)[3];
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[4];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[5];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[6];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[7];
+  }
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+// ---- Fixed U64
+static int32_t taosEncodeFixedU64(void **buf, uint64_t value) {
+  if (buf != NULL) {
+    if (IS_LITTLE_ENDIAN()) {
+      memcpy(*buf, &value, sizeof(value));
+    } else {
+      ((uint8_t *)(*buf))[0] = value & 0xff;
+      ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
+      ((uint8_t *)(*buf))[2] = (value >> 16) & 0xff;
+      ((uint8_t *)(*buf))[3] = (value >> 24) & 0xff;
+      ((uint8_t *)(*buf))[4] = (value >> 32) & 0xff;
+      ((uint8_t *)(*buf))[5] = (value >> 40) & 0xff;
+      ((uint8_t *)(*buf))[6] = (value >> 48) & 0xff;
+      ((uint8_t *)(*buf))[7] = (value >> 56) & 0xff;
+    }
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+  return (int32_t)sizeof(value);
+}
+typedef struct KV {
+  uint64_t k1;
+  uint64_t k2;
+} KV;
+int kvSerial(KV *kv, char *buf) {
+  int len = 0;
+  len += taosEncodeFixedU64((void **)&buf, kv->k1);
+  len += taosEncodeFixedU64((void **)&buf, kv->k2);
+  return len;
+}
+const char *kvDBName(void *name) { return "kvDBname"; }
+int         kvDBComp(void *state, const char *aBuf, size_t aLen, const char *bBuf, size_t bLen) {
+  KV w1, w2;
+  memset(&w1, 0, sizeof(w1));
+  memset(&w2, 0, sizeof(w2));
+  char *p1 = (char *)aBuf;
+  char *p2 = (char *)bBuf;
+  // p1 += 1;
+  // p2 += 1;
+  p1 = taosDecodeFixedU64(p1, &w1.k1);
+  p2 = taosDecodeFixedU64(p2, &w2.k1);
+  p1 = taosDecodeFixedU64(p1, &w1.k2);
+  p2 = taosDecodeFixedU64(p2, &w2.k2);
+  if (w1.k1 < w2.k1) {
+    return -1;
+  } else if (w1.k1 > w2.k1) {
+    return 1;
+  }
+  if (w1.k2 < w2.k2) {
+    return -1;
+  } else if (w1.k2 > w2.k2) {
+    return 1;
+  }
+  return 0;
+}
+int kvDeserial(KV *kv, char *buf) {
+  char *p1 = (char *)buf;
+  // p1 += 1;
+  p1 = taosDecodeFixedU64(p1, &kv->k1);
+  p1 = taosDecodeFixedU64(p1, &kv->k2);
+  return 0;
+}
 int main(int argc, char const *argv[]) {
-  rocksdb_t *              db;
+  rocksdb_t               *db;
  rocksdb_backup_engine_t *be;
-  rocksdb_options_t *      options = rocksdb_options_create();
-  rocksdb_options_set_create_if_missing(options, 1);
-  // open DB
  char       *err = NULL;
-  db = rocksdb_open(options, DBPath, &err);
+  const char *path = "/tmp/db";
-  // Write
+  rocksdb_options_t *opt = rocksdb_options_create();
-  rocksdb_writeoptions_t *writeoptions = rocksdb_writeoptions_create();
+  rocksdb_options_set_create_if_missing(opt, 1);
-  rocksdb_put(db, writeoptions, "key", 3, "value", 5, &err);
+  rocksdb_options_set_create_missing_column_families(opt, 1);
  // Read
  rocksdb_readoptions_t *readoptions = rocksdb_readoptions_create();
-  rocksdb_readoptions_set_snapshot(readoptions, rocksdb_create_snapshot(db));
+  // rocksdb_readoptions_set_snapshot(readoptions, rocksdb_create_snapshot(db));
+  int    len = 1;
+  char   buf[256] = {0};
  size_t vallen = 0;
-  char * val = rocksdb_get(db, readoptions, "key", 3, &vallen, &err);
+  char  *val = rocksdb_get(db, readoptions, "key", 3, &vallen, &err);
-  printf("val:%s\n", val);
+  snprintf(buf, vallen + 5, "val:%s", val);
+  printf("%ld %ld %s\n", strlen(val), vallen, buf);
+  char **cfName = calloc(len, sizeof(char *));
+  for (int i = 0; i < len; i++) {
+    cfName[i] = "test";
+  }
+  const rocksdb_options_t **cfOpt = malloc(len * sizeof(rocksdb_options_t *));
+  for (int i = 0; i < len; i++) {
+    cfOpt[i] = rocksdb_options_create_copy(opt);
+    if (i != 0) {
+      rocksdb_comparator_t *comp = rocksdb_comparator_create(NULL, NULL, kvDBComp, kvDBName);
+      rocksdb_options_set_comparator((rocksdb_options_t *)cfOpt[i], comp);
+    }
+  }
+  rocksdb_column_family_handle_t **cfHandle = malloc(len * sizeof(rocksdb_column_family_handle_t *));
+  db = rocksdb_open_column_families(opt, path, len, (const char *const *)cfName, cfOpt, cfHandle, &err);
-  // Update
+  {
-  // rocksdb_put(db, writeoptions, "key", 3, "eulav", 5, &err);
+    rocksdb_readoptions_t *rOpt = rocksdb_readoptions_create();
+    size_t                 vlen = 0;
-  // Delete
+    char *v = rocksdb_get_cf(db, rOpt, cfHandle[0], "key", strlen("key"), &vlen, &err);
-  rocksdb_delete(db, writeoptions, "key", 3, &err);
+    printf("Get value %s, and len = %d\n", v, (int)vlen);
+  }
-  // Read again
+  rocksdb_writeoptions_t *wOpt = rocksdb_writeoptions_create();
-  val = rocksdb_get(db, readoptions, "key", 3, &vallen, &err);
+  rocksdb_writebatch_t   *wBatch = rocksdb_writebatch_create();
-  printf("val:%s\n", val);
+  rocksdb_writebatch_put_cf(wBatch, cfHandle[0], "key", strlen("key"), "value", strlen("value"));
+  rocksdb_write(db, wOpt, wBatch, &err);
+  rocksdb_readoptions_t *rOpt = rocksdb_readoptions_create();
+  size_t                 vlen = 0;
+  {
+    rocksdb_writeoptions_t *wOpt = rocksdb_writeoptions_create();
+    rocksdb_writebatch_t   *wBatch = rocksdb_writebatch_create();
+    for (int i = 0; i < 100; i++) {
+      char buf[128] = {0};
+      KV   kv = {.k1 = (100 - i) % 26, .k2 = i % 26};
+      kvSerial(&kv, buf);
+      rocksdb_writebatch_put_cf(wBatch, cfHandle[1], buf, sizeof(kv), "value", strlen("value"));
+    }
+    rocksdb_write(db, wOpt, wBatch, &err);
+  }
+  {
+    {
+      char buf[128] = {0};
+      KV   kv = {.k1 = 0, .k2 = 0};
+      kvSerial(&kv, buf);
+      char *v = rocksdb_get_cf(db, rOpt, cfHandle[1], buf, sizeof(kv), &vlen, &err);
+      printf("Get value %s, and len = %d, xxxx\n", v, (int)vlen);
+      rocksdb_iterator_t *iter = rocksdb_create_iterator_cf(db, rOpt, cfHandle[1]);
+      rocksdb_iter_seek_to_first(iter);
+      int i = 0;
+      while (rocksdb_iter_valid(iter)) {
+        size_t      klen, vlen;
+        const char *key = rocksdb_iter_key(iter, &klen);
+        const char *value = rocksdb_iter_value(iter, &vlen);
+        KV          kv;
+        kvDeserial(&kv, (char *)key);
+        printf("kv1: %d\t kv2: %d, len:%d, value = %s\n", (int)(kv.k1), (int)(kv.k2), (int)(klen), value);
+        i++;
+        rocksdb_iter_next(iter);
+      }
+      rocksdb_iter_destroy(iter);
+    }
+    {
+      char                buf[128] = {0};
+      KV                  kv = {.k1 = 0, .k2 = 0};
+      int                 len = kvSerial(&kv, buf);
+      rocksdb_iterator_t *iter = rocksdb_create_iterator_cf(db, rOpt, cfHandle[1]);
+      rocksdb_iter_seek(iter, buf, len);
+      if (!rocksdb_iter_valid(iter)) {
+        printf("invalid iter");
+      }
+      {
+        char buf[128] = {0};
+        KV   kv = {.k1 = 100, .k2 = 0};
+        int  len = kvSerial(&kv, buf);
+        rocksdb_iterator_t *iter = rocksdb_create_iterator_cf(db, rOpt, cfHandle[1]);
+        rocksdb_iter_seek(iter, buf, len);
+        if (!rocksdb_iter_valid(iter)) {
+          printf("invalid iter\n");
+          rocksdb_iter_seek_for_prev(iter, buf, len);
+          if (!rocksdb_iter_valid(iter)) {
+            printf("stay invalid iter\n");
+          } else {
+            size_t      klen = 0, vlen = 0;
+            const char *key = rocksdb_iter_key(iter, &klen);
+            const char *value = rocksdb_iter_value(iter, &vlen);
+            KV          kv;
+            kvDeserial(&kv, (char *)key);
+            printf("kv1: %d\t kv2: %d, len:%d, value = %s\n", (int)(kv.k1), (int)(kv.k2), (int)(klen), value);
+          }
+        }
+      }
+    }
+  }
+  // char *v = rocksdb_get_cf(db, rOpt, cfHandle[0], "key", strlen("key"), &vlen, &err);
+  // printf("Get value %s, and len = %d\n", v, (int)vlen);
+  rocksdb_column_family_handle_destroy(cfHandle[0]);
+  rocksdb_column_family_handle_destroy(cfHandle[1]);
  rocksdb_close(db);
+  // {
+  //   // rocksdb_options_t *Options = rocksdb_options_create();
+  //   db = rocksdb_open(comm, path, &err);
+  //   if (db != NULL) {
+  //     rocksdb_options_t    *cfo = rocksdb_options_create_copy(comm);
+  //     rocksdb_comparator_t *cmp1 = rocksdb_comparator_create(NULL, NULL, kvDBComp, kvDBName);
+  //     rocksdb_options_set_comparator(cfo, cmp1);
+  //     rocksdb_column_family_handle_t *handle = rocksdb_create_column_family(db, cfo, "cf1", &err);
+  //     rocksdb_column_family_handle_destroy(handle);
+  //     rocksdb_close(db);
+  //     db = NULL;
+  //   }
+  // }
+  // int ncf = 2;
+  // rocksdb_column_family_handle_t **pHandle = malloc(ncf * sizeof(rocksdb_column_family_handle_t *));
+  // {
+  //   rocksdb_options_t *options = rocksdb_options_create_copy(comm);
+  //   rocksdb_comparator_t *cmp1 = rocksdb_comparator_create(NULL, NULL, kvDBComp, kvDBName);
+  //   rocksdb_options_t    *dbOpts1 = rocksdb_options_create_copy(comm);
+  //   rocksdb_options_t    *dbOpts2 = rocksdb_options_create_copy(comm);
+  //   rocksdb_options_set_comparator(dbOpts2, cmp1);
+  //   // rocksdb_column_family_handle_t *cf = rocksdb_create_column_family(db, dbOpts1, "cmp1", &err);
+  //   const char *pName[] = {"default", "cf1"};
+  //   const rocksdb_options_t **pOpts = malloc(ncf * sizeof(rocksdb_options_t *));
+  //   pOpts[0] = dbOpts1;
+  //   pOpts[1] = dbOpts2;
+  //   rocksdb_options_t *allOptions = rocksdb_options_create_copy(comm);
+  //   db = rocksdb_open_column_families(allOptions, "test", ncf, pName, pOpts, pHandle, &err);
+  // }
+  // // rocksdb_options_t *options = rocksdb_options_create();
+  // // rocksdb_options_set_create_if_missing(options, 1);
+  // // //rocksdb_open_column_families(const rocksdb_options_t *options, const char *name, int num_column_families,
+  // //                              const char *const               *column_family_names,
+  // //                              const rocksdb_options_t *const  *column_family_options,
+  // //                              rocksdb_column_family_handle_t **column_family_handles, char **errptr);
+  // for (int i = 0; i < 100; i++) {
+  //   char buf[128] = {0};
+  //   rocksdb_writeoptions_t *wopt = rocksdb_writeoptions_create();
+  //   KV                      kv = {.k1 = i, .k2 = i};
+  //   kvSerial(&kv, buf);
+  //   rocksdb_put_cf(db, wopt, pHandle[0], buf, strlen(buf), (const char *)&i, sizeof(i), &err);
+  // }
+  // rocksdb_close(db);
+  // Write
+  // rocksdb_writeoptions_t *writeoptions = rocksdb_writeoptions_create();
+  // rocksdb_put(db, writeoptions, "key", 3, "value", 5, &err);
+  //// Read
+  // rocksdb_readoptions_t *readoptions = rocksdb_readoptions_create();
+  // rocksdb_readoptions_set_snapshot(readoptions, rocksdb_create_snapshot(db));
+  // size_t vallen = 0;
+  // char  *val = rocksdb_get(db, readoptions, "key", 3, &vallen, &err);
+  // printf("val:%s\n", val);
+  //// Update
+  //// rocksdb_put(db, writeoptions, "key", 3, "eulav", 5, &err);
+  //// Delete
+  // rocksdb_delete(db, writeoptions, "key", 3, &err);
+  //// Read again
+  // val = rocksdb_get(db, readoptions, "key", 3, &vallen, &err);
+  // printf("val:%s\n", val);
+  // rocksdb_close(db);
  return 0;
 }
--- a/deps/arm/rocksdb_static/librocksdb.a
+++ b/deps/arm/rocksdb_static/librocksdb.a
--- a/deps/arm/rocksdb_static/rocksdb/c.h
+++ b/deps/arm/rocksdb_static/rocksdb/c.h
--- a/deps/mips/rocksdb_static/librocksdb.a
+++ b/deps/mips/rocksdb_static/librocksdb.a
--- a/deps/mips/rocksdb_static/rocksdb/c.h
+++ b/deps/mips/rocksdb_static/rocksdb/c.h
--- a/deps/x86/rocksdb_static/librocksdb.a
+++ b/deps/x86/rocksdb_static/librocksdb.a
--- a/deps/x86/rocksdb_static/rocksdb/c.h
+++ b/deps/x86/rocksdb_static/rocksdb/c.h
--- a/docs/assets/TDengine-logo-trans-small.png
+++ b/docs/assets/TDengine-logo-trans-small.png
--- a/docs/assets/TDengine-logo-trans.png
+++ b/docs/assets/TDengine-logo-trans.png
--- a/docs/doxgen/CMakeLists.txt
+++ b/docs/doxgen/CMakeLists.txt
@@ -4,7 +4,7 @@ if(${BUILD_DOCS})
    find_package(Doxygen)
    if (DOXYGEN_FOUND)
        # Build the doc
-        set(DOXYGEN_IN ${TD_SOURCE_DIR}/docs/Doxyfile.in)
+        set(DOXYGEN_IN ${TD_SOURCE_DIR}/docs/doxgen/Doxyfile.in)
        set(DOXYGEN_OUT ${CMAKE_BINARY_DIR}/Doxyfile)
        configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)

--- a/docs/en/01-index.md
+++ b/docs/en/01-index.md
@@ -5,7 +5,7 @@ description: This website contains the user manuals for TDengine, an open-source
 slug: /
 ---
-TDengine is an [open-source](https://tdengine.com/tdengine/open-source-time-series-database/), [cloud-native](https://tdengine.com/tdengine/cloud-native-time-series-database/) [time-series database](https://tdengine.com/tsdb/) optimized for the Internet of Things (IoT), Connected Cars, and Industrial IoT. It enables efficient, real-time data ingestion, processing, and monitoring of TB and even PB scale data per day, generated by billions of sensors and data collectors. This document is the TDengine user manual. It introduces the basic, as well as novel concepts, in TDengine, and also talks in detail about installation, features, SQL, APIs, operation, maintenance, kernel design, and other topics. It’s written mainly for architects, developers, and system administrators.
+TDengine is an [open-source](https://tdengine.com/tdengine/open-source-time-series-database/), [cloud-native](https://tdengine.com/tdengine/cloud-native-time-series-database/) [time-series database](https://tdengine.com/tsdb/) optimized for the Internet of Things (IoT), Connected Cars, and Industrial IoT. It enables efficient, real-time data ingestion, processing, and monitoring of TB and even PB scale data per day, generated by billions of sensors and data collectors. This document is the TDengine user manual. It introduces the basic, as well as novel concepts, in TDengine, and also talks in detail about installation, features, SQL, APIs, operation, maintenance, kernel design, and other topics. It's written mainly for architects, developers, and system administrators.
 To get an overview of TDengine, such as a feature list, benchmarks, and competitive advantages, please browse through the [Introduction](./intro) section.

--- a/docs/en/02-intro/index.md
+++ b/docs/en/02-intro/index.md
@@ -44,7 +44,7 @@ For more details on features, please read through the entire documentation.
 ## Competitive Advantages
-By making full use of [characteristics of time series data](https://tdengine.com/tsdb/characteristics-of-time-series-data/), TDengine differentiates itself from other [time series databases](https://tdengine.com/tsdb), with the following advantages.
+By making full use of [characteristics of time series data](https://tdengine.com/tsdb/characteristics-of-time-series-data/), TDengine differentiates itself from other [time series databases](https://tdengine.com/tsdb/), with the following advantages.
 - **[High-Performance](https://tdengine.com/tdengine/high-performance-time-series-database/)**: TDengine is the only time-series database to solve the high cardinality issue to support billions of data collection points while out performing other time-series databases for data ingestion, querying and data compression.
@@ -57,7 +57,7 @@ By making full use of [characteristics of time series data](https://tdengine.com
 - **[Easy Data Analytics](https://tdengine.com/tdengine/time-series-data-analytics-made-easy/)**: Through super tables, storage and compute separation, data partitioning by time interval, pre-computation and other means, TDengine makes it easy to explore, format, and get access to data in a highly efficient way.
- **[Open Source](https://tdengine.com/tdengine/open-source-time-series-database/)**: TDengine’s core modules, including cluster feature, are all available under open source licenses. It has gathered over 19k stars on GitHub. There is an active developer community, and over 140k running instances worldwide.
+- **[Open Source](https://tdengine.com/tdengine/open-source-time-series-database/)**: TDengine's core modules, including cluster feature, are all available under open source licenses. It has gathered over 19k stars on GitHub. There is an active developer community, and over 140k running instances worldwide.
 With TDengine, the total cost of ownership of your time-series data platform can be greatly reduced.
@@ -109,8 +109,8 @@ As a high-performance, scalable and SQL supported time-series database, TDengine
 | **System Performance Requirements**               | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                                                                                             |
 | ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| Very large total processing capacity              |                    |                         | √                   | TDengine’s cluster functions can easily improve processing capacity via multi-server coordination.                          |
+| Very large total processing capacity              |                    |                         | √                   | TDengine's cluster functions can easily improve processing capacity via multi-server coordination.                          |
-| Extremely high-speed data processing              |                    |                         | √                   | TDengine’s storage and data processing are optimized for IoT, and can process data many times faster than similar products. |
+| Extremely high-speed data processing              |                    |                         | √                   | TDengine's storage and data processing are optimized for IoT, and can process data many times faster than similar products. |
 | Extremely fast processing of high resolution data |                    |                         | √                   | TDengine has achieved the same or better performance than other relational and NoSQL data processing systems.               |
 ### System Maintenance Requirements
@@ -123,11 +123,10 @@ As a high-performance, scalable and SQL supported time-series database, TDengine
 ## Comparison with other databases
- [Writing Performance Comparison of TDengine and InfluxDB ](https://tdengine.com/performance-comparison-of-tdengine-and-influxdb/)
+- [TDengine vs. InfluxDB](https://tdengine.com/tsdb-comparison-influxdb-vs-tdengine/)
- [Query Performance Comparison of TDengine and InfluxDB](https://tdengine.com/query-performance-comparison-test-report-tdengine-vs-influxdb/)
+- [TDengine vs. TimescaleDB](https://tdengine.com/tsdb-comparison-timescaledb-vs-tdengine/)
- [TDengine vs OpenTSDB](https://tdengine.com/performance-tdengine-vs-opentsdb/)
+- [TDengine vs. OpenTSDB](https://tdengine.com/performance-tdengine-vs-opentsdb/)
- [TDengine vs Cassandra](https://tdengine.com/performance-tdengine-vs-cassandra/)
+- [TDengine vs. Cassandra](https://tdengine.com/performance-tdengine-vs-cassandra/)
- [TDengine vs InfluxDB](https://tdengine.com/performance-tdengine-vs-influxdb/)
 ## More readings
 - [Introduction to Time-Series Database](https://tdengine.com/tsdb/)

--- a/docs/en/04-concept/index.md
+++ b/docs/en/04-concept/index.md
@@ -127,7 +127,7 @@ To make full use of time-series data characteristics, TDengine adopts a strategy
 If the metric data of multiple DCPs are traditionally written into a single table, due to uncontrollable network delays, the timing of the data from different DCPs arriving at the server cannot be guaranteed, write operations must be protected by locks, and metric data from one DCP cannot be guaranteed to be continuously stored together. **One table for one data collection point can ensure the best performance of insert and query of a single data collection point to the greatest possible extent.**
-TDengine suggests using DCP ID as the table name (like d1001 in the above table). Each DCP may collect one or multiple metrics (like the `current`, `voltage`, `phase` as above). Each metric has a corresponding column in the table. The data type for a column can be int, float, string and others. In addition, the first column in the table must be a timestamp. TDengine uses the timestamp as the index, and won’t build the index on any metrics stored. Column wise storage is used.
+TDengine suggests using DCP ID as the table name (like d1001 in the above table). Each DCP may collect one or multiple metrics (like the `current`, `voltage`, `phase` as above). Each metric has a corresponding column in the table. The data type for a column can be int, float, string and others. In addition, the first column in the table must be a timestamp. TDengine uses the timestamp as the index, and won't build the index on any metrics stored. Column wise storage is used.
 Complex devices, such as connected cars, may have multiple DCPs. In this case, multiple tables are created for a single device, one table per DCP.

--- a/docs/en/05-get-started/01-docker.md
+++ b/docs/en/05-get-started/01-docker.md
@@ -6,7 +6,7 @@ description: This document describes how to install TDengine in a Docker contain
 This document describes how to install TDengine in a Docker container and perform queries and inserts.
- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com).
+- The easiest way to explore TDengine is through [TDengine Cloud](https://cloud.tdengine.com).
 - To get started with TDengine in a non-containerized environment, see [Quick Install from Package](../../get-started/package).
 - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine).

--- a/docs/en/05-get-started/03-package.md
+++ b/docs/en/05-get-started/03-package.md
@@ -10,7 +10,7 @@ import PkgListV3 from "/components/PkgListV3";
 This document describes how to install TDengine on Linux/Windows/macOS and perform queries and inserts.
- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). 
+- The easiest way to explore TDengine is through [TDengine Cloud](https://cloud.tdengine.com). 
 - To get started with TDengine on Docker, see [Quick Install on Docker](../../get-started/docker).
 - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine).
@@ -20,6 +20,19 @@ The standard server installation package includes `taos`, `taosd`, `taosAdapter`
 The TDengine Community Edition is released as Deb and RPM packages. The Deb package can be installed on Debian, Ubuntu, and derivative systems. The RPM package can be installed on CentOS, RHEL, SUSE, and derivative systems. A .tar.gz package is also provided for enterprise customers, and you can install TDengine over `apt-get` as well. The .tar.tz package includes `taosdump` and the TDinsight installation script. If you want to use these utilities with the Deb or RPM package, download and install taosTools separately. TDengine can also be installed on x64 Windows and x64/m1 macOS.
+## Operating environment requirements
+In the Linux system, the minimum requirements for the operating environment are as follows:
+linux core version - 3.10.0-1160.83.1.el7.x86_64;
+glibc version - 2.17;
+If compiling and installing through clone source code, it is also necessary to meet the following requirements:
+cmake version - 3.26.4 or above;
+gcc version - 9.3.1 or above;
 ## Installation
 <Tabs>
@@ -102,7 +115,7 @@ sudo apt-get install tdengine
 :::tip
 This installation method is supported only for Debian and Ubuntu.
-::::
+:::
 </TabItem>
 <TabItem label="Windows" value="windows">
@@ -208,6 +221,8 @@ The following `launchctl` commands can help you manage TDengine service:
 - Check TDengine Server status: `sudo launchctl list | grep taosd`
+- Check TDengine Server status details: `launchctl print system/com.tdengine.taosd`
 :::info
 - Please use `sudo` to run `launchctl` to manage _com.tdengine.taosd_ with administrator privileges.
 - The administrator privilege is required for service management to enhance security.

--- a/docs/en/07-develop/01-connect/_connect_java.mdx
+++ b/docs/en/07-develop/01-connect/_connect_java.mdx
@@ -12,4 +12,4 @@ When using REST connection, the feature of bulk pulling can be enabled if the si
 {{#include docs/examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
 ```
-More configuration about connection，please refer to [Java Connector](/reference/connector/java)
+More configuration about connection, please refer to [Java Connector](/reference/connector/java)
--- a/docs/en/07-develop/01-connect/_connect_php.mdx
+++ b/docs/en/07-develop/01-connect/_connect_php.mdx
-```php title="原生连接"
+```php title=""native"
 {{#include docs/examples/php/connect.php}}
 ```
--- a/docs/en/07-develop/01-connect/index.md
+++ b/docs/en/07-develop/01-connect/index.md
@@ -33,7 +33,7 @@ There are two ways for a connector to establish connections to TDengine:
 For REST and native connections, connectors provide similar APIs for performing operations and running SQL statements on your databases. The main difference is the method of establishing the connection, which is not visible to users.
-Key differences：
+Key differences:
 3. The REST connection is more accessible with cross-platform support, however it results in a 30% performance downgrade.
 1. The TDengine client driver (taosc) has the highest performance with all the features of TDengine like [Parameter Binding](/reference/connector/cpp#parameter-binding-api), [Subscription](/reference/connector/cpp#subscription-and-consumption-api), etc.
@@ -83,7 +83,7 @@ If `maven` is used to manage the projects, what needs to be done is only adding
 <dependency>
  <groupId>com.taosdata.jdbc</groupId>
  <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.0.0</version>
+  <version>3.2.1</version>
 </dependency>
 ```
@@ -198,7 +198,7 @@ The sample code below are based on dotnet6.0, they may need to be adjusted if yo
 <TabItem label="R" value="r">
 1. Download [taos-jdbcdriver-version-dist.jar](https://repo1.maven.org/maven2/com/taosdata/jdbc/taos-jdbcdriver/3.0.0/).
-2. Install the dependency package `RJDBC`：
+2. Install the dependency package `RJDBC`:
 ```R
 install.packages("RJDBC")
@@ -213,7 +213,7 @@ If the client driver (taosc) is already installed, then the C connector is alrea
 </TabItem>
 <TabItem label="PHP" value="php">
-**Download Source Code Package and Unzip：**
+**Download Source Code Package and Unzip: **
 ```shell
 curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.2.tar.gz \
@@ -223,13 +223,13 @@ curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive
 > Version number `v1.0.2` is only for example, it can be replaced to any newer version, please check available version from [TDengine PHP Connector Releases](https://github.com/Yurunsoft/php-tdengine/releases).
-**Non-Swoole Environment：**
+**Non-Swoole Environment: **
 ```shell
 phpize && ./configure && make -j && make install
 ```
-**Specify TDengine Location：**
+**Specify TDengine Location: **
 ```shell
 phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 && make -j && make install
@@ -238,7 +238,7 @@ phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 &&
 > `--with-tdengine-dir=` is followed by the TDengine installation location.
 > This way is useful in case TDengine location can't be found automatically or macOS.
-**Swoole Environment：**
+**Swoole Environment: **
 ```shell
 phpize && ./configure --enable-swoole && make -j && make install
@@ -288,6 +288,6 @@ Prior to establishing connection, please make sure TDengine is already running a
 </Tabs>
 :::tip
-If the connection fails, in most cases it's caused by improper configuration for FQDN or firewall. Please refer to the section "Unable to establish connection" in [FAQ](https://docs.tdengine.com/train-faq/faq).
+If the connection fails, in most cases it's caused by improper configuration for FQDN or firewall. Please refer to the section "Unable to establish connection" in [FAQ](../../train-faq/faq).
 :::
--- a/docs/en/07-develop/03-insert-data/01-sql-writing.mdx
+++ b/docs/en/07-develop/03-insert-data/01-sql-writing.mdx
@@ -33,7 +33,7 @@ The below SQL statement is used to insert one row into table "d1001".
 INSERT INTO d1001 VALUES (ts1, 10.3, 219, 0.31);
 ```
-`ts1` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detial, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
+`ts1` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detail, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
 ### Insert Multiple Rows
@@ -43,7 +43,7 @@ Multiple rows can be inserted in a single SQL statement. The example below inser
 INSERT INTO d1001 VALUES (ts2, 10.2, 220, 0.23) (ts2, 10.3, 218, 0.25);
 ```
-`ts1` and `ts2` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detial, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
+`ts1` and `ts2` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detail, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
 ### Insert into Multiple Tables
@@ -53,7 +53,7 @@ Data can be inserted into multiple tables in the same SQL statement. The example
 INSERT INTO d1001 VALUES (ts1, 10.3, 219, 0.31) (ts2, 12.6, 218, 0.33) d1002 VALUES (ts3, 12.3, 221, 0.31);
 ```
-`ts1`, `ts2` and `ts3` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detial, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
+`ts1`, `ts2` and `ts3` is Unix timestamp, the timestamps which is larger than the difference between current time and KEEP in config is only allowed. For further detail, refer to [TDengine SQL insert timestamp section](/taos-sql/insert).
 For more details about `INSERT` please refer to [INSERT](/taos-sql/insert).

--- a/docs/en/07-develop/03-insert-data/30-influxdb-line.mdx
+++ b/docs/en/07-develop/03-insert-data/30-influxdb-line.mdx
@@ -69,7 +69,7 @@ For more details please refer to [InfluxDB Line Protocol](https://docs.influxdat
 ## Query Examples
-If you want query the data of `location=California.LosAngeles,groupid=2`，here is the query SQL:
+If you want query the data of `location=California.LosAngeles,groupid=2`, here is the query SQL:
 ```sql
 SELECT * FROM meters WHERE location = "California.LosAngeles" AND groupid = 2;

--- a/docs/en/07-develop/03-insert-data/40-opentsdb-telnet.mdx
+++ b/docs/en/07-develop/03-insert-data/40-opentsdb-telnet.mdx
@@ -84,7 +84,7 @@ Query OK, 4 row(s) in set (0.005399s)
 ## Query Examples
-If you want query the data of `location=California.LosAngeles groupid=3`，here is the query SQL:
+If you want query the data of `location=California.LosAngeles groupid=3`, here is the query SQL:
 ```sql
 SELECT * FROM `meters.current` WHERE location = "California.LosAngeles" AND groupid = 3;

--- a/docs/en/07-develop/03-insert-data/50-opentsdb-json.mdx
+++ b/docs/en/07-develop/03-insert-data/50-opentsdb-json.mdx
@@ -97,7 +97,7 @@ Query OK, 2 row(s) in set (0.004076s)
 ## Query Examples
-If you want query the data of "tags": {"location": "California.LosAngeles", "groupid": 1}，here is the query SQL:
+If you want query the data of "tags": {"location": "California.LosAngeles", "groupid": 1}, here is the query SQL:
 ```sql
 SELECT * FROM `meters.current` WHERE location = "California.LosAngeles" AND groupid = 3;

--- a/docs/en/07-develop/03-insert-data/60-high-volume.md
+++ b/docs/en/07-develop/03-insert-data/60-high-volume.md
@@ -49,7 +49,7 @@ If the data source is Kafka, then the application program is a consumer of Kafka
 On the server side, database configuration parameter `vgroups` needs to be set carefully to maximize the system performance. If it's set too low, the system capability can't be utilized fully; if it's set too big, unnecessary resource competition may be produced. A normal recommendation for `vgroups` parameter is 2 times of the number of CPU cores. However, depending on the actual system resources, it may still need to tuned.
-For more configuration parameters, please refer to [Database Configuration](../../../taos-sql/database) and [Server Configuration](../../../reference/config)。
+For more configuration parameters, please refer to [Database Configuration](../../../taos-sql/database) and [Server Configuration](../../../reference/config).
 ## Sample Programs
@@ -98,7 +98,7 @@ The main Program is responsible for:
 3. Start reading threads
 4. Output writing speed every 10 seconds
-The main program provides 4 parameters for tuning：
+The main program provides 4 parameters for tuning:
 1. The number of reading threads, default value is 1
 2. The number of writing threads, default value is 2
@@ -192,7 +192,7 @@ TDENGINE_JDBC_URL="jdbc:TAOS://localhost:6030?user=root&password=taosdata"
 If you want to launch the sample program on a remote server, please follow below steps:
-1. Package the sample programs. Execute below command under directory `TDengine/docs/examples/java` ：
+1. Package the sample programs. Execute below command under directory `TDengine/docs/examples/java`:
   ```
   mvn package
   ```
@@ -385,7 +385,7 @@ SQLWriter class encapsulates the logic of composing SQL and writing data. Please
   pip3 install faster-fifo
   ```
-3. Click the "Copy" in the above sample programs to copy `fast_write_example.py` 、 `sql_writer.py` and `mockdatasource.py`.
+3. Click the "Copy" in the above sample programs to copy `fast_write_example.py`, `sql_writer.py`, and `mockdatasource.py`.
 4. Execute the program

--- a/docs/en/07-develop/03-insert-data/_py_kafka.mdx
+++ b/docs/en/07-develop/03-insert-data/_py_kafka.mdx
-### python Kafka 客户端
+### python Kafka client
 For python kafka client, please refer to [kafka client](https://cwiki.apache.org/confluence/display/KAFKA/Clients#Clients-Python). In this document, we use [kafka-python](http://github.com/dpkp/kafka-python).
@@ -88,7 +88,7 @@ In addition to python's built-in multithreading and multiprocessing library, we
 <details>
 <summary>kafka_example_consumer</summary>
-`kafka_example_consumer` is `consumer`，which is responsible for consuming data from kafka and writing it to TDengine.
+`kafka_example_consumer` is `consumer`, which is responsible for consuming data from kafka and writing it to TDengine.
 ```py
 {{#include docs/examples/python/kafka_example_consumer.py}}

--- a/docs/en/07-develop/03-insert-data/_rust_schemaless.mdx
+++ b/docs/en/07-develop/03-insert-data/_rust_schemaless.mdx
+```rust
+{{#include docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs}}
+```
--- a/docs/en/07-develop/04-query-data/index.mdx
+++ b/docs/en/07-develop/04-query-data/index.mdx
@@ -20,10 +20,10 @@ import CAsync from "./_c_async.mdx";
 ## Introduction
-SQL is used by TDengine as its query language. Application programs can send SQL statements to TDengine through REST API or connectors. TDengine's CLI `taos` can also be used to execute ad hoc SQL queries. Here is the list of major query functionalities supported by TDengine：
+SQL is used by TDengine as its query language. Application programs can send SQL statements to TDengine through REST API or connectors. TDengine's CLI `taos` can also be used to execute ad hoc SQL queries. Here is the list of major query functionalities supported by TDengine:
 - Query on single column or multiple columns
- Filter on tags or data columns：>, <, =, <\>, like
+- Filter on tags or data columns: >, <, =, <\>, like
 - Grouping of results: `Group By` - Sorting of results: `Order By` - Limit the number of results: `Limit/Offset`
 - Windowed aggregate queries for time windows (interval), session windows (session), and state windows (state_window) 
 - Arithmetic on columns of numeric types or aggregate results
@@ -160,7 +160,7 @@ In the section describing [Insert](/develop/insert-data/sql-writing), a database
 :::note
 1. With either REST connection or native connection, the above sample code works well.
-2. Please note that `use db` can't be used in case of REST connection because it's stateless.
+2. Please note that `use db` can't be used in case of REST connection because it's stateless. You can specify the database name by either the REST endpoint's parameter or <db_name>.<table_name> in the SQL command.
 :::

--- a/docs/en/07-develop/07-tmq.mdx
+++ b/docs/en/07-develop/07-tmq.mdx
@@ -23,7 +23,7 @@ By subscribing to a topic, a consumer can obtain the latest data in that topic i
 To implement these features, TDengine indexes its write-ahead log (WAL) file for fast random access and provides configurable methods for replacing and retaining this file. You can define a retention period and size for this file. For information, see the CREATE DATABASE statement. In this way, the WAL file is transformed into a persistent storage engine that remembers the order in which events occur. However, note that configuring an overly long retention period for your WAL files makes database compression inefficient. TDengine then uses the WAL file instead of the time-series database as its storage engine for queries in the form of topics. TDengine reads the data from the WAL file; uses a unified query engine instance to perform filtering, transformations, and other operations; and finally pushes the data to consumers.
-Tips:The default data subscription is to consume data from the wal. If the wal is deleted, the consumed data will be incomplete. At this time, you can set the parameter experimental.snapshot.enable to true to obtain all data from the tsdb, but in this way, the consumption order of the data cannot be guaranteed. Therefore, it is recommended to set a reasonable retention policy for WAL based on your consumption situation to ensure that you can subscribe all data from WAL.
+Tips: Data subscription is to consume data from the wal. If some wal files are deleted according to WAL retention policy, the deleted data can't be consumed any more. So you need to set a reasonable value for parameter `WAL_RETENTION_PERIOD` or `WAL_RETENTION_SIZE` when creating the database and make sure your application consume the data in a timely way to make sure there is no data loss. This behavior is similar to Kafka and other widely used message queue products.
 ## Data Schema and API
@@ -105,6 +105,12 @@ class Consumer:
    def poll(self, timeout: float = 1.0):
        pass
+    def assignment(self):
+        pass
+    def poll(self, timeout: float = 1.0):
+        pass
    def close(self):
        pass
@@ -222,7 +228,7 @@ A database including one supertable and two subtables is created as follows:
 ```sql
 DROP DATABASE IF EXISTS tmqdb;
-CREATE DATABASE tmqdb;
+CREATE DATABASE tmqdb WAL_RETENTION_PERIOD 3600;
 CREATE TABLE tmqdb.stb (ts TIMESTAMP, c1 INT, c2 FLOAT, c3 VARCHAR(16)) TAGS(t1 INT, t3 VARCHAR(16));
 CREATE TABLE tmqdb.ctb0 USING tmqdb.stb TAGS(0, "subtable0");
 CREATE TABLE tmqdb.ctb1 USING tmqdb.stb TAGS(1, "subtable1");       
@@ -238,6 +244,8 @@ The following SQL statement creates a topic in TDengine:
 CREATE TOPIC topic_name AS SELECT ts, c1, c2, c3 FROM tmqdb.stb WHERE c1 > 1;
 ```
+- There is an upper limit to the number of topics created, controlled by the parameter tmqMaxTopicNum, with a default of 20
 Multiple subscription types are supported.
 #### Subscribe to a Column
@@ -259,14 +267,15 @@ You can subscribe to a topic through a SELECT statement. Statements that specify
 Syntax:
 ```sql
-CREATE TOPIC topic_name AS STABLE stb_name
+CREATE TOPIC topic_name [with meta] AS STABLE stb_name [where_condition]
 ```
 Creating a topic in this manner differs from a `SELECT * from stbName` statement as follows:
 - The table schema can be modified.
 - Unstructured data is returned. The format of the data returned changes based on the supertable schema.
- A different table schema may exist for every data block to be processed.
+- The 'with meta' parameter is optional. When selected, statements such as creating super tables and sub tables will be returned, mainly used for Taosx to perform super table migration
+- The 'where_condition' parameter is optional and will be used to filter and subscribe to sub tables that meet the criteria. Where conditions cannot have ordinary columns, only tags or tbnames. Functions can be used in where conditions to filter tags, but cannot be aggregate functions because sub table tag values cannot be aggregated. It can also be a constant expression, such as 2>1 (subscribing to all child tables), Or false (subscribe to 0 sub tables)
 - The data returned does not include tags.
 ### Subscribe to a Database
@@ -274,10 +283,12 @@ Creating a topic in this manner differs from a `SELECT * from stbName` statement
 Syntax:
 ```sql
-CREATE TOPIC topic_name [WITH META] AS DATABASE db_name;
+CREATE TOPIC topic_name [with meta] AS DATABASE db_name;
 ```
-This SQL statement creates a subscription to all tables in the database. You can add the `WITH META` parameter to include schema changes in the subscription, including creating and deleting supertables; adding, deleting, and modifying columns; and creating, deleting, and modifying the tags of subtables. Consumers can determine the message type from the API. Note that this differs from Kafka.
+This SQL statement creates a subscription to all tables in the database.
+- The 'with meta' parameter is optional. When selected, it will return statements for creating all super tables and sub tables in the database, mainly used for Taosx database migration
 ## Create a Consumer
@@ -285,16 +296,15 @@ You configure the following parameters when creating a consumer:
 |            Parameter            |  Type   | Description                                                 | Remarks                                        |
 | :----------------------------: | :-----: | -------------------------------------------------------- | ------------------------------------------- |
-|        `td.connect.ip`         | string  | Used in establishing a connection; same as `taos_connect`                          |  Only valid for establishing native connection                                           |
+|        `td.connect.ip`         | string  | IP address of the server side                          |  |
-|        `td.connect.user`         | string  | Used in establishing a connection; same as `taos_connect`                          |   Only valid for establishing native connection                                          |
+|        `td.connect.user`         | string  | User Name                          |  |
-|        `td.connect.pass`         | string  | Used in establishing a connection; same as `taos_connect`                          |     Only valid for establishing native connection                                        |
+|        `td.connect.pass`         | string  | Password                        |   |
-|        `td.connect.port`         | string  | Used in establishing a connection; same as `taos_connect`                          |       Only valid for establishing native connection                                      |
+|        `td.connect.port`         | string  | Port of the server side            |   |
-|           `group.id`           | string  | Consumer group ID; consumers with the same ID are in the same group                        | **Required**. Maximum length: 192.                 |
+|           `group.id`           | string  | Consumer group ID; consumers with the same ID are in the same group                        | **Required**. Maximum length: 192. Each topic can create up to 100 consumer groups.                 |
 |          `client.id`           | string  | Client ID                                                | Maximum length: 192.                             |
 |      `auto.offset.reset`       |  enum   | Initial offset for the consumer group                                     | Specify `earliest`, `latest`, or `none`(default) |
 |      `enable.auto.commit`      | boolean | Commit automatically; true: user application doesn't need to explicitly commit; false: user application need to handle commit by itself                                           | Default value is true                  |
 |   `auto.commit.interval.ms`    | integer | Interval for automatic commits, in milliseconds                           |
-| `experimental.snapshot.enable` | boolean | Specify whether to consume data in TSDB; true: both data in WAL and in TSDB can be consumed; false: only data in WAL can be consumed                   |     default value: false                                        |
 |     `msg.with.table.name`      | boolean | Specify whether to deserialize table names from messages                                 | default value: false
 The method of specifying these parameters depends on the language used:
@@ -312,7 +322,6 @@ tmq_conf_set(conf, "group.id", "cgrpName");
 tmq_conf_set(conf, "td.connect.user", "root");
 tmq_conf_set(conf, "td.connect.pass", "taosdata");
 tmq_conf_set(conf, "auto.offset.reset", "earliest");
-tmq_conf_set(conf, "experimental.snapshot.enable", "true");
 tmq_conf_set(conf, "msg.with.table.name", "true");
 tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
@@ -327,6 +336,7 @@ Java programs use the following parameters:
 |            Parameter            |  Type   | Description                                                 | Remarks                                        |
 | ----------------------------- | ------ | ----------------------------------------------------------------------------------------------------------------------------- |
+| `td.connect.type` | string | connection type: "jni" means native connection, "ws" means websocket connection, the default is "jni" |
 | `bootstrap.servers`           | string |Connection address, such as `localhost:6030`                                                                                                 |
 | `value.deserializer`          | string | Value deserializer; to use this method, implement the `com.taosdata.jdbc.tmq.Deserializer` interface or inherit the `com.taosdata.jdbc.tmq.ReferenceDeserializer` type |
 | `value.deserializer.encoding` | string | Specify the encoding for string deserialization                                                                                                        |  |
@@ -368,7 +378,6 @@ conf := &tmq.ConfigMap{
 "td.connect.port":              "6030",
 "client.id":                    "test_tmq_c",
 "enable.auto.commit":           "false",
- "experimental.snapshot.enable": "true",
 "msg.with.table.name":          "true",
 }
 consumer, err := NewConsumer(conf)
@@ -402,23 +411,6 @@ from taos.tmq import Consumer
 consumer = Consumer({"group.id": "local", "td.connect.ip": "127.0.0.1"})
 ```
-Python programs use the following parameters:
-| Parameter | Type | Description | Remarks |
-|:---------:|:----:|:-----------:|:-------:|
-| `td.connect.ip` | string | Used in establishing a connection||
-| `td.connect.user` | string | Used in establishing a connection||
-| `td.connect.pass` | string | Used in establishing a connection||
-| `td.connect.port` | string | Used in establishing a connection||
-| `group.id` | string | Consumer group ID; consumers with the same ID are in the same group | **Required**. Maximum length: 192 |
-| `client.id` | string | Client ID | Maximum length: 192 |
-| `msg.with.table.name` | string | Specify whether to deserialize table names from messages | pecify `true` or `false` |
-| `enable.auto.commit` | string | Commit automatically | pecify `true` or `false` |
-| `auto.commit.interval.ms` | string | Interval for automatic commits, in milliseconds | |
-| `auto.offset.reset` | string | Initial offset for the consumer group | Specify `earliest`, `latest`, or `none`(default) |
-| `experimental.snapshot.enable` | string | Specify whether it's allowed to consume messages from the WAL or from TSDB | Specify `true` or `false` |
-| `enable.heartbeat.background` | string | Backend heartbeat; if enabled, the consumer does not go offline even if it has not polled for a long time | Specify `true` or `false` |
 </TabItem>
 <TabItem label="Node.JS" value="Node.JS">

--- a/docs/en/07-develop/08-cache.md
+++ b/docs/en/07-develop/08-cache.md
@@ -10,10 +10,10 @@ TDengine uses various kinds of caching techniques to efficiently write and query
 TDengine uses an insert-driven cache management policy, known as first in, first out (FIFO). This policy differs from read-driven "least recently used (LRU)" cache management. A FIFO policy stores the latest data in cache and flushes the oldest data from cache to disk when the cache usage reaches a threshold. In IoT use cases, the most recent data or the current state is most important. The cache policy in TDengine, like much of the design and architecture of TDengine, is based on the nature of IoT data.
-When you create a database, you can configure the size of the write cache on each vnode. The **vgroups** parameter determines the number of vgroups that process data in the database, and the **buffer** parameter determines the size of the write cache for each vnode.
+When you create a database, you can configure the size of the write cache on each vnode. The **vgroups** parameter determines the number of vgroups that process data in the database, and the **buffer** parameter determines the size of the write cache for each vnode. The unit of buffer is MB.
 ```sql
-create database db0 vgroups 100 buffer 16MB
+create database db0 vgroups 100 buffer 16
 ```
 In theory, larger cache sizes are always better. However, at a certain point, it becomes impossible to improve performance by increasing cache size. In most scenarios, you can retain the default cache settings.
@@ -28,10 +28,10 @@ When you create a database, you can configure whether the latest data from every
 ## Metadata Cache
-To improve query and write performance, each vnode caches the metadata that it receives. When you create a database, you can configure the size of the metadata cache through the *pages* and *pagesize* parameters.
+To improve query and write performance, each vnode caches the metadata that it receives. When you create a database, you can configure the size of the metadata cache through the *pages* and *pagesize* parameters. The unit of pagesize is kb.
 ```sql
-create database db0 pages 128 pagesize 16kb
+create database db0 pages 128 pagesize 16
 ```
 The preceding SQL statement creates 128 pages on each vnode in the `db0` database. Each page has a 16 KB metadata cache.

--- a/docs/en/07-develop/09-udf.md
+++ b/docs/en/07-develop/09-udf.md
--- a/docs/en/12-taos-sql/01-data-type.md
+++ b/docs/en/12-taos-sql/01-data-type.md
@@ -11,7 +11,7 @@ When using TDengine to store and query data, the most important part of the data
 - The format must be `YYYY-MM-DD HH:mm:ss.MS`, the default time precision is millisecond (ms), for example `2017-08-12 18:25:58.128`.
 - Internal function `NOW` can be used to get the current timestamp on the client side.
 - The current timestamp of the client side is applied when `NOW` is used to insert data.
- Epoch Time：timestamp can also be a long integer number, which means the number of seconds, milliseconds or nanoseconds, depending on the time precision, from UTC 1970-01-01 00:00:00.
+- Epoch Time: timestamp can also be a long integer number, which means the number of seconds, milliseconds or nanoseconds, depending on the time precision, from UTC 1970-01-01 00:00:00.
 - Add/subtract operations can be carried out on timestamps. For example `NOW-2h` means 2 hours prior to the time at which query is executed. The units of time in operations can be b(nanosecond), u(microsecond), a(millisecond), s(second), m(minute), h(hour), d(day), or w(week). So `SELECT * FROM t1 WHERE ts > NOW-2w AND ts <= NOW-1w` means the data between two weeks ago and one week ago. The time unit can also be n (calendar month) or y (calendar year) when specifying the time window for down sampling operations.
 Time precision in TDengine can be set by the `PRECISION` parameter when executing `CREATE DATABASE`. The default time precision is millisecond. In the statement below, the precision is set to nanonseconds.
@@ -25,7 +25,7 @@ CREATE DATABASE db_name PRECISION 'ns';
 In TDengine, the data types below can be used when specifying a column or tag.
 | #   |     **type**      |  **Bytes**   | **Description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| --- | :--------------: | ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| --- | :---------------: | ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | 1   |     TIMESTAMP     | 8            | Default precision is millisecond, microsecond and nanosecond are also supported.                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | 2   |       INT         | 4            | Integer, the value range is [-2^31, 2^31-1].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | 3   |   INT UNSIGNED    | 4            | Unsigned integer, the value range is [0, 2^32-1].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
@@ -35,18 +35,17 @@ In TDengine, the data types below can be used when specifying a column or tag.
 | 7   |      DOUBLE       | 8            | Double precision floating point number, the effective number of digits is 15-16, the value range is [-1.7E308, 1.7E308].                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | 8   |      BINARY       | User Defined | Single-byte string for ASCII visible characters. Length must be specified when defining a column or tag of binary type.                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | 9   |     SMALLINT      | 2            | Short integer, the value range is [-32768, 32767].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| 10  |   INT UNSIGNED   | 2            | unsigned integer, the value range is [0, 65535].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| 10  | SMALLINT UNSIGNED | 2            | unsigned integer, the value range is [0, 65535].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | 11  |      TINYINT      | 1            | Single-byte integer, the value range is [-128, 127].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | 12  | TINYINT UNSIGNED  | 1            | unsigned single-byte integer, the value range is [0, 255].                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | 13  |        BOOL       | 1            | Bool, the value range is {true, false}.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | 14  |       NCHAR       | User Defined | Multi-byte string that can include multi byte characters like Chinese characters. Each character of NCHAR type consumes 4 bytes storage. The string value should be quoted with single quotes. Literal single quote inside the string must be preceded with backslash, like `\'`. The length must be specified when defining a column or tag of NCHAR type, for example nchar(10) means it can store at most 10 characters of nchar type and will consume fixed storage of 40 bytes. An error will be reported if the string value exceeds the length defined. |
 | 15  |       JSON        |              | JSON type can only be used on tags. A tag of json type is excluded with any other tags of any other type.                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | 16  |      VARCHAR      | User-defined | Alias of BINARY                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 :::note
 - Only ASCII visible characters are suggested to be used in a column or tag of BINARY type. Multi-byte characters must be stored in NCHAR type.
- The length of BINARY can be up to 16,374 bytes. The string value must be quoted with single quotes. You must specify a length in bytes for a BINARY value, for example binary(20) for up to twenty single-byte characters. If the data exceeds the specified length, an error will occur. The literal single quote inside the string must be preceded with back slash like `\'`
+- The length of BINARY can be up to 16,374(data column is 65,517 and tag column is 16,382 since version 3.0.5.0) bytes. The string value must be quoted with single quotes. You must specify a length in bytes for a BINARY value, for example binary(20) for up to twenty single-byte characters. If the data exceeds the specified length, an error will occur. The literal single quote inside the string must be preceded with back slash like `\'`
 - Numeric values in SQL statements will be determined as integer or float type according to whether there is decimal point or whether scientific notation is used, so attention must be paid to avoid overflow. For example, 9999999999999999999 will be considered as overflow because it exceeds the upper limit of long integer, but 9999999999999999999.0 will be considered as a legal float number.
 :::

--- a/docs/en/12-taos-sql/02-database.md
+++ b/docs/en/12-taos-sql/02-database.md
@@ -72,8 +72,8 @@ database_option: {
  - 0: The database can contain multiple supertables.
  - 1: The database can contain only one supertable.
 - STT_TRIGGER: specifies the number of file merges triggered by flushed files. The default is 8, ranging from 1 to 16. For high-frequency scenarios with few tables, it is recommended to use the default configuration or a smaller value for this parameter; For multi-table low-frequency scenarios, it is recommended to configure this parameter with a larger value.
- TABLE_PREFIX：The prefix length in the table name that is ignored when distributing table to vnode based on table name.
+- TABLE_PREFIX: The prefix in the table name that is ignored when distributing a table to a vgroup when it's a positive number, or only the prefix is used when distributing a table to a vgroup, the default value is 0; For example, if the table name v30001, then "0001" is used if TSDB_PREFIX is set to 2 but "v3" is used if TSDB_PREFIX is set to -2; It can help you to control the distribution of tables.
- TABLE_SUFFIX：The suffix length in the table name that is ignored when distributing table to vnode based on table name.
+- TABLE_SUFFIX: The suffix in the table name that is ignored when distributing a table to a vgroup when it's a positive number, or only the suffix is used when distributing a table to a vgroup, the default value is 0; For example, if the table name v30001, then "v300" is used if TSDB_SUFFIX is set to 2 but "01" is used if TSDB_SUFFIX is set to -2; It can help you to control the distribution of tables. 
 - TSDB_PAGESIZE: The page size of the data storage engine in a vnode. The unit is KB. The default is 4 KB. The range is 1 to 16384, that is, 1 KB to 16 MB.
 - WAL_RETENTION_PERIOD: specifies the maximum time of which WAL files are to be kept for consumption. This parameter is used for data subscription. Enter a time in seconds. The default value 0. A value of 0 indicates that WAL files are not required to keep for consumption. Alter it with a proper value at first to create topics.
 - WAL_RETENTION_SIZE: specifies the maximum total size of which WAL files are to be kept for consumption. This parameter is used for data subscription. Enter a size in KB. The default value is 0. A value of 0 indicates that the total size of WAL files to keep for consumption has no upper limit.

--- a/docs/en/12-taos-sql/03-table.md
+++ b/docs/en/12-taos-sql/03-table.md
--- a/docs/en/12-taos-sql/04-stable.md
+++ b/docs/en/12-taos-sql/04-stable.md
--- a/docs/en/12-taos-sql/05-insert.md
+++ b/docs/en/12-taos-sql/05-insert.md
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
--- a/docs/en/12-taos-sql/07-tag-index.md
+++ b/docs/en/12-taos-sql/07-tag-index.md
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
--- a/docs/en/12-taos-sql/12-distinguished.md
+++ b/docs/en/12-taos-sql/12-distinguished.md
--- a/docs/en/12-taos-sql/14-stream.md
+++ b/docs/en/12-taos-sql/14-stream.md
--- a/docs/en/12-taos-sql/17-json.md
+++ b/docs/en/12-taos-sql/17-json.md
--- a/docs/en/12-taos-sql/18-escape.md
+++ b/docs/en/12-taos-sql/18-escape.md
--- a/docs/en/12-taos-sql/19-limit.md
+++ b/docs/en/12-taos-sql/19-limit.md
--- a/docs/en/12-taos-sql/22-meta.md
+++ b/docs/en/12-taos-sql/22-meta.md
--- a/docs/en/12-taos-sql/23-perf.md
+++ b/docs/en/12-taos-sql/23-perf.md
--- a/docs/en/12-taos-sql/24-show.md
+++ b/docs/en/12-taos-sql/24-show.md
--- a/docs/en/12-taos-sql/26-udf.md
+++ b/docs/en/12-taos-sql/26-udf.md
--- a/docs/en/12-taos-sql/29-changes.md
+++ b/docs/en/12-taos-sql/29-changes.md
--- a/docs/en/12-taos-sql/index.md
+++ b/docs/en/12-taos-sql/index.md
--- a/docs/en/13-operation/10-monitor.md
+++ b/docs/en/13-operation/10-monitor.md
--- a/docs/en/13-operation/17-diagnose.md
+++ b/docs/en/13-operation/17-diagnose.md
--- a/docs/en/14-reference/02-rest-api/02-rest-api.mdx
+++ b/docs/en/14-reference/02-rest-api/02-rest-api.mdx
--- a/docs/en/14-reference/03-connector/03-cpp.mdx
+++ b/docs/en/14-reference/03-connector/03-cpp.mdx
--- a/docs/en/14-reference/03-connector/04-java.mdx
+++ b/docs/en/14-reference/03-connector/04-java.mdx
--- a/docs/en/14-reference/03-connector/05-go.mdx
+++ b/docs/en/14-reference/03-connector/05-go.mdx
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
--- a/docs/en/14-reference/03-connector/07-python.mdx
+++ b/docs/en/14-reference/03-connector/07-python.mdx
--- a/docs/en/14-reference/03-connector/08-node.mdx
+++ b/docs/en/14-reference/03-connector/08-node.mdx
--- a/docs/en/14-reference/03-connector/09-csharp.mdx
+++ b/docs/en/14-reference/03-connector/09-csharp.mdx
--- a/docs/en/14-reference/03-connector/10-php.mdx
+++ b/docs/en/14-reference/03-connector/10-php.mdx
--- a/docs/en/14-reference/03-connector/index.mdx
+++ b/docs/en/14-reference/03-connector/index.mdx
--- a/docs/en/14-reference/04-taosadapter.md
+++ b/docs/en/14-reference/04-taosadapter.md
--- a/docs/en/14-reference/05-taosbenchmark.md
+++ b/docs/en/14-reference/05-taosbenchmark.md
--- a/docs/en/14-reference/06-taosdump.md
+++ b/docs/en/14-reference/06-taosdump.md
--- a/docs/en/14-reference/07-tdinsight/index.md
+++ b/docs/en/14-reference/07-tdinsight/index.md
--- a/docs/en/14-reference/12-config/index.md
+++ b/docs/en/14-reference/12-config/index.md
--- a/docs/en/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/en/14-reference/13-schemaless/13-schemaless.md
--- a/docs/en/14-reference/14-taosKeeper.md
+++ b/docs/en/14-reference/14-taosKeeper.md
--- a/docs/en/20-third-party/01-grafana.mdx
+++ b/docs/en/20-third-party/01-grafana.mdx
--- a/docs/en/20-third-party/09-emq-broker.md
+++ b/docs/en/20-third-party/09-emq-broker.md
--- a/docs/en/20-third-party/11-kafka.md
+++ b/docs/en/20-third-party/11-kafka.md
--- a/docs/en/20-third-party/12-google-data-studio.md
+++ b/docs/en/20-third-party/12-google-data-studio.md
--- a/docs/en/20-third-party/14-dbeaver.md
+++ b/docs/en/20-third-party/14-dbeaver.md
--- a/docs/en/20-third-party/dbeaver/dbeaver-browse-data-cloud-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-browse-data-cloud-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-browse-data-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-browse-data-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-config-tdengine-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-config-tdengine-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-test-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-test-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-test-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-connect-tdengine-test-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-sql-execution-cloud-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-sql-execution-cloud-en.webp
--- a/docs/en/20-third-party/dbeaver/dbeaver-sql-execution-en.webp
+++ b/docs/en/20-third-party/dbeaver/dbeaver-sql-execution-en.webp
--- a/docs/en/20-third-party/dbeaver/tdengine-cloud-jdbc-dsn-en.webp
+++ b/docs/en/20-third-party/dbeaver/tdengine-cloud-jdbc-dsn-en.webp
--- a/docs/en/21-tdinternal/01-arch.md
+++ b/docs/en/21-tdinternal/01-arch.md
--- a/docs/en/25-application/01-telegraf.md
+++ b/docs/en/25-application/01-telegraf.md
--- a/docs/en/25-application/02-collectd.md
+++ b/docs/en/25-application/02-collectd.md
--- a/docs/en/25-application/_03-immigrate.md
+++ b/docs/en/25-application/_03-immigrate.md
--- a/docs/en/27-train-faq/01-faq.md
+++ b/docs/en/27-train-faq/01-faq.md
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
--- a/docs/en/28-releases/02-tools.md
+++ b/docs/en/28-releases/02-tools.md
--- a/docs/examples/c/async_query_example.c
+++ b/docs/examples/c/async_query_example.c
--- a/docs/examples/c/query_example.c
+++ b/docs/examples/c/query_example.c
--- a/docs/examples/java/pom.xml
+++ b/docs/examples/java/pom.xml
--- a/docs/examples/java/src/main/java/com/taos/example/StmtInsertExample.java
+++ b/docs/examples/java/src/main/java/com/taos/example/StmtInsertExample.java
--- a/docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java
+++ b/docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java
--- a/docs/examples/java/src/main/java/com/taos/example/WebsocketSubscribeDemo.java
+++ b/docs/examples/java/src/main/java/com/taos/example/WebsocketSubscribeDemo.java
--- a/docs/examples/python/schemaless_insert.py
+++ b/docs/examples/python/schemaless_insert.py
--- a/docs/examples/python/schemaless_insert_raw.py
+++ b/docs/examples/python/schemaless_insert_raw.py
--- a/docs/examples/python/schemaless_insert_raw_req_id.py
+++ b/docs/examples/python/schemaless_insert_raw_req_id.py
--- a/docs/examples/python/schemaless_insert_raw_ttl.py
+++ b/docs/examples/python/schemaless_insert_raw_ttl.py
--- a/docs/examples/python/schemaless_insert_req_id.py
+++ b/docs/examples/python/schemaless_insert_req_id.py
--- a/docs/examples/python/schemaless_insert_ttl.py
+++ b/docs/examples/python/schemaless_insert_ttl.py
--- a/docs/examples/python/stmt_example.py
+++ b/docs/examples/python/stmt_example.py
--- a/docs/examples/python/stmt_websocket_example.py
+++ b/docs/examples/python/stmt_websocket_example.py
--- a/docs/examples/python/tmq_assignment_example.py
+++ b/docs/examples/python/tmq_assignment_example.py
--- a/docs/examples/python/tmq_websocket_assgnment_example.py
+++ b/docs/examples/python/tmq_websocket_assgnment_example.py
--- a/docs/examples/rust/nativeexample/examples/schemaless_insert_json.rs
+++ b/docs/examples/rust/nativeexample/examples/schemaless_insert_json.rs
--- a/docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs
+++ b/docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs
--- a/docs/examples/rust/nativeexample/examples/schemaless_insert_telnet.rs
+++ b/docs/examples/rust/nativeexample/examples/schemaless_insert_telnet.rs
--- a/docs/zh/02-intro.md
+++ b/docs/zh/02-intro.md
--- a/docs/zh/05-get-started/03-package.md
+++ b/docs/zh/05-get-started/03-package.md
--- a/docs/zh/07-develop/01-connect/index.md
+++ b/docs/zh/07-develop/01-connect/index.md
--- a/docs/zh/07-develop/03-insert-data/30-influxdb-line.mdx
+++ b/docs/zh/07-develop/03-insert-data/30-influxdb-line.mdx
--- a/docs/zh/07-develop/03-insert-data/40-opentsdb-telnet.mdx
+++ b/docs/zh/07-develop/03-insert-data/40-opentsdb-telnet.mdx
--- a/docs/zh/07-develop/03-insert-data/50-opentsdb-json.mdx
+++ b/docs/zh/07-develop/03-insert-data/50-opentsdb-json.mdx
--- a/docs/zh/07-develop/03-insert-data/_rust_schemaless.mdx
+++ b/docs/zh/07-develop/03-insert-data/_rust_schemaless.mdx
--- a/docs/zh/07-develop/04-query-data/index.mdx
+++ b/docs/zh/07-develop/04-query-data/index.mdx
--- a/docs/zh/07-develop/07-tmq.mdx
+++ b/docs/zh/07-develop/07-tmq.mdx
--- a/docs/zh/07-develop/08-cache.md
+++ b/docs/zh/07-develop/08-cache.md
--- a/docs/zh/07-develop/09-udf.md
+++ b/docs/zh/07-develop/09-udf.md
--- a/docs/zh/08-connector/14-java.mdx
+++ b/docs/zh/08-connector/14-java.mdx
--- a/docs/zh/08-connector/20-go.mdx
+++ b/docs/zh/08-connector/20-go.mdx
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
--- a/docs/zh/08-connector/30-python.mdx
+++ b/docs/zh/08-connector/30-python.mdx
--- a/docs/zh/08-connector/index.md
+++ b/docs/zh/08-connector/index.md
--- a/docs/zh/12-taos-sql/01-data-type.md
+++ b/docs/zh/12-taos-sql/01-data-type.md
--- a/docs/zh/12-taos-sql/02-database.md
+++ b/docs/zh/12-taos-sql/02-database.md
--- a/docs/zh/12-taos-sql/03-table.md
+++ b/docs/zh/12-taos-sql/03-table.md
--- a/docs/zh/12-taos-sql/04-stable.md
+++ b/docs/zh/12-taos-sql/04-stable.md
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
--- a/docs/zh/12-taos-sql/14-stream.md
+++ b/docs/zh/12-taos-sql/14-stream.md
--- a/docs/zh/12-taos-sql/19-limit.md
+++ b/docs/zh/12-taos-sql/19-limit.md
--- a/docs/zh/12-taos-sql/22-meta.md
+++ b/docs/zh/12-taos-sql/22-meta.md
--- a/docs/zh/12-taos-sql/23-perf.md
+++ b/docs/zh/12-taos-sql/23-perf.md
--- a/docs/zh/12-taos-sql/24-show.md
+++ b/docs/zh/12-taos-sql/24-show.md
--- a/docs/zh/12-taos-sql/26-udf.md
+++ b/docs/zh/12-taos-sql/26-udf.md
--- a/docs/zh/12-taos-sql/29-changes.md
+++ b/docs/zh/12-taos-sql/29-changes.md
--- a/docs/zh/14-reference/04-taosadapter.md
+++ b/docs/zh/14-reference/04-taosadapter.md
--- a/docs/zh/14-reference/06-taosdump.md
+++ b/docs/zh/14-reference/06-taosdump.md
--- a/docs/zh/14-reference/07-tdinsight/index.mdx
+++ b/docs/zh/14-reference/07-tdinsight/index.mdx
--- a/docs/zh/14-reference/12-config/index.md
+++ b/docs/zh/14-reference/12-config/index.md
--- a/docs/zh/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/zh/14-reference/13-schemaless/13-schemaless.md
--- a/docs/zh/14-reference/14-taosKeeper.md
+++ b/docs/zh/14-reference/14-taosKeeper.md
--- a/docs/zh/17-operation/10-monitor.md
+++ b/docs/zh/17-operation/10-monitor.md
--- a/docs/zh/20-third-party/01-grafana.mdx
+++ b/docs/zh/20-third-party/01-grafana.mdx
--- a/docs/zh/20-third-party/11-kafka.md
+++ b/docs/zh/20-third-party/11-kafka.md
--- a/docs/zh/20-third-party/13-dbeaver.md
+++ b/docs/zh/20-third-party/13-dbeaver.md
--- a/docs/zh/20-third-party/dbeaver/dbeaver-browse-cloud-data-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-browse-cloud-data-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-browse-data-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-browse-data-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-config-tdengine-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-config-tdengine-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-test-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-test-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-cloud-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-test-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-test-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-connect-tdengine-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-sql-execution-cloud-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-sql-execution-cloud-zh.webp
--- a/docs/zh/20-third-party/dbeaver/dbeaver-sql-execution-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/dbeaver-sql-execution-zh.webp
--- a/docs/zh/20-third-party/dbeaver/tdengine-cloud-jdbc-dsn-zh.webp
+++ b/docs/zh/20-third-party/dbeaver/tdengine-cloud-jdbc-dsn-zh.webp
--- a/docs/zh/21-tdinternal/01-arch.md
+++ b/docs/zh/21-tdinternal/01-arch.md
--- a/docs/zh/27-train-faq/01-faq.md
+++ b/docs/zh/27-train-faq/01-faq.md
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
--- a/docs/zh/28-releases/02-tools.md
+++ b/docs/zh/28-releases/02-tools.md
--- a/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java
+++ b/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java
--- a/examples/JDBC/consumer-demo/pom.xml
+++ b/examples/JDBC/consumer-demo/pom.xml
--- a/examples/JDBC/consumer-demo/readme.md
+++ b/examples/JDBC/consumer-demo/readme.md
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
--- a/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/examples/JDBC/springbootdemo/src/main/resources/application.properties
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
--- a/examples/c/tmq.c
+++ b/examples/c/tmq.c
--- a/examples/lua/lua51/lua_connector51.c
+++ b/examples/lua/lua51/lua_connector51.c
--- a/examples/lua/lua_connector.c
+++ b/examples/lua/lua_connector.c
--- a/include/client/taos.h
+++ b/include/client/taos.h
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
--- a/include/common/tgrant.h
+++ b/include/common/tgrant.h
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
--- a/include/common/ttime.h
+++ b/include/common/ttime.h
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
--- a/include/dnode/mnode/mnode.h
+++ b/include/dnode/mnode/mnode.h
--- a/include/libs/catalog/catalog.h
+++ b/include/libs/catalog/catalog.h
--- a/include/libs/executor/dataSinkMgt.h
+++ b/include/libs/executor/dataSinkMgt.h
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
--- a/include/libs/executor/storageapi.h
+++ b/include/libs/executor/storageapi.h
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
--- a/include/libs/function/taosudf.h
+++ b/include/libs/function/taosudf.h
--- a/include/libs/function/tudf.h
+++ b/include/libs/function/tudf.h
--- a/include/libs/geometry/geomFunc.h
+++ b/include/libs/geometry/geomFunc.h
--- a/include/libs/geometry/geosWrapper.h
+++ b/include/libs/geometry/geosWrapper.h
--- a/include/libs/index/index.h
+++ b/include/libs/index/index.h
--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
--- a/include/libs/nodes/plannodes.h
+++ b/include/libs/nodes/plannodes.h
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
--- a/include/libs/planner/planner.h
+++ b/include/libs/planner/planner.h
--- a/include/libs/qcom/query.h
+++ b/include/libs/qcom/query.h
--- a/include/libs/stream/streamState.h
+++ b/include/libs/stream/streamState.h
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
--- a/include/libs/stream/tstreamFileState.h
+++ b/include/libs/stream/tstreamFileState.h
--- a/include/libs/stream/tstreamUpdate.h
+++ b/include/libs/stream/tstreamUpdate.h
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
--- a/include/libs/tfs/tfs.h
+++ b/include/libs/tfs/tfs.h
--- a/include/libs/wal/wal.h
+++ b/include/libs/wal/wal.h
--- a/include/os/osMemory.h
+++ b/include/os/osMemory.h
--- a/include/util/talgo.h
+++ b/include/util/talgo.h
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
--- a/include/util/tarray.h
+++ b/include/util/tarray.h
--- a/include/util/tcompare.h
+++ b/include/util/tcompare.h
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
--- a/include/util/tgeosctx.h
+++ b/include/util/tgeosctx.h
--- a/include/util/theap.h
+++ b/include/util/theap.h
--- a/include/util/tlist.h
+++ b/include/util/tlist.h
--- a/include/util/tlog.h
+++ b/include/util/tlog.h
--- a/include/util/tlosertree.h
+++ b/include/util/tlosertree.h
--- a/include/util/tlrucache.h
+++ b/include/util/tlrucache.h
--- a/include/util/tqueue.h
+++ b/include/util/tqueue.h
--- a/packaging/checkPackageRuning.py
+++ b/packaging/checkPackageRuning.py
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
--- a/packaging/testpackage.sh
+++ b/packaging/testpackage.sh
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
--- a/source/client/inc/clientLog.h
+++ b/source/client/inc/clientLog.h
--- a/source/client/inc/clientSml.h
+++ b/source/client/inc/clientSml.h
--- a/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h
+++ b/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
--- a/source/client/src/clientJniConnector.c
+++ b/source/client/src/clientJniConnector.c
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
--- a/source/client/src/clientSmlJson.c
+++ b/source/client/src/clientSmlJson.c
--- a/source/client/src/clientSmlLine.c
+++ b/source/client/src/clientSmlLine.c
--- a/source/client/src/clientSmlTelnet.c
+++ b/source/client/src/clientSmlTelnet.c
--- a/source/client/src/clientStmt.c
+++ b/source/client/src/clientStmt.c
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
--- a/source/client/src/clientTmqConnector.c
+++ b/source/client/src/clientTmqConnector.c
--- a/source/client/test/clientTests.cpp
+++ b/source/client/test/clientTests.cpp
--- a/source/client/test/smlTest.cpp
+++ b/source/client/test/smlTest.cpp
--- a/source/common/src/systable.c
+++ b/source/common/src/systable.c
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
--- a/source/common/src/ttszip.c
+++ b/source/common/src/ttszip.c
--- a/source/common/src/ttypes.c
+++ b/source/common/src/ttypes.c
--- a/source/common/src/tvariant.c
+++ b/source/common/src/tvariant.c
--- a/source/common/test/dataformatTest.cpp
+++ b/source/common/test/dataformatTest.cpp
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
--- a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
+++ b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
--- a/source/dnode/mgmt/mgmt_snode/src/smHandle.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smHandle.c
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
--- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
--- a/source/dnode/mgmt/node_util/inc/dmUtil.h
+++ b/source/dnode/mgmt/node_util/inc/dmUtil.h
--- a/source/dnode/mgmt/node_util/src/dmEps.c
+++ b/source/dnode/mgmt/node_util/src/dmEps.c
--- a/source/dnode/mnode/impl/CMakeLists.txt
+++ b/source/dnode/mnode/impl/CMakeLists.txt
--- a/source/dnode/mnode/impl/inc/mndConsumer.h
+++ b/source/dnode/mnode/impl/inc/mndConsumer.h
--- a/source/dnode/mnode/impl/inc/mndDb.h
+++ b/source/dnode/mnode/impl/inc/mndDb.h
--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
--- a/source/dnode/mnode/impl/inc/mndDnode.h
+++ b/source/dnode/mnode/impl/inc/mndDnode.h
--- a/source/dnode/mnode/impl/inc/mndInt.h
+++ b/source/dnode/mnode/impl/inc/mndInt.h
--- a/source/dnode/mnode/impl/inc/mndMnode.h
+++ b/source/dnode/mnode/impl/inc/mndMnode.h
--- a/source/dnode/mnode/impl/inc/mndQnode.h
+++ b/source/dnode/mnode/impl/inc/mndQnode.h
--- a/source/dnode/mnode/impl/inc/mndScheduler.h
+++ b/source/dnode/mnode/impl/inc/mndScheduler.h
--- a/source/dnode/mnode/impl/inc/mndStb.h
+++ b/source/dnode/mnode/impl/inc/mndStb.h
--- a/source/dnode/mnode/impl/inc/mndStream.h
+++ b/source/dnode/mnode/impl/inc/mndStream.h
--- a/source/dnode/mnode/impl/inc/mndSubscribe.h
+++ b/source/dnode/mnode/impl/inc/mndSubscribe.h
--- a/source/dnode/mnode/impl/inc/mndTrans.h
+++ b/source/dnode/mnode/impl/inc/mndTrans.h
--- a/source/dnode/mnode/impl/inc/mndUser.h
+++ b/source/dnode/mnode/impl/inc/mndUser.h
--- a/source/dnode/mnode/impl/inc/mndVgroup.h
+++ b/source/dnode/mnode/impl/inc/mndVgroup.h
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
--- a/source/dnode/mnode/impl/src/mndDump.c
+++ b/source/dnode/mnode/impl/src/mndDump.c
--- a/source/dnode/mnode/impl/src/mndFunc.c
+++ b/source/dnode/mnode/impl/src/mndFunc.c
--- a/source/dnode/mnode/impl/src/mndIndex.c
+++ b/source/dnode/mnode/impl/src/mndIndex.c
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
--- a/source/dnode/mnode/impl/src/mndQnode.c
+++ b/source/dnode/mnode/impl/src/mndQnode.c
--- a/source/dnode/mnode/impl/src/mndQuery.c
+++ b/source/dnode/mnode/impl/src/mndQuery.c
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
--- a/source/dnode/mnode/impl/src/mndSync.c
+++ b/source/dnode/mnode/impl/src/mndSync.c
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
--- a/source/dnode/mnode/sdb/inc/sdb.h
+++ b/source/dnode/mnode/sdb/inc/sdb.h
--- a/source/dnode/mnode/sdb/src/sdbHash.c
+++ b/source/dnode/mnode/sdb/src/sdbHash.c
--- a/source/dnode/qnode/CMakeLists.txt
+++ b/source/dnode/qnode/CMakeLists.txt
--- a/source/dnode/qnode/src/qnode.c
+++ b/source/dnode/qnode/src/qnode.c
--- a/source/dnode/snode/CMakeLists.txt
+++ b/source/dnode/snode/CMakeLists.txt
--- a/source/dnode/snode/inc/sndInt.h
+++ b/source/dnode/snode/inc/sndInt.h
--- a/source/dnode/snode/src/snode.c
+++ b/source/dnode/snode/src/snode.c
--- a/source/dnode/snode/src/snodeInitApi.c
+++ b/source/dnode/snode/src/snodeInitApi.c
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
--- a/source/dnode/vnode/src/inc/meta.h
+++ b/source/dnode/vnode/src/inc/meta.h
--- a/source/dnode/vnode/src/inc/metaTtl.h
+++ b/source/dnode/vnode/src/inc/metaTtl.h
--- a/source/dnode/vnode/src/inc/tq.h
+++ b/source/dnode/vnode/src/inc/tq.h
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
--- a/source/dnode/vnode/src/meta/metaCommit.c
+++ b/source/dnode/vnode/src/meta/metaCommit.c
--- a/source/dnode/vnode/src/meta/metaEntry.c
+++ b/source/dnode/vnode/src/meta/metaEntry.c
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
--- a/source/dnode/vnode/src/meta/metaSma.c
+++ b/source/dnode/vnode/src/meta/metaSma.c
--- a/source/dnode/vnode/src/meta/metaSnapshot.c
+++ b/source/dnode/vnode/src/meta/metaSnapshot.c
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
--- a/source/dnode/vnode/src/meta/metaTtl.c
+++ b/source/dnode/vnode/src/meta/metaTtl.c
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
--- a/source/dnode/vnode/src/tq/tqOffset.c
+++ b/source/dnode/vnode/src/tq/tqOffset.c
--- a/source/dnode/vnode/src/tq/tqPush.c
+++ b/source/dnode/vnode/src/tq/tqPush.c
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
--- a/source/dnode/vnode/src/tq/tqRestore.c
+++ b/source/dnode/vnode/src/tq/tqRestore.c
--- a/source/dnode/vnode/src/tq/tqScan.c
+++ b/source/dnode/vnode/src/tq/tqScan.c
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
--- a/source/dnode/vnode/src/tq/tqUtil.c
+++ b/source/dnode/vnode/src/tq/tqUtil.c
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
--- a/source/dnode/vnode/src/tsdb/tsdbDataIter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbDataIter.c
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
--- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
--- a/source/dnode/vnode/src/vnd/vnodeCfg.c
+++ b/source/dnode/vnode/src/vnd/vnodeCfg.c
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
--- a/source/dnode/vnode/src/vnd/vnodeInitApi.c
+++ b/source/dnode/vnode/src/vnd/vnodeInitApi.c
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
--- a/source/libs/CMakeLists.txt
+++ b/source/libs/CMakeLists.txt
--- a/test1
+++ b/test1
--- a/source/libs/catalog/CMakeLists.txt
+++ b/source/libs/catalog/CMakeLists.txt
--- a/source/libs/catalog/inc/catalogInt.h
+++ b/source/libs/catalog/inc/catalogInt.h
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
--- a/source/libs/catalog/src/ctgAsync.c
+++ b/source/libs/catalog/src/ctgAsync.c
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
--- a/source/libs/catalog/src/ctgDbg.c
+++ b/source/libs/catalog/src/ctgDbg.c
--- a/source/libs/catalog/src/ctgRemote.c
+++ b/source/libs/catalog/src/ctgRemote.c
--- a/source/libs/catalog/src/ctgUtil.c
+++ b/source/libs/catalog/src/ctgUtil.c
--- a/source/libs/catalog/test/catalogTests.cpp
+++ b/source/libs/catalog/test/catalogTests.cpp
--- a/source/libs/command/inc/commandInt.h
+++ b/source/libs/command/inc/commandInt.h
--- a/source/libs/command/src/command.c
+++ b/source/libs/command/src/command.c
--- a/source/libs/command/src/explain.c
+++ b/source/libs/command/src/explain.c
--- a/source/libs/executor/CMakeLists.txt
+++ b/source/libs/executor/CMakeLists.txt
--- a/source/libs/executor/inc/dataSinkInt.h
+++ b/source/libs/executor/inc/dataSinkInt.h
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
--- a/source/libs/executor/inc/operator.h
+++ b/source/libs/executor/inc/operator.h
--- a/source/libs/executor/inc/querytask.h
+++ b/source/libs/executor/inc/querytask.h
--- a/source/libs/executor/inc/tfill.h
+++ b/source/libs/executor/inc/tfill.h
--- a/source/libs/executor/inc/tsort.h
+++ b/source/libs/executor/inc/tsort.h
--- a/source/libs/executor/src/aggregateoperator.c
+++ b/source/libs/executor/src/aggregateoperator.c
--- a/source/libs/executor/src/cachescanoperator.c
+++ b/source/libs/executor/src/cachescanoperator.c
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
--- a/source/libs/executor/src/dataInserter.c
+++ b/source/libs/executor/src/dataInserter.c
--- a/source/libs/executor/src/dataSinkMgt.c
+++ b/source/libs/executor/src/dataSinkMgt.c
--- a/source/libs/executor/src/eventwindowoperator.c
+++ b/source/libs/executor/src/eventwindowoperator.c
--- a/source/libs/executor/src/exchangeoperator.c
+++ b/source/libs/executor/src/exchangeoperator.c
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
--- a/source/libs/executor/src/filloperator.c
+++ b/source/libs/executor/src/filloperator.c
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
--- a/source/libs/executor/src/joinoperator.c
+++ b/source/libs/executor/src/joinoperator.c
--- a/source/libs/executor/src/operator.c
+++ b/source/libs/executor/src/operator.c
--- a/source/libs/executor/src/projectoperator.c
+++ b/source/libs/executor/src/projectoperator.c
--- a/source/libs/executor/src/querytask.c
+++ b/source/libs/executor/src/querytask.c
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
--- a/source/libs/executor/src/timesliceoperator.c
+++ b/source/libs/executor/src/timesliceoperator.c
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
--- a/source/libs/executor/src/tlinearhash.c
+++ b/source/libs/executor/src/tlinearhash.c
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
--- a/source/libs/executor/test/sortTests.cpp
+++ b/source/libs/executor/test/sortTests.cpp
--- a/source/libs/executor/test/timewindowTest.cpp
+++ b/source/libs/executor/test/timewindowTest.cpp
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
--- a/source/libs/function/inc/functionMgtInt.h
+++ b/source/libs/function/inc/functionMgtInt.h
--- a/source/libs/function/inc/tpercentile.h
+++ b/source/libs/function/inc/tpercentile.h
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
--- a/source/libs/function/src/thistogram.c
+++ b/source/libs/function/src/thistogram.c
--- a/source/libs/function/src/tpercentile.c
+++ b/source/libs/function/src/tpercentile.c
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
--- a/source/libs/geometry/CMakeLists.txt
+++ b/source/libs/geometry/CMakeLists.txt
--- a/source/libs/geometry/src/geomFunc.c
+++ b/source/libs/geometry/src/geomFunc.c
--- a/source/libs/geometry/src/geosWrapper.c
+++ b/source/libs/geometry/src/geosWrapper.c
--- a/source/libs/geometry/test/CMakeLists.txt
+++ b/source/libs/geometry/test/CMakeLists.txt
--- a/source/libs/geometry/test/geomFuncTest.cpp
+++ b/source/libs/geometry/test/geomFuncTest.cpp
--- a/source/libs/geometry/test/geomFuncTestUtil.cpp
+++ b/source/libs/geometry/test/geomFuncTestUtil.cpp
--- a/source/libs/geometry/test/geomFuncTestUtil.h
+++ b/source/libs/geometry/test/geomFuncTestUtil.h
--- a/source/libs/geometry/test/geomIoFuncTest.cpp
+++ b/source/libs/geometry/test/geomIoFuncTest.cpp
--- a/source/libs/geometry/test/geomRelationFuncTest.cpp
+++ b/source/libs/geometry/test/geomRelationFuncTest.cpp
--- a/source/libs/index/CMakeLists.txt
+++ b/source/libs/index/CMakeLists.txt
--- a/source/libs/index/src/indexCache.c
+++ b/source/libs/index/src/indexCache.c
--- a/source/libs/index/src/indexComm.c
+++ b/source/libs/index/src/indexComm.c
--- a/source/libs/index/src/indexFilter.c
+++ b/source/libs/index/src/indexFilter.c
--- a/source/libs/index/src/indexFstFile.c
+++ b/source/libs/index/src/indexFstFile.c
--- a/source/libs/index/src/indexJson.c
+++ b/source/libs/index/src/indexJson.c
--- a/source/libs/index/src/indexTfile.c
+++ b/source/libs/index/src/indexTfile.c
--- a/source/libs/index/test/indexBench.cc
+++ b/source/libs/index/test/indexBench.cc
--- a/source/libs/index/test/indexTests.cc
+++ b/source/libs/index/test/indexTests.cc
--- a/source/libs/index/test/jsonUT.cc
+++ b/source/libs/index/test/jsonUT.cc
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
--- a/source/libs/nodes/src/nodesEqualFuncs.c
+++ b/source/libs/nodes/src/nodesEqualFuncs.c
--- a/source/libs/nodes/src/nodesMatchFuncs.c
+++ b/source/libs/nodes/src/nodesMatchFuncs.c
--- a/source/libs/nodes/src/nodesMsgFuncs.c
+++ b/source/libs/nodes/src/nodesMsgFuncs.c
--- a/source/libs/nodes/src/nodesToSQLFuncs.c
+++ b/source/libs/nodes/src/nodesToSQLFuncs.c
--- a/source/libs/nodes/src/nodesTraverseFuncs.c
+++ b/source/libs/nodes/src/nodesTraverseFuncs.c
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
--- a/source/libs/parser/CMakeLists.txt
+++ b/source/libs/parser/CMakeLists.txt
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
--- a/source/libs/parser/inc/parInt.h
+++ b/source/libs/parser/inc/parInt.h
--- a/source/libs/parser/inc/parUtil.h
+++ b/source/libs/parser/inc/parUtil.h
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
--- a/source/libs/parser/src/parAstParser.c
+++ b/source/libs/parser/src/parAstParser.c
--- a/source/libs/parser/src/parAuthenticator.c
+++ b/source/libs/parser/src/parAuthenticator.c
--- a/source/libs/parser/src/parCalcConst.c
+++ b/source/libs/parser/src/parCalcConst.c
--- a/source/libs/parser/src/parInsertSml.c
+++ b/source/libs/parser/src/parInsertSml.c
--- a/source/libs/parser/src/parInsertSql.c
+++ b/source/libs/parser/src/parInsertSql.c
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
--- a/source/libs/parser/src/parInsertUtil.c
+++ b/source/libs/parser/src/parInsertUtil.c
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
--- a/source/libs/parser/src/parser.c
+++ b/source/libs/parser/src/parser.c
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
--- a/source/libs/parser/test/parAlterToBalanceTest.cpp
+++ b/source/libs/parser/test/parAlterToBalanceTest.cpp
--- a/source/libs/parser/test/parExplainToSyncdbTest.cpp
+++ b/source/libs/parser/test/parExplainToSyncdbTest.cpp
--- a/source/libs/parser/test/parInitialCTest.cpp
+++ b/source/libs/parser/test/parInitialCTest.cpp
--- a/source/libs/parser/test/parInitialDTest.cpp
+++ b/source/libs/parser/test/parInitialDTest.cpp
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
--- a/source/libs/planner/src/planPhysiCreater.c
+++ b/source/libs/planner/src/planPhysiCreater.c
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
--- a/source/libs/planner/src/planUtil.c
+++ b/source/libs/planner/src/planUtil.c
--- a/source/libs/planner/src/planner.c
+++ b/source/libs/planner/src/planner.c
--- a/source/libs/planner/test/CMakeLists.txt
+++ b/source/libs/planner/test/CMakeLists.txt
--- a/source/libs/planner/test/planStmtTest.cpp
+++ b/source/libs/planner/test/planStmtTest.cpp
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
--- a/source/libs/qworker/CMakeLists.txt
+++ b/source/libs/qworker/CMakeLists.txt
--- a/source/libs/qworker/inc/qwInt.h
+++ b/source/libs/qworker/inc/qwInt.h
--- a/source/libs/qworker/src/qwDbg.c
+++ b/source/libs/qworker/src/qwDbg.c
--- a/source/libs/qworker/src/qwMsg.c
+++ b/source/libs/qworker/src/qwMsg.c
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
--- a/source/libs/qworker/test/CMakeLists.txt
+++ b/source/libs/qworker/test/CMakeLists.txt
--- a/source/libs/scalar/CMakeLists.txt
+++ b/source/libs/scalar/CMakeLists.txt
--- a/source/libs/scalar/inc/filterInt.h
+++ b/source/libs/scalar/inc/filterInt.h
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
--- a/source/libs/scheduler/CMakeLists.txt
+++ b/source/libs/scheduler/CMakeLists.txt
--- a/source/libs/scheduler/inc/schInt.h
+++ b/source/libs/scheduler/inc/schInt.h
--- a/source/libs/scheduler/src/schTask.c
+++ b/source/libs/scheduler/src/schTask.c
--- a/source/libs/scheduler/test/CMakeLists.txt
+++ b/source/libs/scheduler/test/CMakeLists.txt
--- a/source/libs/stream/CMakeLists.txt
+++ b/source/libs/stream/CMakeLists.txt
--- a/source/libs/stream/inc/streamBackendRocksdb.h
+++ b/source/libs/stream/inc/streamBackendRocksdb.h
--- a/source/libs/stream/inc/streamInc.h
+++ b/source/libs/stream/inc/streamInc.h
--- a/source/libs/stream/src/stream.c
+++ b/source/libs/stream/src/stream.c
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
--- a/source/libs/stream/src/streamCheckpoint.c
+++ b/source/libs/stream/src/streamCheckpoint.c
--- a/source/libs/stream/src/streamData.c
+++ b/source/libs/stream/src/streamData.c
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
--- a/source/libs/stream/src/streamExec.c
+++ b/source/libs/stream/src/streamExec.c
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
--- a/source/libs/stream/src/streamQueue.c
+++ b/source/libs/stream/src/streamQueue.c
--- a/source/libs/stream/src/streamRecover.c
+++ b/source/libs/stream/src/streamRecover.c
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
--- a/source/libs/stream/src/streamUpdate.c
+++ b/source/libs/stream/src/streamUpdate.c
--- a/source/libs/stream/src/tstreamFileState.c
+++ b/source/libs/stream/src/tstreamFileState.c
--- a/source/libs/stream/test/CMakeLists.txt
+++ b/source/libs/stream/test/CMakeLists.txt
--- a/source/libs/stream/test/tstreamUpdateTest.cpp
+++ b/source/libs/stream/test/tstreamUpdateTest.cpp
--- a/source/libs/sync/inc/syncIndexMgr.h
+++ b/source/libs/sync/inc/syncIndexMgr.h
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
--- a/source/libs/sync/inc/syncMessage.h
+++ b/source/libs/sync/inc/syncMessage.h
--- a/source/libs/sync/inc/syncPipeline.h
+++ b/source/libs/sync/inc/syncPipeline.h
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
--- a/source/libs/sync/src/syncElection.c
+++ b/source/libs/sync/src/syncElection.c
--- a/source/libs/sync/src/syncIndexMgr.c
+++ b/source/libs/sync/src/syncIndexMgr.c
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
--- a/source/libs/sync/src/syncRaftCfg.c
+++ b/source/libs/sync/src/syncRaftCfg.c
--- a/source/libs/sync/src/syncReplication.c
+++ b/source/libs/sync/src/syncReplication.c
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
--- a/source/libs/sync/src/syncTimeout.c
+++ b/source/libs/sync/src/syncTimeout.c
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
--- a/source/libs/sync/src/syncVoteMgr.c
+++ b/source/libs/sync/src/syncVoteMgr.c
--- a/source/libs/tdb/inc/tdb.h
+++ b/source/libs/tdb/inc/tdb.h
--- a/source/libs/tdb/src/db/tdbTable.c
+++ b/source/libs/tdb/src/db/tdbTable.c
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
--- a/source/libs/wal/src/walMeta.c
+++ b/source/libs/wal/src/walMeta.c
--- a/source/libs/wal/src/walRead.c
+++ b/source/libs/wal/src/walRead.c
--- a/source/libs/wal/src/walRef.c
+++ b/source/libs/wal/src/walRef.c
--- a/source/os/CMakeLists.txt
+++ b/source/os/CMakeLists.txt
--- a/source/os/src/osMemory.c
+++ b/source/os/src/osMemory.c
--- a/source/util/CMakeLists.txt
+++ b/source/util/CMakeLists.txt
--- a/source/util/src/tarray.c
+++ b/source/util/src/tarray.c
--- a/source/util/src/tcompare.c
+++ b/source/util/src/tcompare.c
--- a/source/util/src/tcompression.c
+++ b/source/util/src/tcompression.c
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
--- a/source/util/src/tgeosctx.c
+++ b/source/util/src/tgeosctx.c
--- a/source/util/src/thashutil.c
+++ b/source/util/src/thashutil.c
--- a/source/util/src/theap.c
+++ b/source/util/src/theap.c
--- a/source/util/src/tlist.c
+++ b/source/util/src/tlist.c
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
--- a/source/util/src/tlosertree.c
+++ b/source/util/src/tlosertree.c
--- a/source/util/src/tlrucache.c
+++ b/source/util/src/tlrucache.c
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
--- a/source/util/src/tqueue.c
+++ b/source/util/src/tqueue.c
--- a/source/util/src/tsched.c
+++ b/source/util/src/tsched.c
--- a/source/util/src/tskiplist.c
+++ b/source/util/src/tskiplist.c
--- a/source/util/src/ttimer.c
+++ b/source/util/src/ttimer.c
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
--- a/source/util/test/CMakeLists.txt
+++ b/source/util/test/CMakeLists.txt
--- a/source/util/test/pageBufferTest.cpp
+++ b/source/util/test/pageBufferTest.cpp
--- a/stream
+++ b/stream
--- a/tests/ci/Dockerfile
+++ b/tests/ci/Dockerfile
--- a/tests/develop-test/win-test-file
+++ b/tests/develop-test/win-test-file
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
--- a/tests/parallel_test/run_case.sh
+++ b/tests/parallel_test/run_case.sh
--- a/tests/parallel_test/split_case.sh
+++ b/tests/parallel_test/split_case.sh
--- a/tests/pytest/crash_gen/crash_gen_main.py
+++ b/tests/pytest/crash_gen/crash_gen_main.py
--- a/tests/pytest/insert/basic.py
+++ b/tests/pytest/insert/basic.py
--- a/tests/pytest/insert/basic_unsigned.py
+++ b/tests/pytest/insert/basic_unsigned.py
--- a/tests/pytest/insert/bigint.py
+++ b/tests/pytest/insert/bigint.py
--- a/tests/pytest/insert/binary.py
+++ b/tests/pytest/insert/binary.py
--- a/tests/pytest/insert/bool.py
+++ b/tests/pytest/insert/bool.py
--- a/tests/pytest/insert/date.py
+++ b/tests/pytest/insert/date.py
--- a/tests/pytest/insert/double.py
+++ b/tests/pytest/insert/double.py
--- a/tests/pytest/query/query.py
+++ b/tests/pytest/query/query.py
--- a/tests/pytest/query/queryError.py
+++ b/tests/pytest/query/queryError.py
--- a/tests/pytest/query/queryFillTest.py
+++ b/tests/pytest/query/queryFillTest.py
--- a/tests/pytest/tools/taosdumpTest.py
+++ b/tests/pytest/tools/taosdumpTest.py
--- a/tests/pytest/tools/taosdumpTest2.py
+++ b/tests/pytest/tools/taosdumpTest2.py
--- a/tests/pytest/tools/taosdumpTestNanoSupport.py
+++ b/tests/pytest/tools/taosdumpTestNanoSupport.py
--- a/tests/pytest/util/autogen.py
+++ b/tests/pytest/util/autogen.py
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
--- a/tests/script/api/batchprepare.c
+++ b/tests/script/api/batchprepare.c
--- a/tests/script/api/demoapi.c
+++ b/tests/script/api/demoapi.c
--- a/tests/script/api/makefile
+++ b/tests/script/api/makefile
--- a/tests/script/api/passwdTest.c
+++ b/tests/script/api/passwdTest.c
--- a/tests/script/api/stmt_function.c
+++ b/tests/script/api/stmt_function.c
--- a/tests/script/local.supp
+++ b/tests/script/local.supp
--- a/tests/script/sh/checkAsan.sh
+++ b/tests/script/sh/checkAsan.sh
--- a/tests/script/sh/checkValgrind.sh
+++ b/tests/script/sh/checkValgrind.sh
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
--- a/tests/script/sh/pycumsum.py
+++ b/tests/script/sh/pycumsum.py
--- a/tests/script/tsim/alter/table.sim
+++ b/tests/script/tsim/alter/table.sim
--- a/tests/script/tsim/compute/last_row.sim
+++ b/tests/script/tsim/compute/last_row.sim
--- a/tests/script/tsim/dnode/drop_dnode_force.sim
+++ b/tests/script/tsim/dnode/drop_dnode_force.sim
--- a/tests/script/tsim/dnode/drop_dnode_has_mnode.sim
+++ b/tests/script/tsim/dnode/drop_dnode_has_mnode.sim
--- a/tests/script/tsim/dnode/offline_reason.sim
+++ b/tests/script/tsim/dnode/offline_reason.sim
--- a/tests/script/tsim/dnode/split_vgroup_replica1.sim
+++ b/tests/script/tsim/dnode/split_vgroup_replica1.sim
--- a/tests/script/tsim/parser/alter_column.sim
+++ b/tests/script/tsim/parser/alter_column.sim
--- a/tests/script/tsim/parser/condition_scl.sim
+++ b/tests/script/tsim/parser/condition_scl.sim
--- a/tests/script/tsim/parser/function.sim
+++ b/tests/script/tsim/parser/function.sim
--- a/tests/script/tsim/parser/join_manyblocks.sim
+++ b/tests/script/tsim/parser/join_manyblocks.sim
--- a/tests/script/tsim/parser/limit1_stb.sim
+++ b/tests/script/tsim/parser/limit1_stb.sim
--- a/tests/script/tsim/parser/limit_stb.sim
+++ b/tests/script/tsim/parser/limit_stb.sim
--- a/tests/script/tsim/parser/projection_limit_offset.sim
+++ b/tests/script/tsim/parser/projection_limit_offset.sim
--- a/tests/script/tsim/parser/sliding.sim
+++ b/tests/script/tsim/parser/sliding.sim
--- a/tests/script/tsim/parser/union.sim
+++ b/tests/script/tsim/parser/union.sim
--- a/tests/script/tsim/query/bug3398.sim
+++ b/tests/script/tsim/query/bug3398.sim
--- a/tests/script/tsim/query/delete_and_query.sim
+++ b/tests/script/tsim/query/delete_and_query.sim
--- a/tests/script/tsim/query/emptyTsRange_scl.sim
+++ b/tests/script/tsim/query/emptyTsRange_scl.sim
--- a/tests/script/tsim/query/explain_tsorder.sim
+++ b/tests/script/tsim/query/explain_tsorder.sim
--- a/tests/script/tsim/query/groupby_distinct.sim
+++ b/tests/script/tsim/query/groupby_distinct.sim
--- a/tests/script/tsim/query/interval.sim
+++ b/tests/script/tsim/query/interval.sim
--- a/tests/script/tsim/query/partitionby.sim
+++ b/tests/script/tsim/query/partitionby.sim
--- a/tests/script/tsim/query/r/explain_tsorder.result
+++ b/tests/script/tsim/query/r/explain_tsorder.result
--- a/tests/script/tsim/query/sys_tbname.sim
+++ b/tests/script/tsim/query/sys_tbname.sim
--- a/tests/script/tsim/query/t/explain_tsorder.sql
+++ b/tests/script/tsim/query/t/explain_tsorder.sql
--- a/tests/script/tsim/query/tag_scan.sim
+++ b/tests/script/tsim/query/tag_scan.sim
--- a/tests/script/tsim/query/udf.sim
+++ b/tests/script/tsim/query/udf.sim
--- a/tests/script/tsim/query/udfpy.sim
+++ b/tests/script/tsim/query/udfpy.sim
--- a/tests/script/tsim/query/unionall_as_table.sim
+++ b/tests/script/tsim/query/unionall_as_table.sim
--- a/tests/script/tsim/sma/rsmaCreateInsertQuery.sim
+++ b/tests/script/tsim/sma/rsmaCreateInsertQuery.sim
--- a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
+++ b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
--- a/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
+++ b/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
--- a/tests/script/tsim/stream/basic0.sim
+++ b/tests/script/tsim/stream/basic0.sim
--- a/tests/script/tsim/stream/basic1.sim
+++ b/tests/script/tsim/stream/basic1.sim
--- a/tests/script/tsim/stream/basic2.sim
+++ b/tests/script/tsim/stream/basic2.sim
--- a/tests/script/tsim/stream/basic4.sim
+++ b/tests/script/tsim/stream/basic4.sim
--- a/tests/script/tsim/stream/checkStreamSTable.sim
+++ b/tests/script/tsim/stream/checkStreamSTable.sim
--- a/tests/script/tsim/stream/checkStreamSTable1.sim
+++ b/tests/script/tsim/stream/checkStreamSTable1.sim
--- a/tests/script/tsim/stream/deleteInterval.sim
+++ b/tests/script/tsim/stream/deleteInterval.sim
--- a/tests/script/tsim/stream/deleteSession.sim
+++ b/tests/script/tsim/stream/deleteSession.sim
--- a/tests/script/tsim/stream/deleteState.sim
+++ b/tests/script/tsim/stream/deleteState.sim
--- a/tests/script/tsim/stream/distributeInterval0.sim
+++ b/tests/script/tsim/stream/distributeInterval0.sim
--- a/tests/script/tsim/stream/distributeIntervalRetrive0.sim
+++ b/tests/script/tsim/stream/distributeIntervalRetrive0.sim
--- a/tests/script/tsim/stream/distributeSession0.sim
+++ b/tests/script/tsim/stream/distributeSession0.sim
--- a/tests/script/tsim/stream/fillHistoryBasic1.sim
+++ b/tests/script/tsim/stream/fillHistoryBasic1.sim
--- a/tests/script/tsim/stream/fillHistoryBasic2.sim
+++ b/tests/script/tsim/stream/fillHistoryBasic2.sim
--- a/tests/script/tsim/stream/fillHistoryBasic3.sim
+++ b/tests/script/tsim/stream/fillHistoryBasic3.sim
--- a/tests/script/tsim/stream/fillHistoryBasic4.sim
+++ b/tests/script/tsim/stream/fillHistoryBasic4.sim
--- a/tests/script/tsim/stream/fillHistoryTransform.sim
+++ b/tests/script/tsim/stream/fillHistoryTransform.sim
--- a/tests/script/tsim/stream/fillIntervalDelete0.sim
+++ b/tests/script/tsim/stream/fillIntervalDelete0.sim
--- a/tests/script/tsim/stream/fillIntervalDelete1.sim
+++ b/tests/script/tsim/stream/fillIntervalDelete1.sim
--- a/tests/script/tsim/stream/fillIntervalLinear.sim
+++ b/tests/script/tsim/stream/fillIntervalLinear.sim
--- a/tests/script/tsim/stream/fillIntervalPartitionBy.sim
+++ b/tests/script/tsim/stream/fillIntervalPartitionBy.sim
--- a/tests/script/tsim/stream/fillIntervalPrevNext.sim
+++ b/tests/script/tsim/stream/fillIntervalPrevNext.sim
--- a/tests/script/tsim/stream/fillIntervalPrevNext1.sim
+++ b/tests/script/tsim/stream/fillIntervalPrevNext1.sim
--- a/tests/script/tsim/stream/fillIntervalRange.sim
+++ b/tests/script/tsim/stream/fillIntervalRange.sim
--- a/tests/script/tsim/stream/fillIntervalValue.sim
+++ b/tests/script/tsim/stream/fillIntervalValue.sim
--- a/tests/script/tsim/stream/ignoreCheckUpdate.sim
+++ b/tests/script/tsim/stream/ignoreCheckUpdate.sim
--- a/tests/script/tsim/stream/ignoreExpiredData.sim
+++ b/tests/script/tsim/stream/ignoreExpiredData.sim
--- a/tests/script/tsim/stream/partitionby.sim
+++ b/tests/script/tsim/stream/partitionby.sim
--- a/tests/script/tsim/stream/partitionby1.sim
+++ b/tests/script/tsim/stream/partitionby1.sim
--- a/tests/script/tsim/stream/partitionbyColumnInterval.sim
+++ b/tests/script/tsim/stream/partitionbyColumnInterval.sim
--- a/tests/script/tsim/stream/partitionbyColumnSession.sim
+++ b/tests/script/tsim/stream/partitionbyColumnSession.sim
--- a/tests/script/tsim/stream/partitionbyColumnState.sim
+++ b/tests/script/tsim/stream/partitionbyColumnState.sim
--- a/tests/script/tsim/stream/pauseAndResume.sim
+++ b/tests/script/tsim/stream/pauseAndResume.sim
--- a/tests/script/tsim/stream/scalar.sim
+++ b/tests/script/tsim/stream/scalar.sim
--- a/tests/script/tsim/stream/schedSnode.sim
+++ b/tests/script/tsim/stream/schedSnode.sim
--- a/tests/script/tsim/stream/session0.sim
+++ b/tests/script/tsim/stream/session0.sim
--- a/tests/script/tsim/stream/session1.sim
+++ b/tests/script/tsim/stream/session1.sim
--- a/tests/script/tsim/stream/sliding.sim
+++ b/tests/script/tsim/stream/sliding.sim
--- a/tests/script/tsim/stream/state0.sim
+++ b/tests/script/tsim/stream/state0.sim
--- a/tests/script/tsim/stream/state1.sim
+++ b/tests/script/tsim/stream/state1.sim
--- a/tests/script/tsim/stream/triggerInterval0.sim
+++ b/tests/script/tsim/stream/triggerInterval0.sim
--- a/tests/script/tsim/stream/triggerSession0.sim
+++ b/tests/script/tsim/stream/triggerSession0.sim
--- a/tests/script/tsim/stream/udTableAndTag0.sim
+++ b/tests/script/tsim/stream/udTableAndTag0.sim
--- a/tests/script/tsim/stream/udTableAndTag1.sim
+++ b/tests/script/tsim/stream/udTableAndTag1.sim
--- a/tests/script/tsim/stream/udTableAndTag2.sim
+++ b/tests/script/tsim/stream/udTableAndTag2.sim
--- a/tests/script/tsim/stream/windowClose.sim
+++ b/tests/script/tsim/stream/windowClose.sim
--- a/tests/script/tsim/sync/oneReplica5VgElect.sim
+++ b/tests/script/tsim/sync/oneReplica5VgElect.sim
--- a/tests/script/tsim/tmq/topic.sim
+++ b/tests/script/tsim/tmq/topic.sim
--- a/tests/script/tsim/user/privilege_create_db.sim
+++ b/tests/script/tsim/user/privilege_create_db.sim
--- a/tests/script/tsim/valgrind/checkError1.sim
+++ b/tests/script/tsim/valgrind/checkError1.sim
--- a/tests/script/win-test-file
+++ b/tests/script/win-test-file
--- a/tests/system-test/0-others/backquote_check.py
+++ b/tests/system-test/0-others/backquote_check.py
--- a/tests/system-test/0-others/compatibility.py
+++ b/tests/system-test/0-others/compatibility.py
--- a/tests/system-test/0-others/information_schema.py
+++ b/tests/system-test/0-others/information_schema.py
--- a/tests/system-test/0-others/multilevel.py
+++ b/tests/system-test/0-others/multilevel.py
--- a/tests/system-test/0-others/splitVGroup.py
+++ b/tests/system-test/0-others/splitVGroup.py
--- a/tests/system-test/0-others/user_privilege_show.py
+++ b/tests/system-test/0-others/user_privilege_show.py
--- a/tests/system-test/1-insert/boundary.py
+++ b/tests/system-test/1-insert/boundary.py
--- a/tests/system-test/1-insert/db_tb_name_check.py
+++ b/tests/system-test/1-insert/db_tb_name_check.py
--- a/tests/system-test/1-insert/influxdb_line_taosc_insert.py
+++ b/tests/system-test/1-insert/influxdb_line_taosc_insert.py
--- a/tests/system-test/1-insert/manyVgroups.json
+++ b/tests/system-test/1-insert/manyVgroups.json
--- a/tests/system-test/1-insert/precisionNS.py
+++ b/tests/system-test/1-insert/precisionNS.py
--- a/tests/system-test/1-insert/precisionUS.py
+++ b/tests/system-test/1-insert/precisionUS.py
--- a/tests/system-test/1-insert/rowlength64k.json
+++ b/tests/system-test/1-insert/rowlength64k.json
--- a/tests/system-test/1-insert/rowlength64k.py
+++ b/tests/system-test/1-insert/rowlength64k.py
--- a/tests/system-test/1-insert/rowlength64k_1.py
+++ b/tests/system-test/1-insert/rowlength64k_1.py
--- a/tests/system-test/1-insert/rowlength64k_2.py
+++ b/tests/system-test/1-insert/rowlength64k_2.py
--- a/tests/system-test/1-insert/rowlength64k_3.py
+++ b/tests/system-test/1-insert/rowlength64k_3.py
--- a/tests/system-test/1-insert/rowlength64k_4.py
+++ b/tests/system-test/1-insert/rowlength64k_4.py
--- a/tests/system-test/1-insert/rowlength64k_benchmark.py
+++ b/tests/system-test/1-insert/rowlength64k_benchmark.py
--- a/tests/system-test/1-insert/stmt_error.py
+++ b/tests/system-test/1-insert/stmt_error.py
--- a/tests/system-test/1-insert/table_param_ttl.py
+++ b/tests/system-test/1-insert/table_param_ttl.py
--- a/tests/system-test/2-query/Timediff.py
+++ b/tests/system-test/2-query/Timediff.py
--- a/tests/system-test/2-query/To_unixtimestamp.py
+++ b/tests/system-test/2-query/To_unixtimestamp.py
--- a/tests/system-test/2-query/count_null.py
+++ b/tests/system-test/2-query/count_null.py
--- a/tests/system-test/2-query/diff.py
+++ b/tests/system-test/2-query/diff.py
--- a/tests/system-test/2-query/function_diff.py
+++ b/tests/system-test/2-query/function_diff.py
--- a/tests/system-test/2-query/geometry.py
+++ b/tests/system-test/2-query/geometry.py
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
--- a/tests/system-test/2-query/limit.py
+++ b/tests/system-test/2-query/limit.py
--- a/tests/system-test/2-query/max_partition.py
+++ b/tests/system-test/2-query/max_partition.py
--- a/tests/system-test/2-query/odbc.py
+++ b/tests/system-test/2-query/odbc.py
--- a/tests/system-test/2-query/smaBasic.py
+++ b/tests/system-test/2-query/smaBasic.py
--- a/tests/system-test/2-query/systable_func.py
+++ b/tests/system-test/2-query/systable_func.py
--- a/tests/system-test/2-query/ts_3405_3398_3423.py
+++ b/tests/system-test/2-query/ts_3405_3398_3423.py
--- a/tests/system-test/3-enterprise/restore/restoreBasic.py
+++ b/tests/system-test/3-enterprise/restore/restoreBasic.py
--- a/tests/system-test/3-enterprise/restore/restoreDnode.py
+++ b/tests/system-test/3-enterprise/restore/restoreDnode.py
--- a/tests/system-test/3-enterprise/restore/restoreMnode.py
+++ b/tests/system-test/3-enterprise/restore/restoreMnode.py
--- a/tests/system-test/3-enterprise/restore/restoreQnode.py
+++ b/tests/system-test/3-enterprise/restore/restoreQnode.py
--- a/tests/system-test/3-enterprise/restore/restoreVnode.py
+++ b/tests/system-test/3-enterprise/restore/restoreVnode.py
--- a/tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py
--- a/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py
--- a/tests/system-test/6-cluster/clusterCommonCheck.py
+++ b/tests/system-test/6-cluster/clusterCommonCheck.py
--- a/tests/system-test/6-cluster/manually-test/6dnode3mnodeInsertDataRebootAlterRep1-3.py
+++ b/tests/system-test/6-cluster/manually-test/6dnode3mnodeInsertDataRebootAlterRep1-3.py
--- a/tests/system-test/6-cluster/manually-test/6dnode3mnodeInsertLessDataAlterRep3to1to3.py
+++ b/tests/system-test/6-cluster/manually-test/6dnode3mnodeInsertLessDataAlterRep3to1to3.py
--- a/tests/system-test/6-cluster/manually-test/6dnode3mnodeStopDnodeInsertDatatb.py
+++ b/tests/system-test/6-cluster/manually-test/6dnode3mnodeStopDnodeInsertDatatb.py
--- a/tests/system-test/7-tmq/checkOffsetRowParams.py
+++ b/tests/system-test/7-tmq/checkOffsetRowParams.py
--- a/tests/system-test/7-tmq/ins_topics_test.py
+++ b/tests/system-test/7-tmq/ins_topics_test.py
--- a/tests/system-test/7-tmq/stbFilterWhere.py
+++ b/tests/system-test/7-tmq/stbFilterWhere.py
--- a/tests/system-test/7-tmq/tmqClientConsLog.py
+++ b/tests/system-test/7-tmq/tmqClientConsLog.py
--- a/tests/system-test/7-tmq/tmqCommon.py
+++ b/tests/system-test/7-tmq/tmqCommon.py
--- a/tests/system-test/7-tmq/tmqConsumerGroup.py
+++ b/tests/system-test/7-tmq/tmqConsumerGroup.py
--- a/tests/system-test/7-tmq/tmqParamsTest.py
+++ b/tests/system-test/7-tmq/tmqParamsTest.py
--- a/tests/system-test/7-tmq/tmq_taosx.py
+++ b/tests/system-test/7-tmq/tmq_taosx.py
--- a/tests/system-test/99-TDcase/TS-3581.py
+++ b/tests/system-test/99-TDcase/TS-3581.py
--- a/tests/system-test/eco-system/main.py
+++ b/tests/system-test/eco-system/main.py
--- a/tests/system-test/eco-system/manager/drop_table.py
+++ b/tests/system-test/eco-system/manager/drop_table.py
--- a/tests/system-test/eco-system/manager/same_column.py
+++ b/tests/system-test/eco-system/manager/same_column.py
--- a/tests/system-test/eco-system/manager/schema_change.py
+++ b/tests/system-test/eco-system/manager/schema_change.py
--- a/tests/system-test/eco-system/schemaless/insert.py
+++ b/tests/system-test/eco-system/schemaless/insert.py
--- a/tests/system-test/eco-system/util/Consumer.py
+++ b/tests/system-test/eco-system/util/Consumer.py
--- a/tests/system-test/eco-system/util/restartDnodes.py
+++ b/tests/system-test/eco-system/util/restartDnodes.py
--- a/tests/system-test/runAllOne.sh
+++ b/tests/system-test/runAllOne.sh
--- a/tests/system-test/win-test-file
+++ b/tests/system-test/win-test-file
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
--- a/tools/shell/CMakeLists.txt
+++ b/tools/shell/CMakeLists.txt
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
--- a/tools/shell/src/shellAuto.c
+++ b/tools/shell/src/shellAuto.c
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
--- a/utils/test/c/CMakeLists.txt
+++ b/utils/test/c/CMakeLists.txt
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
--- a/utils/test/c/tmqSim.c
+++ b/utils/test/c/tmqSim.c
--- a/utils/test/c/tmq_taosx_ci.c
+++ b/utils/test/c/tmq_taosx_ci.c
--- a/utils/test/c/write_raw_block_test.c
+++ b/utils/test/c/write_raw_block_test.c
--- a/utils/tsim/CMakeLists.txt
+++ b/utils/tsim/CMakeLists.txt
--- a/utils/tsim/src/simExe.c
+++ b/utils/tsim/src/simExe.c