Merge branch '3.0' into td31284

2024-11-05 13:19:34 +08:00 · 2024-11-05 13:19:34 +08:00 · 25d34537db
parent 9b101c206b 41af25f9b9
commit 25d34537db
2153 changed files with 247709 additions and 55915 deletions
--- a/.github/workflows/taoskeeper-ci.yml
+++ b/.github/workflows/taoskeeper-ci.yml
@ -0,0 +1,58 @@
+name: TaosKeeper CI
+
+on:
+  push:
+    paths:
+      - tools/keeper/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Run unit tests
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.18
+
+      - name: Install system dependencies
+        run: |
+          sudo apt update -y
+          sudo apt install -y build-essential cmake libgeos-dev
+
+      - name: Install TDengine
+        run: |
+          mkdir debug
+          cd debug
+          cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_TOOLS=false -DBUILD_TEST=off -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false
+          make -j 4
+          sudo make install
+          which taosd
+          which taosadapter
+          which taoskeeper
+
+      - name: Start taosd
+        run: |
+          cp /etc/taos/taos.cfg ./
+          sudo echo "supportVnodes 256" >> taos.cfg
+          nohup sudo taosd -c taos.cfg &
+
+      - name: Start taosadapter
+        run: nohup sudo taosadapter &
+
+      - name: Run tests with coverage
+        working-directory: tools/keeper
+        run: |
+          go mod tidy
+          sudo go test -v -ldflags="-X 'github.com/taosdata/taoskeeper/version.IsEnterprise=true'" -coverpkg=./... -coverprofile=coverage.out ./...
+          go tool cover -func=coverage.out
+
+      - name: Clean up
+        if: always()
+        run: |
+          if pgrep taosd; then sudo pkill taosd; fi
+          if pgrep taosadapter; then sudo pkill taosadapter; fi
--- a/.gitignore
+++ b/.gitignore
@ -100,6 +100,9 @@ tests/examples/JDBC/JDBCDemo/.project
 tests/examples/JDBC/JDBCDemo/.settings/
 source/libs/parser/inc/sql.*
 tests/script/tmqResult.txt
+tests/system-test/case_to_run.txt
+tests/develop-test/case_to_run.txt
+tests/scripts/case_to_run.txt
 tests/tmqResult.txt
 tests/script/jenkins/basic.txt

@ -118,6 +121,7 @@ TAGS
 contrib/*
 !contrib/CMakeLists.txt
 !contrib/test
+!contrib/azure-cmake
 sql
 debug*/
 .env
@ -134,3 +138,25 @@ tags
 .clangd
 *CMakeCache*
 *CMakeFiles*
+.history/
+*.txt
+*.tcl
+*.pc
+contrib/geos
+contrib/libuv
+contrib/pcre2
+contrib/zlib
+deps_tmp_CMakeLists.txt.in
+*.a
+*.ctest
+pcre2-config
+pcre2_test.sh
+pcre2_grep_test.sh
+pcre2_chartables.c
+geos-config
+config.h
+pcre2.h
+zconf.h
+version.h
+geos_c.h
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.0)

 project(
-    TDengine
-    VERSION 3.0
-    DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)"
+  TDengine
+  VERSION 3.0
+  DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)"
 )

-if (NOT DEFINED TD_SOURCE_DIR)
-  set( TD_SOURCE_DIR ${PROJECT_SOURCE_DIR} )
+if(NOT DEFINED TD_SOURCE_DIR)
+  set(TD_SOURCE_DIR ${PROJECT_SOURCE_DIR})
 endif()

 SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
@ -15,13 +15,11 @@ SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
 set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake")
 set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib")

-
 include(${TD_SUPPORT_DIR}/cmake.platform)
 include(${TD_SUPPORT_DIR}/cmake.define)
 include(${TD_SUPPORT_DIR}/cmake.options)
 include(${TD_SUPPORT_DIR}/cmake.version)

-
 # contrib
 add_subdirectory(contrib)

@ -33,8 +31,8 @@ target_include_directories(api INTERFACE "include/client")

 # src
 if(${BUILD_TEST})
-    include(CTest)
-    enable_testing()
+  include(CTest)
+  enable_testing()
 endif(${BUILD_TEST})

 add_subdirectory(source)
@ -44,5 +42,5 @@ add_subdirectory(examples/c)
 add_subdirectory(tests)
 include(${TD_SUPPORT_DIR}/cmake.install)

-# docs 
+# docs
 add_subdirectory(docs/doxgen)
--- a/12
+++ b/12
@ -306,9 +306,9 @@ 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.13
+        python -m pip install taospy==2.7.16
        python -m pip uninstall taos-ws-py -y 
-        python -m pip install taos-ws-py==0.3.1
+        python -m pip install taos-ws-py==0.3.3
        xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
    '''
    return 1
@ -422,6 +422,14 @@ pipeline {
                                    mkdir -p ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}
                                    echo "''' + env.FILE_CHANGED + '''" > ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}/docs_changed.txt
                                    '''
+                                    sh '''
+                                       cd ${WKC}/tests/parallel_test
+                                       ./run_check_assert_container.sh -d ${WKDIR}
+                                    '''
+                                    sh '''
+                                       cd ${WKC}/tests/parallel_test
+                                       ./run_check_void_container.sh -d ${WKDIR}
+                                    '''
                                    sh '''
                                        date
                                        rm -rf ${WKC}/debug
--- a/README-CN.md
+++ b/README-CN.md
@ -348,7 +348,7 @@ TDengine 提供了丰富的应用程序开发接口，其中包括 C/C++、Java

 # 成为社区贡献者

-点击 [这里](https://www.taosdata.com/cn/contributor/)，了解如何成为 TDengine 的贡献者。
+点击 [这里](https://www.taosdata.com/contributor)，了解如何成为 TDengine 的贡献者。

 # 加入技术交流群

--- a/cmake/addr2line_CMakeLists.txt.in
+++ b/cmake/addr2line_CMakeLists.txt.in
@ -5,8 +5,9 @@ ExternalProject_Add(addr2line
        GIT_TAG master
        SOURCE_DIR "${TD_CONTRIB_DIR}/addr2line"
        BINARY_DIR "${TD_CONTRIB_DIR}/addr2line"
-        CONFIGURE_COMMAND "" 
-        BUILD_COMMAND ""  
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/apr-util_CMakeLists.txt.in
+++ b/cmake/apr-util_CMakeLists.txt.in
@ -11,9 +11,10 @@ ExternalProject_Add(aprutil-1
        BUILD_IN_SOURCE TRUE
        BUILD_ALWAYS 1
        #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1 
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1
        #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
        BUILD_COMMAND make
        INSTALL_COMMAND make install
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/apr_CMakeLists.txt.in
+++ b/cmake/apr_CMakeLists.txt.in
@ -16,4 +16,5 @@ ExternalProject_Add(apr-1
        BUILD_COMMAND make
        INSTALL_COMMAND make install
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/azure_CMakeLists.txt.in
+++ b/cmake/azure_CMakeLists.txt.in
@ -0,0 +1,15 @@
+# azure
+ExternalProject_Add(azure
+  URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-storage-blobs_12.13.0-beta.1.tar.gz
+  URL_HASH SHA256=3eca486fd60e3522d0a633025ecd652a71515b1e944799b2e8ee31fd590305a9
+        DOWNLOAD_NO_PROGRESS 1
+        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
+        SOURCE_DIR "${TD_CONTRIB_DIR}/azure-sdk-for-cpp-azure-storage-blobs_12.13.0-beta.1"
+        #BUILD_IN_SOURCE TRUE
+        #BUILD_ALWAYS 1
+        #UPDATE_COMMAND ""
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+)
--- a/cmake/cjson_CMakeLists.txt.in
+++ b/cmake/cjson_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(cjson
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-        )
+        GIT_SHALLOW true
+        )
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE FALSE)
 set(TD_BUILD_TAOSA_INTERNAL FALSE)
+set(TD_BUILD_KEEPER_INTERNAL FALSE)

-#set output directory
+# set output directory
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
 SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
@ -12,193 +13,227 @@ MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
 MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
 MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})

-if (NOT DEFINED TD_GRANT)
-  SET(TD_GRANT FALSE)
-endif()
+IF(NOT DEFINED TD_GRANT)
+    SET(TD_GRANT FALSE)
+ENDIF()

-IF (NOT DEFINED BUILD_WITH_RAND_ERR)
-  SET(BUILD_WITH_RAND_ERR FALSE)
-ELSE ()
-  SET(BUILD_WITH_RAND_ERR TRUE)
-endif()
+IF(NOT DEFINED BUILD_WITH_RAND_ERR)
+    SET(BUILD_WITH_RAND_ERR FALSE)
+ELSE()
+    SET(BUILD_WITH_RAND_ERR TRUE)
+ENDIF()

-IF ("${WEBSOCKET}" MATCHES "true")
+IF("${WEBSOCKET}" MATCHES "true")
    SET(TD_WEBSOCKET TRUE)
    MESSAGE("Enable websocket")
    ADD_DEFINITIONS(-DWEBSOCKET)
-ELSE ()
+ELSE()
    SET(TD_WEBSOCKET FALSE)
-ENDIF ()
+ENDIF()

-IF ("${BUILD_HTTP}" STREQUAL "")
-  IF (TD_LINUX)
-    IF (TD_ARM_32)
-      SET(TD_BUILD_HTTP TRUE)
-    ELSE ()
-      SET(TD_BUILD_HTTP TRUE)
-    ENDIF ()
-  ELSEIF (TD_DARWIN)
+IF("${BUILD_HTTP}" STREQUAL "")
+    IF(TD_LINUX)
+        IF(TD_ARM_32)
+            SET(TD_BUILD_HTTP TRUE)
+        ELSE()
+            SET(TD_BUILD_HTTP TRUE)
+        ENDIF()
+    ELSEIF(TD_DARWIN)
+        SET(TD_BUILD_HTTP TRUE)
+    ELSE()
+        SET(TD_BUILD_HTTP TRUE)
+    ENDIF()
+ELSEIF(${BUILD_HTTP} MATCHES "false")
+    SET(TD_BUILD_HTTP FALSE)
+ELSEIF(${BUILD_HTTP} MATCHES "true")
    SET(TD_BUILD_HTTP TRUE)
-  ELSE ()
+ELSEIF(${BUILD_HTTP} MATCHES "internal")
+    SET(TD_BUILD_HTTP FALSE)
+    SET(TD_BUILD_TAOSA_INTERNAL TRUE)
+ELSE()
    SET(TD_BUILD_HTTP TRUE)
-  ENDIF ()
-ELSEIF (${BUILD_HTTP} MATCHES "false")
-  SET(TD_BUILD_HTTP FALSE)
-ELSEIF (${BUILD_HTTP} MATCHES "true")
-  SET(TD_BUILD_HTTP TRUE)
-ELSEIF (${BUILD_HTTP} MATCHES "internal")
-  SET(TD_BUILD_HTTP FALSE)
-  SET(TD_BUILD_TAOSA_INTERNAL TRUE)
-ELSE ()
-  SET(TD_BUILD_HTTP TRUE)
-ENDIF ()
+ENDIF()

-IF (TD_BUILD_HTTP)
-  ADD_DEFINITIONS(-DHTTP_EMBEDDED)
-ENDIF ()
+IF(TD_BUILD_HTTP)
+    ADD_DEFINITIONS(-DHTTP_EMBEDDED)
+ENDIF()

-IF ("${BUILD_TOOLS}" STREQUAL "")
-  IF (TD_LINUX)
-    IF (TD_ARM_32)
-      SET(BUILD_TOOLS "false")
-    ELSEIF (TD_ARM_64)
-      SET(BUILD_TOOLS "false")
-    ELSE ()
-      SET(BUILD_TOOLS "false")
-    ENDIF ()
-  ELSEIF (TD_DARWIN)
-    SET(BUILD_TOOLS "false")
-  ELSE ()
-    SET(BUILD_TOOLS "false")
-  ENDIF ()
-ENDIF ()
+IF("${BUILD_KEEPER}" STREQUAL "")
+    SET(TD_BUILD_KEEPER FALSE)
+ELSEIF(${BUILD_KEEPER} MATCHES "false")
+    SET(TD_BUILD_KEEPER FALSE)
+ELSEIF(${BUILD_KEEPER} MATCHES "true")
+    SET(TD_BUILD_KEEPER TRUE)
+ELSEIF(${BUILD_KEEPER} MATCHES "internal")
+    SET(TD_BUILD_KEEPER FALSE)
+    SET(TD_BUILD_KEEPER_INTERNAL TRUE)
+ELSE()
+    SET(TD_BUILD_KEEPER FALSE)
+ENDIF()

-IF ("${BUILD_TOOLS}" MATCHES "false")
+IF("${BUILD_TOOLS}" STREQUAL "")
+    IF(TD_LINUX)
+        IF(TD_ARM_32)
+            SET(BUILD_TOOLS "false")
+        ELSEIF(TD_ARM_64)
+            SET(BUILD_TOOLS "false")
+        ELSE()
+            SET(BUILD_TOOLS "false")
+        ENDIF()
+    ELSEIF(TD_DARWIN)
+        SET(BUILD_TOOLS "false")
+    ELSE()
+        SET(BUILD_TOOLS "false")
+    ENDIF()
+ENDIF()
+
+IF("${BUILD_TOOLS}" MATCHES "false")
    MESSAGE("${Yellow} Will _not_ build taos_tools! ${ColourReset}")
    SET(TD_TAOS_TOOLS FALSE)
-ELSE ()
+ELSE()
    MESSAGE("")
    MESSAGE("${Green} Will build taos_tools! ${ColourReset}")
    MESSAGE("")
    SET(TD_TAOS_TOOLS TRUE)
-ENDIF ()
+ENDIF()

-IF (${TD_WINDOWS})
+IF(${TD_WINDOWS})
    SET(TAOS_LIB taos_static)
-ELSE ()
+ELSE()
    SET(TAOS_LIB taos)
-ENDIF ()
+ENDIF()

 # build TSZ by default
-IF ("${TSZ_ENABLED}" MATCHES "false")
-  set(VAR_TSZ "" CACHE INTERNAL "global variant empty" )
+IF("${TSZ_ENABLED}" MATCHES "false")
+    set(VAR_TSZ "" CACHE INTERNAL "global variant empty")
 ELSE()
-  # define add 
-  MESSAGE(STATUS "build with TSZ enabled")
-  ADD_DEFINITIONS(-DTD_TSZ)
-  set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz" )
+    # define add
+    MESSAGE(STATUS "build with TSZ enabled")
+    ADD_DEFINITIONS(-DTD_TSZ)
+    set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz")
 ENDIF()

 # force set all platform to JEMALLOC_ENABLED = false
 SET(JEMALLOC_ENABLED OFF)
-IF (TD_WINDOWS)
-    MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
-    IF (${CMAKE_BUILD_TYPE} MATCHES "Release")
-      MESSAGE("${Green} will build Release version! ${ColourReset}")
-      SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi- /O2 /GL /MD")

-    ELSE ()
-      MESSAGE("${Green} will build Debug version! ${ColourReset}")
-      SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
+IF(TD_WINDOWS)
+    MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
+
+    IF(${CMAKE_BUILD_TYPE} MATCHES "Release")
+        MESSAGE("${Green} will build Release version! ${ColourReset}")
+        SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi- /O2 /GL /MD")
+
+    ELSE()
+        MESSAGE("${Green} will build Debug version! ${ColourReset}")
+        SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
    ENDIF()

    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+
    # IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
-    #  SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
+    # SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
    # ENDIF ()
-    IF (CMAKE_DEPFILE_FLAGS_C)
+    IF(CMAKE_DEPFILE_FLAGS_C)
        SET(CMAKE_DEPFILE_FLAGS_C "")
-    ENDIF ()
-    IF (CMAKE_DEPFILE_FLAGS_CXX)
+    ENDIF()
+
+    IF(CMAKE_DEPFILE_FLAGS_CXX)
        SET(CMAKE_DEPFILE_FLAGS_CXX "")
-    ENDIF ()
-    IF (CMAKE_C_FLAGS_DEBUG)
+    ENDIF()
+
+    IF(CMAKE_C_FLAGS_DEBUG)
        SET(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)
-    ENDIF ()
-    IF (CMAKE_CXX_FLAGS_DEBUG)
+    ENDIF()
+
+    IF(CMAKE_CXX_FLAGS_DEBUG)
        SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
-    ENDIF ()
+    ENDIF()

    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")

-ELSE ()
-    IF (${TD_DARWIN})
+ELSE()
+    IF(${TD_DARWIN})
        set(CMAKE_MACOSX_RPATH 0)
-    ENDIF ()
-    IF (${COVER} MATCHES "true")
+    ENDIF()
+
+    IF(${COVER} MATCHES "true")
        MESSAGE(STATUS "Test coverage mode, add extra flags")
        SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
-        SET(GCC_COVERAGE_LINK_FLAGS    "-lgcov --coverage")
+        SET(GCC_COVERAGE_LINK_FLAGS "-lgcov --coverage")
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-    ENDIF ()
+    ENDIF()

    # disable all assert
-    IF ((${DISABLE_ASSERT} MATCHES "true") OR (${DISABLE_ASSERTS} MATCHES "true"))
+    IF((${DISABLE_ASSERT} MATCHES "true") OR(${DISABLE_ASSERTS} MATCHES "true"))
        ADD_DEFINITIONS(-DDISABLE_ASSERT)
        MESSAGE(STATUS "Disable all asserts")
    ENDIF()

    INCLUDE(CheckCCompilerFlag)
-    IF (TD_ARM_64 OR TD_ARM_32)
+
+    IF(TD_ARM_64 OR TD_ARM_32)
        SET(COMPILER_SUPPORT_SSE42 false)
-    ELSEIF (("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang"))
+    ELSEIF(("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") OR("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang"))
        SET(COMPILER_SUPPORT_SSE42 true)
        MESSAGE(STATUS "Always enable sse4.2 for Clang/AppleClang")
    ELSE()
        CHECK_C_COMPILER_FLAG("-msse4.2" COMPILER_SUPPORT_SSE42)
    ENDIF()

-    CHECK_C_COMPILER_FLAG("-mfma" COMPILER_SUPPORT_FMA)
-    CHECK_C_COMPILER_FLAG("-mavx" COMPILER_SUPPORT_AVX)
-    CHECK_C_COMPILER_FLAG("-mavx2" COMPILER_SUPPORT_AVX2)
-    CHECK_C_COMPILER_FLAG("-mavx512f" COMPILER_SUPPORT_AVX512F)
-    CHECK_C_COMPILER_FLAG("-mavx512vbmi" COMPILER_SUPPORT_AVX512BMI)
-    CHECK_C_COMPILER_FLAG("-mavx512vl" COMPILER_SUPPORT_AVX512VL)
+    IF(TD_ARM_64 OR TD_ARM_32)
+        SET(COMPILER_SUPPORT_FMA false)
+        SET(COMPILER_SUPPORT_AVX false)
+        SET(COMPILER_SUPPORT_AVX2 false)
+        SET(COMPILER_SUPPORT_AVX512F false)
+        SET(COMPILER_SUPPORT_AVX512BMI false)
+        SET(COMPILER_SUPPORT_AVX512VL false)
+    ELSE()
+        CHECK_C_COMPILER_FLAG("-mfma" COMPILER_SUPPORT_FMA)
+        CHECK_C_COMPILER_FLAG("-mavx" COMPILER_SUPPORT_AVX)
+        CHECK_C_COMPILER_FLAG("-mavx2" COMPILER_SUPPORT_AVX2)
+        CHECK_C_COMPILER_FLAG("-mavx512f" COMPILER_SUPPORT_AVX512F)
+        CHECK_C_COMPILER_FLAG("-mavx512vbmi" COMPILER_SUPPORT_AVX512BMI)
+        CHECK_C_COMPILER_FLAG("-mavx512vl" COMPILER_SUPPORT_AVX512VL)
+    ENDIF()

-    IF (COMPILER_SUPPORT_SSE42)
+    IF(COMPILER_SUPPORT_SSE42)
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
    ENDIF()

-    IF ("${SIMD_SUPPORT}" MATCHES "true")
-        IF (COMPILER_SUPPORT_FMA)
-           SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
-           SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfma")
+    IF("${SIMD_SUPPORT}" MATCHES "true")
+        IF(COMPILER_SUPPORT_FMA)
+            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfma")
+            MESSAGE(STATUS "FMA instructions is ACTIVATED")
        ENDIF()
-        IF (COMPILER_SUPPORT_AVX)
+
+        IF(COMPILER_SUPPORT_AVX)
            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+            MESSAGE(STATUS "AVX instructions is ACTIVATED")
        ENDIF()
-        IF (COMPILER_SUPPORT_AVX2)
+
+        IF(COMPILER_SUPPORT_AVX2)
            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
+            MESSAGE(STATUS "AVX2 instructions is ACTIVATED")
        ENDIF()
-        MESSAGE(STATUS "SIMD instructions (FMA/AVX/AVX2) is ACTIVATED")
    ENDIF()

-    IF ("${SIMD_AVX512_SUPPORT}" MATCHES "true")
-        IF (COMPILER_SUPPORT_AVX512F AND COMPILER_SUPPORT_AVX512BMI)
+    IF("${SIMD_AVX512_SUPPORT}" MATCHES "true")
+        IF(COMPILER_SUPPORT_AVX512F AND COMPILER_SUPPORT_AVX512BMI)
            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx512f -mavx512vbmi")
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -mavx512vbmi")
            MESSAGE(STATUS "avx512f/avx512bmi enabled by compiler")
        ENDIF()

-        IF (COMPILER_SUPPORT_AVX512VL)
+        IF(COMPILER_SUPPORT_AVX512VL)
            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx512vl")
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512vl")
-        MESSAGE(STATUS "avx512vl enabled by compiler")
+            MESSAGE(STATUS "avx512vl enabled by compiler")
        ENDIF()
    ENDIF()

@ -206,16 +241,17 @@ ELSE ()
    SET(CMAKE_C_FLAGS_REL "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
    SET(CMAKE_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")

-    IF (${BUILD_SANITIZER})
+    IF(${BUILD_SANITIZER})
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-	      MESSAGE(STATUS "Compile with Address Sanitizer!")
-    ELSEIF (${BUILD_RELEASE})
+
+        # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
+        MESSAGE(STATUS "Compile with Address Sanitizer!")
+    ELSEIF(${BUILD_RELEASE})
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-    ELSE ()
+    ELSE()
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-    ENDIF ()
-
-ENDIF ()
+    ENDIF()
+ENDIF()
--- a/cmake/cmake.install
+++ b/cmake/cmake.install
@ -7,7 +7,17 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
-    COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo firstEp localhost:6030 > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo fqdn localhost >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo serverPort 6030 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo debugFlag 135 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo asyncLog 0 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo supportVnodes 1024 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo numOfLogLines 300000000 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo logKeepDays -1 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo checkpointInterval 60 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo snodeAddress 127.0.0.1:873 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+    COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
    COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
    COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
    COMMAND ${CMAKE_COMMAND} -E echo monitor 0  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@ -144,6 +144,12 @@ option(
    OFF
 )

+option(
+    BUILD_WITH_ANALYSIS
+    "If build with analysis"
+    ON
+)
+
 ENDIF ()

 IF(NOT TD_ENTERPRISE)
@ -151,8 +157,15 @@ MESSAGE("switch s3 off with community version")
 set(BUILD_S3 OFF)
 set(BUILD_WITH_S3 OFF)
 set(BUILD_WITH_COS OFF)
+set(BUILD_WITH_ANALYSIS OFF)
 ENDIF ()

+IF(${BUILD_WITH_ANALYSIS})
+    message("build with analysis")
+    set(BUILD_S3 ON)
+    set(BUILD_WITH_S3 ON)
+ENDIF()
+
 IF(${BUILD_S3})

 IF(${BUILD_WITH_S3})
--- 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.3.3.0.alpha")
+  SET(TD_VER_NUMBER "3.3.4.0.alpha")
 ENDIF ()

 IF (DEFINED VERCOMPATIBLE)
--- a/cmake/cos_CMakeLists.txt.in
+++ b/cmake/cos_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(cos
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/crashdump_CMakeLists.txt.in
+++ b/cmake/crashdump_CMakeLists.txt.in
@ -5,8 +5,9 @@ ExternalProject_Add(crashdump
        GIT_TAG master
        SOURCE_DIR "${TD_CONTRIB_DIR}/crashdump"
        BINARY_DIR "${TD_CONTRIB_DIR}/crashdump"
-        CONFIGURE_COMMAND "" 
-        BUILD_COMMAND ""  
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/curl_CMakeLists.txt.in
+++ b/cmake/curl_CMakeLists.txt.in
@ -16,4 +16,5 @@ ExternalProject_Add(curl2
        BUILD_COMMAND make -j
        INSTALL_COMMAND make install
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/geos_CMakeLists.txt.in
+++ b/cmake/geos_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(geos
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/gnuregex_CMakeLists.txt.in
+++ b/cmake/gnuregex_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(gnuregex
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/gtest_CMakeLists.txt.in
+++ b/cmake/gtest_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(googletest
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-        )
+        GIT_SHALLOW true
+        )
--- a/cmake/iconv_CMakeLists.txt.in
+++ b/cmake/iconv_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(iconv
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-        )
+        GIT_SHALLOW true
+        )
--- a/cmake/libdwarf_CMakeLists.txt.in
+++ b/cmake/libdwarf_CMakeLists.txt.in
@ -5,8 +5,9 @@ ExternalProject_Add(libdwarf
        GIT_TAG libdwarf-0.3.1
        SOURCE_DIR "${TD_CONTRIB_DIR}/libdwarf"
        BINARY_DIR "${TD_CONTRIB_DIR}/libdwarf"
-        CONFIGURE_COMMAND "" 
-        BUILD_COMMAND ""  
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/libs3_CMakeLists.txt.in
+++ b/cmake/libs3_CMakeLists.txt.in
@ -13,4 +13,5 @@ ExternalProject_Add(libs3
        BUILD_COMMAND make build/lib/libs3.a
        INSTALL_COMMAND make install_static
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/libuv_CMakeLists.txt.in
+++ b/cmake/libuv_CMakeLists.txt.in
@ -5,8 +5,9 @@ ExternalProject_Add(libuv
        GIT_TAG v1.48.0
        SOURCE_DIR "${TD_CONTRIB_DIR}/libuv"
        BINARY_DIR "${TD_CONTRIB_DIR}/libuv"
-        CONFIGURE_COMMAND "" 
-        BUILD_COMMAND ""  
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/lz4_CMakeLists.txt.in
+++ b/cmake/lz4_CMakeLists.txt.in
@ -9,4 +9,5 @@ ExternalProject_Add(lz4
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-        )
+        GIT_SHALLOW true
+        )
--- a/cmake/lzma_CMakeLists.txt.in
+++ b/cmake/lzma_CMakeLists.txt.in
@ -1,9 +1,9 @@

-# xz 
+# xz

 if (${TD_LINUX})
 ExternalProject_Add(lzma2
-        GIT_REPOSITORY https://github.com/conor42/fast-lzma2.git  
+        GIT_REPOSITORY https://github.com/conor42/fast-lzma2.git
        SOURCE_DIR "${TD_CONTRIB_DIR}/lzma2"
        #BINARY_DIR ""
        BUILD_IN_SOURCE TRUE
@ -11,5 +11,6 @@ ExternalProject_Add(lzma2
        BUILD_COMMAND make
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
-endif()
+endif()
--- a/cmake/msvcregex_CMakeLists.txt.in
+++ b/cmake/msvcregex_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(msvcregex
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-)
+        GIT_SHALLOW true
+)
--- a/cmake/mxml_CMakeLists.txt.in
+++ b/cmake/mxml_CMakeLists.txt.in
@ -11,4 +11,5 @@ ExternalProject_Add(mxml
        BUILD_COMMAND make
        INSTALL_COMMAND make install
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/pcre2_CMakeLists.txt.in
+++ b/cmake/pcre2_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(pcre2
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/pthread_CMakeLists.txt.in
+++ b/cmake/pthread_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(pthread
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/rocksdb_CMakeLists.txt.in
+++ b/cmake/rocksdb_CMakeLists.txt.in
@ -11,6 +11,7 @@ if (${BUILD_CONTRIB})
            BUILD_COMMAND ""
            INSTALL_COMMAND ""
            TEST_COMMAND ""
+            GIT_SHALLOW true
        )
 else()
    if (NOT ${TD_LINUX})
@ -24,6 +25,7 @@ else()
            BUILD_COMMAND ""
            INSTALL_COMMAND ""
            TEST_COMMAND ""
+            GIT_SHALLOW true
        )
    endif()
 endif()
--- a/cmake/sqlite_CMakeLists.txt.in
+++ b/cmake/sqlite_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(sqlite
        BUILD_COMMAND "$(MAKE)"
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-)
+        GIT_SHALLOW true
+)
--- a/cmake/ssl_CMakeLists.txt.in
+++ b/cmake/ssl_CMakeLists.txt.in
@ -12,4 +12,5 @@ ExternalProject_Add(openssl
        BUILD_COMMAND make -j
        INSTALL_COMMAND make install_sw -j
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/stub_CMakeLists.txt.in
+++ b/cmake/stub_CMakeLists.txt.in
@ -2,12 +2,12 @@
 # stub
 ExternalProject_Add(stub
        GIT_REPOSITORY https://github.com/coolxv/cpp-stub.git
-        GIT_TAG 5e903b8e
+        GIT_TAG 3137465194014d66a8402941e80d2bccc6346f51
        GIT_SUBMODULES "src"
        SOURCE_DIR "${TD_CONTRIB_DIR}/cpp-stub"
        BINARY_DIR "${TD_CONTRIB_DIR}/cpp-stub/src"
        CONFIGURE_COMMAND ""
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
-        TEST_COMMAND ""
+        TEST_COMMAND ""        
 )
--- 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 3.0
+        GIT_TAG main
        SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE
--- a/cmake/wcwidth_CMakeLists.txt.in
+++ b/cmake/wcwidth_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(wcwidth
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-)
+        GIT_SHALLOW true
+)
--- a/cmake/wingetopt_CMakeLists.txt.in
+++ b/cmake/wingetopt_CMakeLists.txt.in
@ -10,4 +10,5 @@ ExternalProject_Add(wingetopt
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-)
+        GIT_SHALLOW true
+)
--- a/cmake/xml2_CMakeLists.txt.in
+++ b/cmake/xml2_CMakeLists.txt.in
@ -15,4 +15,5 @@ ExternalProject_Add(xml2
        BUILD_COMMAND make -j
        INSTALL_COMMAND make install && ln -sf $ENV{HOME}/.cos-local.2/include/libxml2/libxml $ENV{HOME}/.cos-local.2/include/libxml
        TEST_COMMAND ""
+        GIT_SHALLOW true
        )
--- a/cmake/xz_CMakeLists.txt.in
+++ b/cmake/xz_CMakeLists.txt.in
@ -1,14 +1,15 @@

 # xz
 ExternalProject_Add(xz
-        GIT_REPOSITORY https://github.com/xz-mirror/xz.git 
-        GIT_TAG v5.4.4 
+        GIT_REPOSITORY https://github.com/xz-mirror/xz.git
+        GIT_TAG v5.4.4
        SOURCE_DIR "${TD_CONTRIB_DIR}/xz"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE
-        CMAKE_ARGS 
+        CMAKE_ARGS
        CONFIGURE_COMMAND ""
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
-)
+        GIT_SHALLOW true
+)
--- a/cmake/zlib_CMakeLists.txt.in
+++ b/cmake/zlib_CMakeLists.txt.in
@ -12,4 +12,5 @@ ExternalProject_Add(zlib
        BUILD_COMMAND ""
        INSTALL_COMMAND ""
        TEST_COMMAND ""
+        GIT_SHALLOW true
 )
--- a/cmake/zstd_CMakeLists.txt.in
+++ b/cmake/zstd_CMakeLists.txt.in
@ -1,15 +1,16 @@

-# zstb 
+# zstb

 #ExternalProject_Add(zstd
-        #GIT_REPOSITORY https://github.com/facebook/zstd.git 
+        #GIT_REPOSITORY https://github.com/facebook/zstd.git
        #GIT_TAG v1.5.5
        #SOURCE_DIR "${TD_CONTRIB_DIR}/zstd"
        #DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
        #BINARY_DIR ""
-        #CMAKE_COMMAND 
+        #CMAKE_COMMAND
        #CMAKE_ARGS ${TD_CONTRIB_DIR}/zstd/build/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}/build/lib
-        #BUILD_COMMAND make -j4 
+        #BUILD_COMMAND make -j4
        #INSTALL_COMMAND ""
        #TEST_COMMAND ""
-        #)
+        #GIT_SHALLOW true
+        #)
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -10,39 +10,36 @@ if(${BUILD_WITH_S3})
    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.2/)

 elseif(${BUILD_WITH_COS})
+    set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
+    configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})

-set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
-configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+    if(${BUILD_WITH_COS})
+        file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
+        cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+        cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+        cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
+    endif(${BUILD_WITH_COS})

-if(${BUILD_WITH_COS})
-    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
-    cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-    cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-    cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
-endif(${BUILD_WITH_COS})
-
-configure_file(${CONTRIB_TMP_FILE3} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+    configure_file(${CONTRIB_TMP_FILE3} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
+    execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")

-set(CONTRIB_TMP_FILE2 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in2")
-configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
+    set(CONTRIB_TMP_FILE2 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in2")
+    configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})

-if(${BUILD_WITH_COS})
-    cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
-endif(${BUILD_WITH_COS})
+    if(${BUILD_WITH_COS})
+        cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE2})
+    endif(${BUILD_WITH_COS})

-configure_file(${CONTRIB_TMP_FILE2} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+    configure_file(${CONTRIB_TMP_FILE2} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
+    execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
-
 endif()

-
 set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

@ -59,7 +56,7 @@ endif()
 # taosadapter
 if(${BUILD_HTTP})
    MESSAGE("BUILD_HTTP is on")
-else ()
+else()
    MESSAGE("BUILD_HTTP is off, use taosAdapter")
    cat("${TD_SUPPORT_DIR}/taosadapter_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
@ -110,19 +107,18 @@ cat("${TD_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

 # xz
-#cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+# cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

-#lzma2
+# lzma2
 cat("${TD_SUPPORT_DIR}/lzma_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

-
-if (${BUILD_CONTRIB})
+if(${BUILD_CONTRIB})
    if(${BUILD_WITH_ROCKSDB})
        cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
        add_definitions(-DUSE_ROCKSDB)
    endif()
 else()
-    if (NOT ${TD_LINUX})
+    if(NOT ${TD_LINUX})
        if(${BUILD_WITH_ROCKSDB})
            cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
            add_definitions(-DUSE_ROCKSDB)
@ -134,9 +130,9 @@ else()
    endif()
 endif()

-#cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+# cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})

-#libuv
+# libuv
 if(${BUILD_WITH_UV})
    cat("${TD_SUPPORT_DIR}/libuv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif(${BUILD_WITH_UV})
@ -152,17 +148,17 @@ if(${BUILD_WITH_S3})
    cat("${TD_SUPPORT_DIR}/xml2_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
    cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
    cat("${TD_SUPPORT_DIR}/libs3_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    cat("${TD_SUPPORT_DIR}/azure_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
    add_definitions(-DUSE_S3)

 # cos
 elseif(${BUILD_WITH_COS})
-    #cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    #cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    # cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
    cat("${TD_SUPPORT_DIR}/cos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
    add_definitions(-DUSE_COS)
-
 endif()

 # crashdump
@ -191,9 +187,9 @@ endif()
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
+    WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
+    WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")

 # ================================================================================================
 # Build
@ -206,25 +202,27 @@ if(${BUILD_TEST})
        gtest
        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src>
    )
+
    if(${TD_WINDOWS})
        target_include_directories(
            gtest
            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_win>
        )
    endif(${TD_WINDOWS})
+
    if(${TD_LINUX})
        target_include_directories(
            gtest
            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_linux>
        )
    endif(${TD_LINUX})
+
    if(${TD_DARWIN})
        target_include_directories(
            gtest
            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_darwin>
        )
    endif(${TD_DARWIN})
-
 endif(${BUILD_TEST})

 # cJson
@ -236,15 +234,16 @@ option(CJSON_BUILD_SHARED_LIBS "Overrides BUILD_SHARED_LIBS if CJSON_OVERRIDE_BU
 add_subdirectory(cJson EXCLUDE_FROM_ALL)
 target_include_directories(
    cjson
+
    # see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source
    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cJson>
 )
 unset(CMAKE_PROJECT_INCLUDE_BEFORE)

 # xml2
-#if(${BUILD_WITH_S3})
-#  add_subdirectory(xml2 EXCLUDE_FROM_ALL)
-#endif()
+# if(${BUILD_WITH_S3})
+# add_subdirectory(xml2 EXCLUDE_FROM_ALL)
+# endif()

 # lz4
 add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL)
@ -255,16 +254,26 @@ target_include_directories(

 # zlib
 set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
+
 if(${TD_DARWIN})
    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-non-prototype")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-non-prototype")
 endif(${TD_DARWIN})
+
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
+
+if(${TD_DARWIN})
+    target_compile_options(zlibstatic PRIVATE -Wno-error=deprecated-non-prototype)
+endif()
 target_include_directories(
    zlibstatic
    PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
 )
+
+if(${TD_DARWIN})
+    target_compile_options(zlib PRIVATE -Wno-error=deprecated-non-prototype)
+endif()
 target_include_directories(
    zlib
    PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
@ -274,9 +283,9 @@ unset(CMAKE_PROJECT_INCLUDE_BEFORE)

 # add_subdirectory(xz EXCLUDE_FROM_ALL)
 # target_include_directories(
-#     xz
-#     PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz
-#     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz
+# xz
+# PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz
+# PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz
 # )

 # leveldb
@ -291,24 +300,27 @@ endif(${BUILD_WITH_LEVELDB})

 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
-if (${BUILD_WITH_UV})
+if(${BUILD_WITH_UV})
    if(${TD_LINUX})
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-        IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "")
            SET(CMAKE_BUILD_TYPE Release)
        endif()
    endif(${TD_LINUX})
-endif (${BUILD_WITH_UV})
+endif(${BUILD_WITH_UV})

-if (${BUILD_WITH_ROCKSDB})
-    if (${BUILD_CONTRIB})
+if(${BUILD_WITH_ROCKSDB})
+    if(${BUILD_CONTRIB})
        if(${TD_LINUX})
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
-            if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+            if("${CMAKE_BUILD_TYPE}" STREQUAL "")
                SET(CMAKE_BUILD_TYPE Release)
            endif()
        endif(${TD_LINUX})
+
        MESSAGE(STATUS "ROCKSDB CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
        MESSAGE(STATUS "ROCKSDB C STATUS CONFIG: " ${CMAKE_C_FLAGS})

@ -316,22 +328,23 @@ if (${BUILD_WITH_ROCKSDB})
            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
        endif(${TD_DARWIN})

-        if (${TD_DARWIN_ARM64})
+        if(${TD_DARWIN_ARM64})
            set(HAS_ARMV8_CRC true)
        endif(${TD_DARWIN_ARM64})

-        if (${TD_WINDOWS})
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+        if(${TD_WINDOWS})
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819 /std:c++17")
            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4819")
            option(WITH_JNI "" OFF)
+
            if(CMAKE_C_FLAGS MATCHES "/MT" OR CMAKE_C_FLAGS MATCHES "/MTd")
-               message("Rocksdb build runtime lib use /MT or /MTd")
-               option(WITH_MD_LIBRARY "build with MD" OFF)
+                message("Rocksdb build runtime lib use /MT or /MTd")
+                option(WITH_MD_LIBRARY "build with MD" OFF)
            endif()
+
            set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
        endif(${TD_WINDOWS})

-
        if(${TD_DARWIN})
            option(HAVE_THREAD_LOCAL "" OFF)
            option(WITH_IOSTATS_CONTEXT "" OFF)
@ -357,30 +370,32 @@ if (${BUILD_WITH_ROCKSDB})
            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
        )
    else()
-        if (NOT ${TD_LINUX})
+        if(NOT ${TD_LINUX})
            MESSAGE(STATUS "ROCKSDB CXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
            MESSAGE(STATUS "ROCKSDB C STATUS CONFIG: " ${CMAKE_C_FLAGS})
+
            if(${TD_DARWIN})
                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=maybe-uninitialized")
            endif(${TD_DARWIN})

-            if (${TD_DARWIN_ARM64})
+            if(${TD_DARWIN_ARM64})
                set(HAS_ARMV8_CRC true)
            endif(${TD_DARWIN_ARM64})

-            if (${TD_WINDOWS})
-                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+            if(${TD_WINDOWS})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819 /std:c++17")
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4819")
                option(WITH_JNI "" OFF)
+
                if(CMAKE_C_FLAGS MATCHES "/MT" OR CMAKE_C_FLAGS MATCHES "/MTd")
                    message("Rocksdb build runtime lib use /MT or /MTd")
                    option(WITH_MD_LIBRARY "build with MD" OFF)
                endif()
+
                set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
            endif(${TD_WINDOWS})

-
            if(${TD_DARWIN})
                option(HAVE_THREAD_LOCAL "" OFF)
                option(WITH_IOSTATS_CONTEXT "" OFF)
@ -406,44 +421,44 @@ if (${BUILD_WITH_ROCKSDB})
                PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
            )
        endif()
-
    endif()
 endif()

 if(${BUILD_WITH_S3})
    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.2/include)
    MESSAGE("build with s3: ${BUILD_WITH_S3}")
+
 # cos
 elseif(${BUILD_WITH_COS})
-  if(${TD_LINUX})
-    set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
-    #ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
-    option(ENABLE_TEST "Enable the tests" OFF)
-    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)
-    #MESSAGE("$ENV{HOME}/.cos-local.1/include")
+    if(${TD_LINUX})
+        set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)

-    set(CMAKE_BUILD_TYPE Release)
-    set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
-    set(CMAKE_PROJECT_NAME cos_c_sdk)
+        # ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
+        option(ENABLE_TEST "Enable the tests" OFF)
+        INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)

-    add_subdirectory(cos-c-sdk-v5 EXCLUDE_FROM_ALL)
-    target_include_directories(
-      cos_c_sdk
-      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
-      )
+        # MESSAGE("$ENV{HOME}/.cos-local.1/include")
+        set(CMAKE_BUILD_TYPE Release)
+        set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
+        set(CMAKE_PROJECT_NAME cos_c_sdk)

-    set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
-  else()
-
-  endif(${TD_LINUX})
+        add_subdirectory(cos-c-sdk-v5 EXCLUDE_FROM_ALL)
+        target_include_directories(
+            cos_c_sdk
+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
+        )

+        set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
+    else()
+    endif(${TD_LINUX})
 endif()

 # pthread
 if(${BUILD_PTHREAD})
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    SET(CMAKE_BUILD_TYPE Release)
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+        SET(CMAKE_BUILD_TYPE Release)
    endif()
+
    add_definitions(-DPTW32_STATIC_LIB)
    add_subdirectory(pthread EXCLUDE_FROM_ALL)
    set_target_properties(libpthreadVC3 PROPERTIES OUTPUT_NAME pthread)
@ -451,16 +466,15 @@ if(${BUILD_PTHREAD})
    target_link_libraries(pthread INTERFACE libpthreadVC3)
 endif()

-
 # jemalloc
 if(${JEMALLOC_ENABLED})
    include(ExternalProject)
    ExternalProject_Add(jemalloc
-        PREFIX        "jemalloc"
-        SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
-        BUILD_IN_SOURCE     1
-        CONFIGURE_COMMAND  ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --disable-initial-exec-tls
-        BUILD_COMMAND       ${MAKE}
+        PREFIX "jemalloc"
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
+        BUILD_IN_SOURCE 1
+        CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --disable-initial-exec-tls
+        BUILD_COMMAND ${MAKE}
    )
    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
 endif()
@ -514,12 +528,13 @@ endif(${BUILD_WCWIDTH})

 # LIBUV
 if(${BUILD_WITH_UV})
-    if (TD_WINDOWS)
+    if(TD_WINDOWS)
        # There is no GetHostNameW function on win7.
        file(READ "libuv/src/win/util.c" LIBUV_WIN_UTIL_CONTENT)
        string(REPLACE "if (GetHostNameW(buf, UV_MAXHOSTNAMESIZE" "DWORD  nSize = UV_MAXHOSTNAMESIZE;\n  if (GetComputerNameW(buf, &nSize" LIBUV_WIN_UTIL_CONTENT "${LIBUV_WIN_UTIL_CONTENT}")
        file(WRITE "libuv/src/win/util.c" "${LIBUV_WIN_UTIL_CONTENT}")
-    endif ()
+    endif()
+
    add_subdirectory(libuv EXCLUDE_FROM_ALL)
 endif(${BUILD_WITH_UV})

@ -535,6 +550,7 @@ if(${BUILD_WITH_SQLITE})
        INTERFACE m
        INTERFACE pthread
    )
+
    if(NOT TD_WINDOWS)
        target_link_libraries(sqlite
            INTERFACE dl
@ -545,36 +561,38 @@ endif(${BUILD_WITH_SQLITE})
 # addr2line
 if(${BUILD_ADDR2LINE})
    if(NOT ${TD_WINDOWS})
-        check_include_file( "sys/types.h"     HAVE_SYS_TYPES_H)
-        check_include_file( "sys/stat.h"      HAVE_SYS_STAT_H )
-        check_include_file( "inttypes.h"      HAVE_INTTYPES_H   )
-        check_include_file( "stddef.h"        HAVE_STDDEF_H   )
-        check_include_file( "stdlib.h"        HAVE_STDLIB_H   )
-        check_include_file( "string.h"        HAVE_STRING_H   )
-        check_include_file( "memory.h"        HAVE_MEMORY_H   )
-        check_include_file( "strings.h"       HAVE_STRINGS_H  )
-        check_include_file( "stdint.h"        HAVE_STDINT_H   )
-        check_include_file( "unistd.h"        HAVE_UNISTD_H   )
-        check_include_file( "sgidefs.h"       HAVE_SGIDEFS_H  )
-        check_include_file( "stdafx.h"        HAVE_STDAFX_H   )
-        check_include_file( "elf.h"           HAVE_ELF_H      )
-        check_include_file( "libelf.h"        HAVE_LIBELF_H   )
-        check_include_file( "libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
-        check_include_file( "alloca.h"        HAVE_ALLOCA_H   )
-        check_include_file( "elfaccess.h"     HAVE_ELFACCESS_H)
-        check_include_file( "sys/elf_386.h"   HAVE_SYS_ELF_386_H  )
-        check_include_file( "sys/elf_amd64.h" HAVE_SYS_ELF_AMD64_H)
-        check_include_file( "sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
-        check_include_file( "sys/ia64/elf.h"  HAVE_SYS_IA64_ELF_H )
+        check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
+        check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
+        check_include_file("inttypes.h" HAVE_INTTYPES_H)
+        check_include_file("stddef.h" HAVE_STDDEF_H)
+        check_include_file("stdlib.h" HAVE_STDLIB_H)
+        check_include_file("string.h" HAVE_STRING_H)
+        check_include_file("memory.h" HAVE_MEMORY_H)
+        check_include_file("strings.h" HAVE_STRINGS_H)
+        check_include_file("stdint.h" HAVE_STDINT_H)
+        check_include_file("unistd.h" HAVE_UNISTD_H)
+        check_include_file("sgidefs.h" HAVE_SGIDEFS_H)
+        check_include_file("stdafx.h" HAVE_STDAFX_H)
+        check_include_file("elf.h" HAVE_ELF_H)
+        check_include_file("libelf.h" HAVE_LIBELF_H)
+        check_include_file("libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
+        check_include_file("alloca.h" HAVE_ALLOCA_H)
+        check_include_file("elfaccess.h" HAVE_ELFACCESS_H)
+        check_include_file("sys/elf_386.h" HAVE_SYS_ELF_386_H)
+        check_include_file("sys/elf_amd64.h" HAVE_SYS_ELF_AMD64_H)
+        check_include_file("sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
+        check_include_file("sys/ia64/elf.h" HAVE_SYS_IA64_ELF_H)
        set(VERSION 0.3.1)
        set(PACKAGE_VERSION "\"${VERSION}\"")
        configure_file(libdwarf/cmake/config.h.cmake config.h)
        file(GLOB_RECURSE LIBDWARF_SOURCES "libdwarf/src/lib/libdwarf/*.c")
        add_library(libdwarf STATIC ${LIBDWARF_SOURCES})
        set_target_properties(libdwarf PROPERTIES OUTPUT_NAME "libdwarf")
+
        if(HAVE_LIBELF_H OR HAVE_LIBELF_LIBELF_H)
            target_link_libraries(libdwarf PUBLIC libelf)
        endif()
+
        target_include_directories(libdwarf SYSTEM PUBLIC "libdwarf/src/lib/libdwarf" ${CMAKE_CURRENT_BINARY_DIR})
        file(READ "addr2line/addr2line.c" ADDR2LINE_CONTENT)
        string(REPLACE "static int" "int" ADDR2LINE_CONTENT "${ADDR2LINE_CONTENT}")
@ -583,7 +601,7 @@ if(${BUILD_ADDR2LINE})
        file(WRITE "addr2line/addr2line.c" "${ADDR2LINE_CONTENT}")
        add_library(addr2line STATIC "addr2line/addr2line.c")
        target_link_libraries(addr2line PUBLIC libdwarf dl z)
-        target_include_directories(addr2line PUBLIC "libdwarf/src/lib/libdwarf" )
+        target_include_directories(addr2line PUBLIC "libdwarf/src/lib/libdwarf")
    endif(NOT ${TD_WINDOWS})
 endif(${BUILD_ADDR2LINE})

@ -592,31 +610,41 @@ if(${BUILD_GEOS})
    if(${TD_LINUX})
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
-        if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "")
            SET(CMAKE_BUILD_TYPE Release)
        endif()
    endif(${TD_LINUX})
+
    option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" OFF)
    add_subdirectory(geos EXCLUDE_FROM_ALL)
-    if (${TD_WINDOWS})
+
+    if(${TD_WINDOWS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    else ()
+    else()
        unset(CMAKE_CXX_STANDARD CACHE) # undo libgeos's setting of global CMAKE_CXX_STANDARD
    endif(${TD_WINDOWS})
+
    target_include_directories(
        geos_c
        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/geos/include>
    )
 endif(${BUILD_GEOS})

-if (${BUILD_PCRE2})
+if(${BUILD_PCRE2})
    add_subdirectory(pcre2 EXCLUDE_FROM_ALL)
 endif(${BUILD_PCRE2})

+if(${TD_LINUX} AND ${BUILD_WITH_S3})
+    add_subdirectory(azure-cmake EXCLUDE_FROM_ALL)
+endif()
+
 # ================================================================================================
 # Build test
 # ================================================================================================
+MESSAGE("build with dependency tests: ${BUILD_DEPENDENCY_TESTS}")
+
 if(${BUILD_DEPENDENCY_TESTS})
    add_subdirectory(test EXCLUDE_FROM_ALL)
 endif(${BUILD_DEPENDENCY_TESTS})
--- a/contrib/azure-cmake/CMakeLists.txt
+++ b/contrib/azure-cmake/CMakeLists.txt
@ -0,0 +1,73 @@
+# lib_azure_sdk
+set(AZURE_DIR "${TD_CONTRIB_DIR}/azure-sdk-for-cpp-azure-storage-blobs_12.13.0-beta.1")
+set(AZURE_SDK_LIBRARY_DIR "${AZURE_DIR}/sdk")
+
+file(GLOB AZURE_SDK_SRC
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/credentials/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/cryptography/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/http/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/http/curl/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/io/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/tracing/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/identity/azure-identity/src/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/src/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/src/private/*.cpp"
+    "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-common/src/*.cpp"
+)
+
+file(GLOB AZURE_SDK_UNIFIED_SRC
+    ${AZURE_SDK_SRC}
+)
+
+set(AZURE_SDK_INCLUDES
+    "${AZURE_SDK_LIBRARY_DIR}/core/azure-core/inc/"
+    "${AZURE_SDK_LIBRARY_DIR}/identity/azure-identity/inc/"
+    "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-common/inc/"
+    "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/inc/"
+)
+
+add_library(_azure_sdk STATIC ${AZURE_SDK_UNIFIED_SRC})
+target_compile_definitions(_azure_sdk PRIVATE BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
+
+target_include_directories(
+    _azure_sdk
+    PUBLIC "$ENV{HOME}/.cos-local.2/include"
+)
+
+find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+find_library(XML2_LIBRARY xml2 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+
+# find_library(CURL_LIBRARY curl)
+# find_library(XML2_LIBRARY xml2)
+find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+
+# find_library(CoreFoundation_Library CoreFoundation)
+# find_library(SystemConfiguration_Library SystemConfiguration)
+target_link_libraries(
+    _azure_sdk
+    PRIVATE ${CURL_LIBRARY}
+    PRIVATE ${SSL_LIBRARY}
+    PRIVATE ${CRYPTO_LIBRARY}
+    PRIVATE ${XML2_LIBRARY}
+
+    # PRIVATE xml2
+    PRIVATE zlib
+
+    # PRIVATE ${CoreFoundation_Library}
+    # PRIVATE ${SystemConfiguration_Library}
+)
+
+# Originally, on Windows azure-core is built with bcrypt and crypt32 by default
+if(TARGET OpenSSL::SSL)
+    target_link_libraries(_azure_sdk PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+endif()
+
+# Originally, on Windows azure-core is built with winhttp by default
+if(TARGET td_contrib::curl)
+    target_link_libraries(_azure_sdk PRIVATE td_contrib::curl)
+endif()
+
+target_include_directories(_azure_sdk SYSTEM BEFORE PUBLIC ${AZURE_SDK_INCLUDES})
+add_library(td_contrib::azure_sdk ALIAS _azure_sdk)
--- a/contrib/test/CMakeLists.txt
+++ b/contrib/test/CMakeLists.txt
@ -28,5 +28,6 @@ if(${BUILD_WITH_TRAFT})
    # add_subdirectory(traft)
 endif(${BUILD_WITH_TRAFT})

+add_subdirectory(azure)
 add_subdirectory(tdev)
 add_subdirectory(lz4)
--- a/contrib/test/azure/CMakeLists.txt
+++ b/contrib/test/azure/CMakeLists.txt
@ -0,0 +1,27 @@
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+add_executable(
+  azure-test
+  main.cpp
+)
+
+find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+find_library(XML2_LIBRARY xml2 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+
+# find_library(XML2_LIBRARY xml2)
+find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
+
+# find_library(CoreFoundation_Library CoreFoundation)
+# find_library(SystemConfiguration_Library SystemConfiguration)
+target_link_libraries(
+  azure-test
+  PRIVATE _azure_sdk
+  PRIVATE ${CURL_LIBRARY}
+  PRIVATE ${XML2_LIBRARY}
+  PRIVATE ${SSL_LIBRARY}
+  PRIVATE ${CRYPTO_LIBRARY}
+  PRIVATE dl
+  PRIVATE pthread
+)
--- a/contrib/test/azure/main.cpp
+++ b/contrib/test/azure/main.cpp
@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+
+// Include the necessary SDK headers
+#include <azure/core.hpp>
+#include <azure/storage/blobs.hpp>
+
+// Add appropriate using namespace directives
+using namespace Azure::Storage;
+using namespace Azure::Storage::Blobs;
+
+// Secrets should be stored & retrieved from secure locations such as Azure::KeyVault. For
+// convenience and brevity of samples, the secrets are retrieved from environment variables.
+
+std::string GetEndpointUrl() {
+  // return std::getenv("AZURE_STORAGE_ACCOUNT_URL");
+  std::string accountId = getenv("ablob_account_id");
+  if (accountId.empty()) {
+    return accountId;
+  }
+
+  return accountId + ".blob.core.windows.net";
+}
+
+std::string GetAccountName() {
+  //  return std::getenv("AZURE_STORAGE_ACCOUNT_NAME");
+  return getenv("ablob_account_id");
+}
+
+std::string GetAccountKey() {
+  // return std::getenv("AZURE_STORAGE_ACCOUNT_KEY");
+
+  return getenv("ablob_account_secret");
+}
+
+int main() {
+  std::string endpointUrl = GetEndpointUrl();
+  std::string accountName = GetAccountName();
+  std::string accountKey = GetAccountKey();
+
+  try {
+    auto sharedKeyCredential = std::make_shared<StorageSharedKeyCredential>(accountName, accountKey);
+
+    std::string       accountURL = "https://fd2d01cd892f844eeaa2273.blob.core.windows.net";
+    BlobServiceClient blobServiceClient(accountURL, sharedKeyCredential);
+
+    std::string containerName = "myblobcontainer";
+    // auto containerClient = blobServiceClient.GetBlobContainerClient("myblobcontainer");
+    auto containerClient = blobServiceClient.GetBlobContainerClient("td-test");
+
+    // Create the container if it does not exist
+    std::cout << "Creating container: " << containerName << std::endl;
+    // containerClient.CreateIfNotExists();
+
+    std::string blobName = "blob.txt";
+    uint8_t     blobContent[] = "Hello Azure!";
+    // Create the block blob client
+    BlockBlobClient blobClient = containerClient.GetBlockBlobClient(blobName);
+
+    // Upload the blob
+    std::cout << "Uploading blob: " << blobName << std::endl;
+    blobClient.UploadFrom(blobContent, sizeof(blobContent));
+    /*
+        auto blockBlobClient = BlockBlobClient(endpointUrl, sharedKeyCredential);
+
+        // Create some data to upload into the blob.
+        std::vector<uint8_t> data = {1, 2, 3, 4};
+        Azure::Core::IO::MemoryBodyStream stream(data);
+
+        Azure::Response<Models::UploadBlockBlobResult> response = blockBlobClient.Upload(stream);
+
+        Models::UploadBlockBlobResult model = response.Value;
+        std::cout << "Last modified date of uploaded blob: " << model.LastModified.ToString()
+                  << std::endl;
+    */
+  } catch (const Azure::Core::RequestFailedException& e) {
+    std::cout << "Status Code: " << static_cast<int>(e.StatusCode) << ", Reason Phrase: " << e.ReasonPhrase
+              << std::endl;
+    std::cout << e.what() << std::endl;
+
+    return 1;
+  }
+
+  return 0;
+}
--- a/docs/en/01-index.md
+++ b/docs/en/01-index.md
@ -13,15 +13,15 @@ TDengine greatly improves the efficiency of data ingestion, querying, and storag

 If you are a developer, please read the [Developer Guide](./develop) carefully. This section introduces the database connection, data modeling, data ingestion, query, continuous query, cache, data subscription, user-defined functions, and other functionality in detail. Sample code is provided for a variety of programming languages. In most cases, you can just copy and paste the sample code, and make a few changes to accommodate your application, and it will work.

-We live in the era of big data, and scale-up is unable to meet the growing needs of the business. Any modern data system must have the ability to scale out, and clustering has become an indispensable feature of big data systems. Not only did the TDengine team develop the cluster feature, but also decided to open source this important feature. To learn how to deploy, manage and maintain a TDengine cluster please refer to [Cluster Deployment](./deployment).
+We live in the era of big data, and scale-up is unable to meet the growing needs of the business. Any modern data system must have the ability to scale out, and clustering has become an indispensable feature of big data systems. Not only did the TDengine team develop the cluster feature, but also decided to open source this important feature. To learn how to deploy, manage and maintain a TDengine cluster please refer to [Cluster Deployment](./operation/deployment).

-TDengine uses ubiquitous SQL as its query language, which greatly reduces learning costs and migration costs. In addition to the standard SQL, TDengine has extensions to better support time series data analysis. These extensions include functions such as roll-up, interpolation, and time-weighted average, among many others. The [SQL Reference](./taos-sql) chapter describes the SQL syntax in detail and lists the various supported commands and functions.
+TDengine uses ubiquitous SQL as its query language, which greatly reduces learning costs and migration costs. In addition to the standard SQL, TDengine has extensions to better support time series data analysis. These extensions include functions such as roll-up, interpolation, and time-weighted average, among many others. The [SQL Reference](./reference/taos-sql) chapter describes the SQL syntax in detail and lists the various supported commands and functions.

 If you are a system administrator who cares about installation, upgrade, fault tolerance, disaster recovery, data import, data export, system configuration, how to monitor whether TDengine is running healthily, and how to improve system performance, please refer to, and thoroughly read the [Administration](./operation) section.

 If you want to know more about TDengine tools and the REST API, please see the [Reference](./reference) chapter.

-For information about connecting to TDengine with different programming languages, see [Client Libraries](./client-libraries/).
+For information about connecting to TDengine with different programming languages, see [Client Libraries](./reference/connectors).

 If you are very interested in the internal design of TDengine, please read the chapter [Inside TDengine](./tdinternal), which introduces the cluster design, data partitioning, sharding, writing, and reading processes in detail. If you want to study TDengine code or even contribute code, please read this chapter carefully.

--- a/docs/en/04-concept/index.md
+++ b/docs/en/04-concept/index.md
--- a/docs/en/02-intro/_category_.yml
+++ b/docs/en/02-intro/_category_.yml
@ -1 +0,0 @@
-label: Introduction
--- a/docs/en/02-intro/index.md
+++ b/docs/en/02-intro/index.md
@ -17,9 +17,9 @@ The major features are listed below:
   - Supports [schemaless writing](../reference/schemaless/) just like NoSQL databases. It also supports standard protocols like [InfluxDB Line](../develop/insert-data/influxdb-line), [OpenTSDB Telnet](../develop/insert-data/opentsdb-telnet), [OpenTSDB JSON ](../develop/insert-data/opentsdb-json) among others.
   - Supports seamless integration with third-party tools like [Telegraf](../third-party/telegraf/), [Prometheus](../third-party/prometheus/), [collectd](../third-party/collectd/), [StatsD](../third-party/statsd/), [TCollector](../third-party/tcollector/), [EMQX](../third-party/emq-broker), [HiveMQ](../third-party/hive-mq-broker), and [Icinga2](../third-party/icinga2/), they can write data into TDengine with simple configuration and without a single line of code.
 2. Query data
-   - Supports standard [SQL](../taos-sql/), including nested query.
-   - Supports [time series specific functions](../taos-sql/function/#time-series-extensions) and [time series specific queries](../taos-sql/distinguished), like downsampling, interpolation, cumulated sum, time weighted average, state window, session window and many others.
-   - Supports [User Defined Functions (UDF)](../taos-sql/udf).
+   - Supports standard [SQL](../reference/taos-sql/), including nested query.
+   - Supports [time series specific functions](../reference/taos-sql/function/#time-series-extensions) and [time series specific queries](../reference/taos-sql/distinguished), like downsampling, interpolation, cumulated sum, time weighted average, state window, session window and many others.
+   - Supports [User Defined Functions (UDF)](../reference/taos-sql/udf).
 3. [Caching](../develop/cache/): TDengine always saves the last data point in cache, so Redis is not needed for time-series data processing.
 4. [Stream Processing](../develop/stream/): Not only is the continuous query is supported, but TDengine also supports event driven stream processing, so Flink or Spark is not needed for time-series data processing.
 5. [Data Subscription](../develop/tmq/): Application can subscribe a table or a set of tables. API is the same as Kafka, but you can specify filter conditions.
@ -27,18 +27,18 @@ The major features are listed below:
   - Supports seamless integration with [Grafana](../third-party/grafana/).
   - Supports seamless integration with [Google Data Studio](../third-party/google-data-studio/).
 7. Cluster
-   - Supports [cluster](../deployment/) with the capability of increasing processing power by adding more nodes.
-   - Supports [deployment on Kubernetes](../deployment/k8s/).
+   - Supports [cluster](../operation/deployment/) with the capability of increasing processing power by adding more nodes.
+   - Supports [deployment on Kubernetes](../operation/deployment).
   - Supports high availability via data replication.
 8. Administration
   - Provides [monitoring](../operation/monitor) on running instances of TDengine.
   - Provides many ways to [import](../operation/import) and [export](../operation/export) data.
 9. Tools
-   - Provides an interactive [Command Line Interface (CLI)](../reference/taos-shell) for management, maintenance and ad-hoc queries.
-   - Provides a tool [taosBenchmark](../reference/taosbenchmark/) for testing the performance of TDengine.
+   - Provides an interactive [Command Line Interface (CLI)](../reference/components/taos-shell) for management, maintenance and ad-hoc queries.
+   - Provides a tool [taosBenchmark](../reference/components/taosbenchmark/) for testing the performance of TDengine.
 10. Programming
-    - Provides [client libraries](../client-libraries/) for [C/C++](../client-libraries/cpp), [Java](../client-libraries/java), [Python](../client-libraries/python), [Go](../client-libraries/go), [Rust](../client-libraries/rust), [Node.js](../client-libraries/node) and other programming languages.
-    - Provides a [REST API](../reference/rest-api/).
+    - Provides [client libraries](../reference/connectors/) for [C/C++](../reference/connectors/cpp), [Java](../reference/connectors/java), [Python](../reference/connectors/python), [Go](../reference/connectors/go), [Rust](../reference/connectors/rust), [Node.js](../reference/connectors/node) and other programming languages.
+    - Provides a [REST API](../reference/connectors/rest-api).

 For more details on features, please read through the entire documentation.

@ -46,7 +46,7 @@ For more details on features, please read through the entire documentation.

 By making full use of [characteristics of time series data](https://tdengine.com/characteristics-of-time-series-data/), TDengine differentiates itself from other time series databases with the following advantages.

- **[High-Performance](https://tdengine.com/high-performance/)**: 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.
+- **[High-Performance](https://tdengine.com/high-performance/)**: TDengine is the only time-series database to solve the high cardinality issue to support billions of data collection points while outperforming other time-series databases for data ingestion, querying and data compression.

 - **[Simplified Solution](https://tdengine.com/comprehensive-industrial-data-solution/)**: Through built-in caching, stream processing and data subscription features, TDengine provides a simplified solution for time-series data processing. It reduces system design complexity and operation costs significantly.

--- a/docs/en/04-concept/_category_.yml
+++ b/docs/en/04-concept/_category_.yml
@ -1 +0,0 @@
-label: Concepts
--- a/docs/en/04-get-started/01-docker.md
+++ b/docs/en/04-get-started/01-docker.md
@ -75,9 +75,9 @@ taos>

 ## TDegnine Graphic User Interface

-From TDengine 3.3.0.0, there is a new componenet called `taos-explorer` added in the TDengine docker image. You can use it to manage the databases, super tables, child tables, and data in your TDengine system. There are also some features only available in TDengine Enterprise Edition, please contact TDengine sales team in case you need these features.
+From TDengine 3.3.0.0, there is a new component called `taos-explorer` added in the TDengine docker image. You can use it to manage the databases, super tables, child tables, and data in your TDengine system. There are also some features only available in TDengine Enterprise Edition, please contact TDengine sales team in case you need these features.

-To use taos-explorer in the container, you need to access the host port mapped from container port 6060. Assuming the host name is abc.com, and the port used on host is 6060, you need to access `http://abc.com:6060`. taos-explorer uses port 6060 by default in the container. When you use it the first time, you need to register with your enterprise email, then can logon using your user name and password in the TDengine database management system.
+To use taos-explorer in the container, you need to access the host port mapped from container port 6060. Assuming the host name is abc.com, and the port used on host is 6060, you need to access `http://abc.com:6060`. taos-explorer uses port 6060 by default in the container. The default username and password to log in to the TDengine Database Management System is "root/taosdata".

 ## Test data insert performance

@ -93,7 +93,7 @@ This command creates the `meters` supertable in the `test` database. In the `met

 The `taosBenchmark` command creates a deployment with 100 million data points that you can use for testing purposes. The time required to create the deployment depends on your hardware. On most modern servers, the deployment is created in ten to twenty seconds.

-You can customize the test deployment that taosBenchmark creates by specifying command-line parameters. For information about command-line parameters, run the `taosBenchmark --help` command. For more information about taosBenchmark, see [taosBenchmark](../../reference/taosbenchmark).
+You can customize the test deployment that taosBenchmark creates by specifying command-line parameters. For information about command-line parameters, run the `taosBenchmark --help` command. For more information about taosBenchmark, see [taosBenchmark](../../reference/components/taosbenchmark).

 ## Test data query performance

@ -129,9 +129,9 @@ Query the average, maximum, and minimum values for table `d10` in 10 second inte
 SELECT FIRST(ts), AVG(current), MAX(voltage), MIN(phase) FROM test.d10 INTERVAL(10s);
 ```

-In the query above you are selecting the first timestamp (ts) in the interval, another way of selecting this would be `\_wstart` which will give the start of the time window. For more information about windowed queries, see [Time-Series Extensions](../../taos-sql/distinguished/).
+In the query above you are selecting the first timestamp (ts) in the interval, another way of selecting this would be `\_wstart` which will give the start of the time window. For more information about windowed queries, see [Time-Series Extensions](../../reference/taos-sql/distinguished/).


 ## Additional Information

-For more information about deploying TDengine in a Docker environment, see [Deploying TDengine with Docker](../../deployment/docker).
+For more information about deploying TDengine in a Docker environment, see [Deploying TDengine with Docker](../../operation/deployment/#docker).
--- a/docs/en/04-get-started/03-package.md
+++ b/docs/en/04-get-started/03-package.md
@ -14,7 +14,7 @@ This document describes how to install TDengine on Linux/Windows/macOS and perfo
 - 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).

-The full package of TDengine includes the TDengine Server (`taosd`), TDengine Client (`taosc`), taosAdapter for connecting with third-party systems and providing a RESTful interface, a command-line interface (CLI, taos), and some tools. Note that taosAdapter supports Linux only. In addition to client libraries for multiple languages, TDengine also provides a [REST API](../../reference/rest-api) through [taosAdapter](../../reference/taosadapter).
+The full package of TDengine includes the TDengine Server (`taosd`), TDengine Client (`taosc`), taosAdapter for connecting with third-party systems and providing a RESTful interface, a command-line interface (CLI, taos), and some tools. Note that taosAdapter supports Linux only. In addition to client libraries for multiple languages, TDengine also provides a [REST API](../../reference/connectors/rest-api) through [taosAdapter](../../reference/components/taosadapter).

 The standard server installation package includes `taos`, `taosd`, `taosAdapter`, `taosBenchmark`, and sample code. You can also download the Lite package that includes only `taosd` and the C/C++ client library.

@ -265,7 +265,7 @@ SELECT * FROM t;
 Query OK, 2 row(s) in set (0.003128s)
 ```

-You can also can monitor the deployment status, add and remove user accounts, and manage running instances. You can run the TDengine CLI on either machines. For more information, see [TDengine CLI](../../reference/taos-shell/).
+You can also can monitor the deployment status, add and remove user accounts, and manage running instances. You can run the TDengine CLI on either machines. For more information, see [TDengine CLI](../../reference/components/taos-shell/).

 ## TDengine Graphic User Interface

@ -287,7 +287,7 @@ This command creates the `meters` supertable in the `test` database. In the `met

 The `taosBenchmark` command creates a deployment with 100 million data points that you can use for testing purposes. The time required to create the deployment depends on your hardware. On most modern servers, the deployment is created in ten to twenty seconds.

-You can customize the test deployment that taosBenchmark creates by specifying command-line parameters. For information about command-line parameters, run the `taosBenchmark --help` command. For more information about taosBenchmark, see [taosBenchmark](../../reference/taosbenchmark).
+You can customize the test deployment that taosBenchmark creates by specifying command-line parameters. For information about command-line parameters, run the `taosBenchmark --help` command. For more information about taosBenchmark, see [taosBenchmark](../../reference/components/taosbenchmark).

 ## Test data query performance

@ -323,4 +323,4 @@ Query the average, maximum, and minimum values for table `d10` in 10 second inte
 SELECT FIRST(ts), AVG(current), MAX(voltage), MIN(phase) FROM test.d10 INTERVAL(10s);
 ```

-In the query above you are selecting the first timestamp (ts) in the interval, another way of selecting this would be `\_wstart` which will give the start of the time window. For more information about windowed queries, see [Time-Series Extensions](../../taos-sql/distinguished/).
+In the query above you are selecting the first timestamp (ts) in the interval, another way of selecting this would be `\_wstart` which will give the start of the time window. For more information about windowed queries, see [Time-Series Extensions](../../reference/taos-sql/distinguished/).
--- a/docs/en/04-get-started/_apt_get_install.mdx
+++ b/docs/en/04-get-started/_apt_get_install.mdx
--- a/docs/en/04-get-started/_pkg_install.mdx
+++ b/docs/en/04-get-started/_pkg_install.mdx
--- a/docs/en/04-get-started/discord.svg
+++ b/docs/en/04-get-started/discord.svg
--- a/docs/en/04-get-started/github.svg
+++ b/docs/en/04-get-started/github.svg
--- a/docs/en/04-get-started/index.md
+++ b/docs/en/04-get-started/index.md
@ -12,7 +12,7 @@ import StackOverflowSVG from './stackoverflow.svg'

 You can install and run TDengine on Linux/Windows/macOS machines as well as Docker containers. You can also deploy TDengine as a managed service with TDengine Cloud.

-The full package of TDengine includes the TDengine Server (`taosd`), TDengine Client (`taosc`), taosAdapter for connecting with third-party systems and providing a RESTful interface, a command-line interface, and some tools. In addition to client libraries for multiple languages, TDengine also provides a [RESTful interface](../reference/rest-api) through [taosAdapter](../reference/taosadapter).
+The full package of TDengine includes the TDengine Server (`taosd`), TDengine Client (`taosc`), taosAdapter for connecting with third-party systems and providing a RESTful interface, a command-line interface, and some tools. In addition to client libraries for multiple languages, TDengine also provides a [RESTful interface](../reference/connectors/rest-api) through [taosAdapter](../reference/components/taosadapter).

 ```mdx-code-block
 import DocCardList from '@theme/DocCardList';
--- a/docs/en/04-get-started/linkedin.svg
+++ b/docs/en/04-get-started/linkedin.svg
--- a/docs/en/04-get-started/stackoverflow.svg
+++ b/docs/en/04-get-started/stackoverflow.svg
--- a/docs/en/04-get-started/twitter.svg
+++ b/docs/en/04-get-started/twitter.svg
--- a/docs/en/04-get-started/youtube.svg
+++ b/docs/en/04-get-started/youtube.svg
--- a/docs/en/05-get-started/_category_.yml
+++ b/docs/en/05-get-started/_category_.yml
@ -1 +0,0 @@
-label: Get Started
--- a/docs/en/07-develop/01-connect/_category_.yml
+++ b/docs/en/07-develop/01-connect/_category_.yml
@ -1 +0,0 @@
-label: Connect
--- a/docs/en/07-develop/02-model/_category_.yml
+++ b/docs/en/07-develop/02-model/_category_.yml
@ -1,2 +0,0 @@
-label: Data Model
-
--- a/docs/en/07-develop/03-insert-data/_category_.yml
+++ b/docs/en/07-develop/03-insert-data/_category_.yml
@ -1 +0,0 @@
-label: Insert Data
--- a/docs/en/07-develop/04-query-data/_category_.yml
+++ b/docs/en/07-develop/04-query-data/_category_.yml
@ -1 +0,0 @@
-label: Query Data
--- a/docs/en/07-develop/_category_.yml
+++ b/docs/en/07-develop/_category_.yml
@ -1 +0,0 @@
-label: Developer Guide
--- a/docs/en/07-operation/02-planning.mdx
+++ b/docs/en/07-operation/02-planning.mdx
@ -17,7 +17,7 @@ Each database creates a fixed number of vgroups. This number is 2 by default and
 - pagesize
 - cachesize

-For more information, see [Database](../../taos-sql/database).
+For more information, see [Database](../../reference/taos-sql/database).

 The memory required by a database is therefore greater than or equal to:

--- a/docs/en/07-operation/03-deployment.md
+++ b/docs/en/07-operation/03-deployment.md
--- a/docs/en/07-operation/04-tolerance.md
+++ b/docs/en/07-operation/04-tolerance.md
--- a/docs/en/07-operation/07-import.md
+++ b/docs/en/07-operation/07-import.md
--- a/docs/en/07-operation/08-export.md
+++ b/docs/en/07-operation/08-export.md
--- a/docs/en/07-operation/10-monitor.md
+++ b/docs/en/07-operation/10-monitor.md
@ -41,7 +41,7 @@ Launch `TDinsight.sh` with the command above and restart Grafana, then open Dash

 ## log database

-The data of tdinsight dashboard is stored in `log` database (default. You can change it in taoskeeper's config file. For more infrmation, please reference to [taoskeeper document](../../reference/taosKeeper)). The taoskeeper will create log database on taoskeeper startup.
+The data of tdinsight dashboard is stored in `log` database (default. You can change it in taoskeeper's config file. For more infrmation, please reference to [taoskeeper document](../../reference/components/taosKeeper)). The taoskeeper will create log database on taoskeeper startup.

 ### taosd\_cluster\_basic table

--- a/docs/en/07-operation/17-diagnose.md
+++ b/docs/en/07-operation/17-diagnose.md
--- a/docs/en/07-operation/index.md
+++ b/docs/en/07-operation/index.md
--- a/docs/en/08-client-libraries/_category_.yml
+++ b/docs/en/08-client-libraries/_category_.yml
@ -1 +0,0 @@
-label: "Client Libraries"
--- a/docs/en/08-develop/01-connect/_connect_c.mdx
+++ b/docs/en/08-develop/01-connect/_connect_c.mdx
--- a/docs/en/08-develop/01-connect/_connect_cs.mdx
+++ b/docs/en/08-develop/01-connect/_connect_cs.mdx
--- a/docs/en/08-develop/01-connect/_connect_go.mdx
+++ b/docs/en/08-develop/01-connect/_connect_go.mdx
--- a/docs/en/08-develop/01-connect/_connect_java.mdx
+++ b/docs/en/08-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 Client Library](../../client-libraries/java)
+More configuration about connection, please refer to [Java Client Library](../../reference/connectors/java)
--- a/docs/en/08-develop/01-connect/_connect_node.mdx
+++ b/docs/en/08-develop/01-connect/_connect_node.mdx
--- a/docs/en/08-develop/01-connect/_connect_php.mdx
+++ b/docs/en/08-develop/01-connect/_connect_php.mdx
--- a/docs/en/08-develop/01-connect/_connect_python.mdx
+++ b/docs/en/08-develop/01-connect/_connect_python.mdx
--- a/docs/en/08-develop/01-connect/_connect_r.mdx
+++ b/docs/en/08-develop/01-connect/_connect_r.mdx
--- a/docs/en/08-develop/01-connect/_connect_rust.mdx
+++ b/docs/en/08-develop/01-connect/_connect_rust.mdx
--- a/docs/en/08-develop/01-connect/connection-type-en.webp
+++ b/docs/en/08-develop/01-connect/connection-type-en.webp
--- a/docs/en/08-develop/01-connect/index.md
+++ b/docs/en/08-develop/01-connect/index.md
@ -15,14 +15,14 @@ import ConnCSNative from "./_connect_cs.mdx";
 import ConnC from "./_connect_c.mdx";
 import ConnR from "./_connect_r.mdx";
 import ConnPHP from "./_connect_php.mdx";
-import InstallOnLinux from "../../08-client-libraries/_linux_install.mdx";
-import InstallOnWindows from "../../08-client-libraries/_windows_install.mdx";
-import InstallOnMacOS from "../../08-client-libraries/_macos_install.mdx";
-import VerifyLinux from "../../08-client-libraries/_verify_linux.mdx";
-import VerifyWindows from "../../08-client-libraries/_verify_windows.mdx";
-import VerifyMacOS from "../../08-client-libraries/_verify_macos.mdx";
+import InstallOnLinux from "../../14-reference/05-connectors/_linux_install.mdx";
+import InstallOnWindows from "../../14-reference/05-connectors/_windows_install.mdx";
+import InstallOnMacOS from "../../14-reference/05-connectors/_macos_install.mdx";
+import VerifyLinux from "../../14-reference/05-connectors/_verify_linux.mdx";
+import VerifyWindows from "../../14-reference/05-connectors/_verify_windows.mdx";
+import VerifyMacOS from "../../14-reference/05-connectors/_verify_macos.mdx";

-Any application running on any platform can access TDengine through the REST API provided by TDengine. For information, see [REST API](../../reference/rest-api/). Applications can also use the client libraries for various programming languages, including C/C++, Java, Python, Go, Node.js, C#, and Rust, to access TDengine. These client libraries support connecting to TDengine clusters using both native interfaces (taosc). Some client libraries also support connecting over a REST interface. Community developers have also contributed several unofficial client libraries, such as the ADO.NET, Lua, and PHP libraries.
+Any application running on any platform can access TDengine through the REST API provided by TDengine. For information, see [REST API](../../reference/connectors/rest-api/). Applications can also use the client libraries for various programming languages, including C/C++, Java, Python, Go, Node.js, C#, and Rust, to access TDengine. These client libraries support connecting to TDengine clusters using both native interfaces (taosc). Some client libraries also support connecting over a REST interface. Community developers have also contributed several unofficial client libraries, such as the ADO.NET, Lua, and PHP libraries.

 ## Establish Connection

@ -90,7 +90,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.3.0</version>
+  <version>3.3.3</version>
 </dependency>
 ```

--- a/docs/en/08-develop/02-model/index.mdx
+++ b/docs/en/08-develop/02-model/index.mdx
@ -22,7 +22,7 @@ In the above SQL statement:
 - a new data file will be created every 10 days
 - the size of the write cache pool on each VNode is 16 MB
 - the number of vgroups is 100
- WAL is enabled but fsync is disabled For more details please refer to [Database](../../taos-sql/database).
+- WAL is enabled but fsync is disabled For more details please refer to [Database](../../reference/taos-sql/database).

 After creating a database, the current database in use can be switched using SQL command `USE`. For example the SQL statement below switches the current database to `power`.

@ -47,7 +47,7 @@ In a time-series application, there may be multiple kinds of data collection poi
 CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);
 ```

-Similar to creating a regular table, when creating a STable, the name and schema need to be provided. In the STable schema, the first column must always be a timestamp (like ts in the example), and the other columns (like current, voltage and phase in the example) are the data collected. The remaining columns can [contain data of type](../../taos-sql/data-type/) integer, float, double, string etc. In addition, the schema for tags, like location and groupId in the example, must be provided. The tag type can be integer, float, string, etc. Tags are essentially the static properties of a data collection point. For example, properties like the location, device type, device group ID, manager ID are tags. Tags in the schema can be added, removed or updated. Please refer to [STable](../../taos-sql/stable) for more details.
+Similar to creating a regular table, when creating a STable, the name and schema need to be provided. In the STable schema, the first column must always be a timestamp (like ts in the example), and the other columns (like current, voltage and phase in the example) are the data collected. The remaining columns can [contain data of type](../../reference/taos-sql/data-type/) integer, float, double, string etc. In addition, the schema for tags, like location and groupId in the example, must be provided. The tag type can be integer, float, string, etc. Tags are essentially the static properties of a data collection point. For example, properties like the location, device type, device group ID, manager ID are tags. Tags in the schema can be added, removed or updated. Please refer to [STable](../../reference/taos-sql/stable) for more details.

 For each kind of data collection point, a corresponding STable must be created. There may be many STables in an application. For electrical power system, we need to create a STable respectively for meters, transformers, busbars, switches. There may be multiple kinds of data collection points on a single device, for example there may be one data collection point for electrical data like current and voltage and another data collection point for environmental data like temperature, humidity and wind direction. Multiple STables are required for these kinds of devices.

@ -61,7 +61,7 @@ A specific table needs to be created for each data collection point. Similar to
 CREATE TABLE d1001 USING meters TAGS ("California.SanFrancisco", 2);
 ```

-In the above SQL statement, "d1001" is the table name, "meters" is the STable name, followed by the value of tag "Location" and the value of tag "groupId", which are "California.SanFrancisco" and "2" respectively in the example. The tag values can be updated after the table is created. Please refer to [Tables](../../taos-sql/table) for details.
+In the above SQL statement, "d1001" is the table name, "meters" is the STable name, followed by the value of tag "Location" and the value of tag "groupId", which are "California.SanFrancisco" and "2" respectively in the example. The tag values can be updated after the table is created. Please refer to [Tables](../../reference/taos-sql/table) for details.

 It's suggested to use the globally unique ID of a data collection point as the table name. For example the device serial number could be used as a unique ID. If a unique ID doesn't exist, multiple IDs that are not globally unique can be combined to form a globally unique ID. It's not recommended to use a globally unique ID as tag value.

@ -75,7 +75,7 @@ INSERT INTO d1001 USING meters TAGS ("California.SanFrancisco", 2) VALUES (now,

 In the above SQL statement, a row with value `(now, 10.2, 219, 0.32)` will be inserted into table "d1001". If table "d1001" doesn't exist, it will be created automatically using STable "meters" as template with tag value `"California.SanFrancisco", 2`.

-For more details please refer to [Create Table Automatically](../../taos-sql/insert#automatically-create-table-when-inserting).
+For more details please refer to [Create Table Automatically](../../reference/taos-sql/insert#automatically-create-table-when-inserting).

 ## Single Column vs Multiple Column

--- a/docs/en/08-develop/03-insert-data/01-sql-writing.mdx
+++ b/docs/en/08-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 detail, 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](../../../reference/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 detail, 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](../../../reference/taos-sql/insert).

 ### Insert into Multiple Tables

@ -53,9 +53,9 @@ 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 detail, 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](../../../reference/taos-sql/insert).

-For more details about `INSERT` please refer to [INSERT](../../../taos-sql/insert).
+For more details about `INSERT` please refer to [INSERT](../../../reference/taos-sql/insert).

 :::info

@ -88,7 +88,7 @@ For more details about `INSERT` please refer to [INSERT](../../../taos-sql/inser
  <TabItem label="Rust" value="rust">
    <RustSQL />
  </TabItem>
-  <TabItem label="Node.js" value="nodejs">
+  <TabItem label="Node.js" value="node">
    <NodeSQL />
  </TabItem>
  <TabItem label="C#" value="csharp">
@ -128,7 +128,7 @@ Parameter binding is available only with native connection.
  <TabItem label="Rust" value="rust">
    <RustStmt />
  </TabItem>
-  <TabItem label="Node.js" value="nodejs">
+  <TabItem label="Node.js" value="node">
    <NodeStmt />
  </TabItem>
  <TabItem label="C#" value="csharp">
--- a/docs/en/08-develop/03-insert-data/20-kafka-writting.mdx
+++ b/docs/en/08-develop/03-insert-data/20-kafka-writting.mdx
--- a/docs/en/08-develop/03-insert-data/30-influxdb-line.mdx
+++ b/docs/en/08-develop/03-insert-data/30-influxdb-line.mdx
@ -60,7 +60,7 @@ For more details please refer to [InfluxDB Line Protocol](https://docs.influxdat
  <TabItem label="Go" value="go">
    <GoLine />
  </TabItem>
-  <TabItem label="Node.js" value="nodejs">
+  <TabItem label="Node.js" value="node">
    <NodeLine />
  </TabItem>
  <TabItem label="C#" value="csharp">
--- a/docs/en/08-develop/03-insert-data/40-opentsdb-telnet.mdx
+++ b/docs/en/08-develop/03-insert-data/40-opentsdb-telnet.mdx
@ -52,7 +52,7 @@ meters.current 1648432611250 11.3 location=California.LosAngeles groupid=3
  <TabItem label="Go" value="go">
    <GoTelnet />
  </TabItem>
-  <TabItem label="Node.js" value="nodejs">
+  <TabItem label="Node.js" value="node">
    <NodeTelnet />
  </TabItem>
  <TabItem label="C#" value="csharp">
--- a/docs/en/08-develop/03-insert-data/50-opentsdb-json.mdx
+++ b/docs/en/08-develop/03-insert-data/50-opentsdb-json.mdx
@ -67,7 +67,7 @@ Please refer to [OpenTSDB HTTP API](http://opentsdb.net/docs/build/html/api_http
  <TabItem label="Go" value="go">
    <GoJson />
  </TabItem>
-  <TabItem label="Node.js" value="nodejs">
+  <TabItem label="Node.js" value="node">
    <NodeJson />
  </TabItem>
  <TabItem label="C#" value="csharp">
--- a/docs/en/08-develop/03-insert-data/60-high-volume.md
+++ b/docs/en/08-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](../../../reference/taos-sql/database) and [Server Configuration](../../../reference/config).

 ## Sample Programs

--- a/docs/en/08-develop/03-insert-data/_c_line.mdx
+++ b/docs/en/08-develop/03-insert-data/_c_line.mdx
--- a/docs/en/08-develop/03-insert-data/_c_opts_json.mdx
+++ b/docs/en/08-develop/03-insert-data/_c_opts_json.mdx
--- a/docs/en/08-develop/03-insert-data/_c_opts_telnet.mdx
+++ b/docs/en/08-develop/03-insert-data/_c_opts_telnet.mdx
--- a/docs/en/08-develop/03-insert-data/_c_sql.mdx
+++ b/docs/en/08-develop/03-insert-data/_c_sql.mdx
--- a/docs/en/08-develop/03-insert-data/_c_stmt.mdx
+++ b/docs/en/08-develop/03-insert-data/_c_stmt.mdx
--- a/Show More
+++ b/Show More