Merge branch '3.0' into fix/TD-23549

.gitignore

@@ -131,3 +131,4 @@ tools/BUGS
 tools/taos-tools
 tools/taosws-rs
 tags
+.clangd

README-CN.md

@@ -52,7 +52,7 @@ TDengine 还提供一组辅助工具软件 taosTools，目前它包含 taosBench
 ### Ubuntu 18.04 及以上版本 & Debian：
 
 ```bash
-sudo apt-get install -y gcc cmake build-essential git libssl-dev
+sudo apt-get install -y gcc cmake build-essential git libssl-dev libgflags2.2 libgflags-dev
 ```
 
 #### 为 taos-tools 安装编译需要的软件
@@ -352,4 +352,4 @@ TDengine 提供了丰富的应用程序开发接口，其中包括 C/C++、Java
 
 # 加入技术交流群
 
-TDengine 官方社群「物联网大数据群」对外开放，欢迎您加入讨论。搜索微信号 "tdengine"，加小 T 为好友，即可入群。
+TDengine 官方社群「物联网大数据群」对外开放，欢迎您加入讨论。搜索微信号 "tdengine1"，加小 T 为好友，即可入群。

README.md

@@ -60,7 +60,7 @@ To build TDengine, use [CMake](https://cmake.org/) 3.0.2 or higher versions in t
 ### Ubuntu 18.04 and above or Debian
 
 ```bash
-sudo apt-get install -y gcc cmake build-essential git libssl-dev
+sudo apt-get install -y gcc cmake build-essential git libssl-dev libgflags2.2 libgflags-dev
 ```
 
 #### Install build dependencies for taosTools

cmake/cmake.define

@@ -117,17 +117,14 @@ ELSE ()
 
     IF (${BUILD_SANITIZER})
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
 	      MESSAGE(STATUS "Compile with Address Sanitizer!")
+    ELSEIF (${BUILD_RELEASE})
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     ELSE ()
-        MESSAGE(STATUS "XXXXXXXXXXXXXX Clang/AppleClang" ${TD_DARWIN})
-        IF (${TD_DARWIN})
-            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-y2k")
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-y2k")
-        ELSE ()
-            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-        ENDIF ()
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     ENDIF ()
 
     # disable all assert

cmake/cmake.options

@@ -171,3 +171,8 @@ option(
    ON 
 )
 
+option(
+   BUILD_RELEASE
+   "If build release version"
+   OFF
+)

cmake/cmake.platform

@@ -162,6 +162,14 @@ ELSE ()
   ENDIF ()
 ENDIF ()
 
+IF(APPLE)
+    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+    set(CMAKE_HAVE_THREADS_LIBRARY 1)
+    set(CMAKE_USE_WIN32_THREADS_INIT 0)
+    set(CMAKE_USE_PTHREADS 1)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+ENDIF()
+
 MESSAGE(STATUS "Platform arch:" ${PLATFORM_ARCH_STR})
 
 MESSAGE("C Compiler: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_C_COMPILER_VERSION})")

cmake/rocksdb_CMakeLists.txt.in

 
 # rocksdb
 ExternalProject_Add(rocksdb
-        GIT_REPOSITORY https://github.com/taosdata-contrib/rocksdb.git
-        GIT_TAG v6.23.3
+        GIT_REPOSITORY https://github.com/facebook/rocksdb.git
+        GIT_TAG v8.1.1
         SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb"
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ""
         TEST_COMMAND ""
-        )
+        )
\ No newline at end of file

cmake/taosadapter_CMakeLists.txt.in

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

cmake/taostools_CMakeLists.txt.in

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

contrib/CMakeLists.txt

@@ -223,31 +223,53 @@ endif(${BUILD_WITH_LEVELDB})
 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
 if(${BUILD_WITH_ROCKSDB})
-    #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+    if(${TD_LINUX})
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -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")
+    endif(${TD_LINUX})
+
+    if(${TD_DARWIN})
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+    endif(${TD_DARWIN})
+
+    if (${TD_WINDOWS})
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")  
+    endif(${TD_WINDOWS})
+
+
+    if(${TD_DARWIN})
+        option(HAVE_THREAD_LOCAL "" OFF)
+        option(WITH_IOSTATS_CONTEXT "" OFF)
+        option(WITH_PERF_CONTEXT "" OFF)
+    endif(${TD_DARWIN})
+
+    if(${TD_WINDOWS})
+        option(WITH_JNI "" ON)
+    endif(${TD_WINDOWS})
+
+    if(${TD_WINDOWS})
+        option(WITH_MD_LIBRARY "build with MD" OFF)
+        set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+    endif(${TD_WINDOWS})
+    
+    
+    option(WITH_FALLOCATE "" OFF)
+    option(WITH_JEMALLOC "" OFF)
+    option(WITH_GFLAGS "" OFF)
+    option(PORTABLE "" ON)
+    option(WITH_LIBURING "" OFF)
+    option(FAIL_ON_WARNINGS OFF)
+
     option(WITH_TESTS "" OFF)
     option(WITH_BENCHMARK_TOOLS "" OFF)
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
-    option(WITH_IOSTATS_CONTEXT "" OFF)
-    option(WITH_PERF_CONTEXT "" OFF)
-    option(FAIL_ON_WARNINGS "" OFF)
-    #option(WITH_JEMALLOC "" ON)
+
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
-    IF (${TD_WINDOWS})
-        option(WITH_MD_LIBRARY "build with MD" OFF)
-        set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
-    endif(${TD_WINDOWS})
     add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
     target_include_directories(
         rocksdb
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
     )
-    IF (${TD_DARWIN})
-        target_compile_options(
-    	    rocksdb
-	    PRIVATE -Wno-unused-private-field
-	)
-    endif(${TD_DARWIN})
 endif(${BUILD_WITH_ROCKSDB})
 
 # lucene

contrib/test/rocksdb/main.c

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

docs/en/01-index.md

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

docs/en/02-intro/index.md

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

docs/en/04-concept/index.md

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

docs/en/05-get-started/01-docker.md

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

docs/en/05-get-started/03-package.md

@@ -10,7 +10,7 @@ import PkgListV3 from "/components/PkgListV3";
 
 This document describes how to install TDengine on Linux/Windows/macOS and perform queries and inserts.
 
-- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). 
+- The easiest way to explore TDengine is through [TDengine Cloud](https://cloud.tdengine.com). 
 - To get started with TDengine on Docker, see [Quick Install on Docker](../../get-started/docker).
 - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine).
 
@@ -102,7 +102,7 @@ sudo apt-get install tdengine
 
 :::tip
 This installation method is supported only for Debian and Ubuntu.
-::::
+:::
 </TabItem>
 <TabItem label="Windows" value="windows">
 
@@ -208,6 +208,8 @@ The following `launchctl` commands can help you manage TDengine service:
 
 - Check TDengine Server status: `sudo launchctl list | grep taosd`
 
+- Check TDengine Server status details: `launchctl print system/com.tdengine.taosd`
+
 :::info
 - Please use `sudo` to run `launchctl` to manage _com.tdengine.taosd_ with administrator privileges.
 - The administrator privilege is required for service management to enhance security.

docs/en/07-develop/01-connect/_connect_java.mdx

@@ -12,4 +12,4 @@ When using REST connection, the feature of bulk pulling can be enabled if the si
 {{#include docs/examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
 ```
 
-More configuration about connection，please refer to [Java Connector](/reference/connector/java)
+More configuration about connection, please refer to [Java Connector](/reference/connector/java)

docs/en/07-develop/01-connect/_connect_php.mdx

-```php title="原生连接"
+```php title=""native"
 {{#include docs/examples/php/connect.php}}
 ```

docs/en/07-develop/01-connect/index.md

@@ -33,7 +33,7 @@ There are two ways for a connector to establish connections to TDengine:
 
 For REST and native connections, connectors provide similar APIs for performing operations and running SQL statements on your databases. The main difference is the method of establishing the connection, which is not visible to users.
 
-Key differences：
+Key differences:
 
 3. The REST connection is more accessible with cross-platform support, however it results in a 30% performance downgrade.
 1. The TDengine client driver (taosc) has the highest performance with all the features of TDengine like [Parameter Binding](/reference/connector/cpp#parameter-binding-api), [Subscription](/reference/connector/cpp#subscription-and-consumption-api), etc.
@@ -198,7 +198,7 @@ The sample code below are based on dotnet6.0, they may need to be adjusted if yo
 <TabItem label="R" value="r">
 
 1. Download [taos-jdbcdriver-version-dist.jar](https://repo1.maven.org/maven2/com/taosdata/jdbc/taos-jdbcdriver/3.0.0/).
-2. Install the dependency package `RJDBC`：
+2. Install the dependency package `RJDBC`:
 
 ```R
 install.packages("RJDBC")
@@ -213,7 +213,7 @@ If the client driver (taosc) is already installed, then the C connector is alrea
 </TabItem>
 <TabItem label="PHP" value="php">
 
-**Download Source Code Package and Unzip：**
+**Download Source Code Package and Unzip: **
 
 ```shell
 curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.2.tar.gz \
@@ -223,13 +223,13 @@ curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive
 
 > Version number `v1.0.2` is only for example, it can be replaced to any newer version, please check available version from [TDengine PHP Connector Releases](https://github.com/Yurunsoft/php-tdengine/releases).
 
-**Non-Swoole Environment：**
+**Non-Swoole Environment: **
 
 ```shell
 phpize && ./configure && make -j && make install
 ```
 
-**Specify TDengine Location：**
+**Specify TDengine Location: **
 
 ```shell
 phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 && make -j && make install
@@ -238,7 +238,7 @@ phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 &&
 > `--with-tdengine-dir=` is followed by the TDengine installation location.
 > This way is useful in case TDengine location can't be found automatically or macOS.
 
-**Swoole Environment：**
+**Swoole Environment: **
 
 ```shell
 phpize && ./configure --enable-swoole && make -j && make install
@@ -288,6 +288,6 @@ Prior to establishing connection, please make sure TDengine is already running a
 </Tabs>
 
 :::tip
-If the connection fails, in most cases it's caused by improper configuration for FQDN or firewall. Please refer to the section "Unable to establish connection" in [FAQ](https://docs.tdengine.com/train-faq/faq).
+If the connection fails, in most cases it's caused by improper configuration for FQDN or firewall. Please refer to the section "Unable to establish connection" in [FAQ](../../train-faq/faq).
 
 :::

docs/en/07-develop/03-insert-data/30-influxdb-line.mdx

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

docs/en/07-develop/03-insert-data/40-opentsdb-telnet.mdx

@@ -84,7 +84,7 @@ Query OK, 4 row(s) in set (0.005399s)
 
 ## Query Examples
 
-If you want query the data of `location=California.LosAngeles groupid=3`，here is the query SQL:
+If you want query the data of `location=California.LosAngeles groupid=3`, here is the query SQL:
 
 ```sql
 SELECT * FROM `meters.current` WHERE location = "California.LosAngeles" AND groupid = 3;

docs/en/07-develop/03-insert-data/50-opentsdb-json.mdx

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

docs/en/07-develop/03-insert-data/60-high-volume.md

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

docs/en/07-develop/03-insert-data/_py_kafka.mdx

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

docs/en/07-develop/03-insert-data/_rust_schemaless.mdx

+```rust
+{{#include docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs}}
+```

docs/en/07-develop/04-query-data/index.mdx

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

docs/en/07-develop/07-tmq.mdx

@@ -23,7 +23,7 @@ By subscribing to a topic, a consumer can obtain the latest data in that topic i
 
 To implement these features, TDengine indexes its write-ahead log (WAL) file for fast random access and provides configurable methods for replacing and retaining this file. You can define a retention period and size for this file. For information, see the CREATE DATABASE statement. In this way, the WAL file is transformed into a persistent storage engine that remembers the order in which events occur. However, note that configuring an overly long retention period for your WAL files makes database compression inefficient. TDengine then uses the WAL file instead of the time-series database as its storage engine for queries in the form of topics. TDengine reads the data from the WAL file; uses a unified query engine instance to perform filtering, transformations, and other operations; and finally pushes the data to consumers.
 
-Tips:The default data subscription is to consume data from the wal. If the wal is deleted, the consumed data will be incomplete. At this time, you can set the parameter experimental.snapshot.enable to true to obtain all data from the tsdb, but in this way, the consumption order of the data cannot be guaranteed. Therefore, it is recommended to set a reasonable retention policy for WAL based on your consumption situation to ensure that you can subscribe all data from WAL.
+Tips: Data subscription is to consume data from the wal. If some wal files are deleted according to WAL retention policy, the deleted data can't be consumed any more. So you need to set a reasonable value for parameter `WAL_RETENTION_PERIOD` or `WAL_RETENTION_SIZE` when creating the database and make sure your application consume the data in a timely way to make sure there is no data loss. This behavior is similar to Kafka and other widely used message queue products.
 
 ## Data Schema and API
 
@@ -294,7 +294,6 @@ You configure the following parameters when creating a consumer:
 |      `auto.offset.reset`       |  enum   | Initial offset for the consumer group                                     | Specify `earliest`, `latest`, or `none`(default) |
 |      `enable.auto.commit`      | boolean | Commit automatically; true: user application doesn't need to explicitly commit; false: user application need to handle commit by itself                                           | Default value is true                  |
 |   `auto.commit.interval.ms`    | integer | Interval for automatic commits, in milliseconds                           |
-| `experimental.snapshot.enable` | boolean | Specify whether to consume data in TSDB; true: both data in WAL and in TSDB can be consumed; false: only data in WAL can be consumed                   |     default value: false                                        |
 |     `msg.with.table.name`      | boolean | Specify whether to deserialize table names from messages                                 | default value: false
 
 The method of specifying these parameters depends on the language used:
@@ -312,7 +311,6 @@ tmq_conf_set(conf, "group.id", "cgrpName");
 tmq_conf_set(conf, "td.connect.user", "root");
 tmq_conf_set(conf, "td.connect.pass", "taosdata");
 tmq_conf_set(conf, "auto.offset.reset", "earliest");
-tmq_conf_set(conf, "experimental.snapshot.enable", "true");
 tmq_conf_set(conf, "msg.with.table.name", "true");
 tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
 
@@ -368,7 +366,6 @@ conf := &tmq.ConfigMap{
  "td.connect.port":              "6030",
  "client.id":                    "test_tmq_c",
  "enable.auto.commit":           "false",
- "experimental.snapshot.enable": "true",
  "msg.with.table.name":          "true",
 }
 consumer, err := NewConsumer(conf)
@@ -416,7 +413,6 @@ Python programs use the following parameters:
 | `enable.auto.commit` | string | Commit automatically | pecify `true` or `false` |
 | `auto.commit.interval.ms` | string | Interval for automatic commits, in milliseconds | |
 | `auto.offset.reset` | string | Initial offset for the consumer group | Specify `earliest`, `latest`, or `none`(default) |
-| `experimental.snapshot.enable` | string | Specify whether it's allowed to consume messages from the WAL or from TSDB | Specify `true` or `false` |
 | `enable.heartbeat.background` | string | Backend heartbeat; if enabled, the consumer does not go offline even if it has not polled for a long time | Specify `true` or `false` |
 
 </TabItem>

docs/en/07-develop/09-udf.md

@@ -252,9 +252,9 @@ create table battery(ts timestamp, vol1 float, vol2 float, vol3 float, deviceId
 ```
 Create the UDF:
 ```bash
-create aggregate function max_vol as '/root/udf/libmaxvol.so' outputtype binary(64) bufsize 10240 language 'C'; 
+create aggregate function max_vol as '/root/udf/libmaxvol.so' outputtype binary(64) bufsize 10240 language 'C';
 ```
-Use the UDF in the query：
+Use the UDF in the query:
 ```bash
 select max_vol(vol1,vol2,vol3,deviceid) from battery;
 ```
@@ -271,9 +271,9 @@ select max_vol(vol1,vol2,vol3,deviceid) from battery;
 ## Implement a UDF in Python
 
 Implement the specified interface functions when implementing a UDF in Python.
-- implement `process` function for the scalar UDF。
-- implement `start`, `reduce`, `finish` for the aggregate UDF。
-- implement `init` for initialization and `destroy` for termination。
+- implement `process` function for the scalar UDF.
+- implement `start`, `reduce`, `finish` for the aggregate UDF.
+- implement `init` for initialization and `destroy` for termination.
 
 ### Implement a Scalar UDF in Python
 

docs/en/12-taos-sql/02-database.md

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

docs/en/12-taos-sql/04-stable.md

@@ -33,7 +33,7 @@ column_definition:
 SHOW STABLES [LIKE tb_name_wildcard];
 ```
 
-The preceding SQL statement shows all supertables in the current TDengine database, including the name, creation time, number of columns, number of tags, and number of subtables for each supertable.
+The preceding SQL statement shows all supertables in the current TDengine database.
 
 ### View the CREATE Statement for a Supertable
 

docs/en/12-taos-sql/05-insert.md

@@ -82,7 +82,7 @@ One or multiple rows can be inserted into multiple tables in a single SQL statem
 
 ```sql
 INSERT INTO d1001 VALUES ('2021-07-13 14:06:34.630', 10.2, 219, 0.32) ('2021-07-13 14:06:35.779', 10.15, 217, 0.33)
-            d1002 (ts, current, phase) VALUES ('2021-07-13 14:06:34.255', 10.27, 0.31）;
+            d1002 (ts, current, phase) VALUES ('2021-07-13 14:06:34.255', 10.27, 0.31);
 ```
 
 ## Automatically Create Table When Inserting

docs/en/12-taos-sql/06-select.md

@@ -55,7 +55,7 @@ window_clause: {
   | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 
 interp_clause:
-    RANGE(ts_val, ts_val), EVERY(every_val), FILL(fill_mod_and_val)
+    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
     PARTITION BY expr [, expr] ...
@@ -373,7 +373,7 @@ FROM temp_stable t1, temp_stable t2
 WHERE t1.ts = t2.ts AND t1.deviceid = t2.deviceid AND t1.status=0;
 ```
 
-For sub-table and super table：
+For sub-table and super table:
 
 ```sql
 SELECT *

docs/en/12-taos-sql/07-tag-index.md

@@ -6,14 +6,14 @@ description: Use Tag Index to Improve Query Performance
 
 ## Introduction
 
-Prior to TDengine 3.0.3.0 (excluded)，only one index is created by default on the first tag of each super table, but it's not allowed to dynamically create index on any other tags. From version 3.0.30, you can dynamically create index on any tag of any type. The index created automatically by TDengine is still valid. Query performance can benefit from indexes if you use properly.
+Prior to TDengine 3.0.3.0 (excluded), only one index is created by default on the first tag of each super table, but it's not allowed to dynamically create index on any other tags. From version 3.0.30, you can dynamically create index on any tag of any type. The index created automatically by TDengine is still valid. Query performance can benefit from indexes if you use properly.
 
 ## Syntax
 
 1. The syntax of creating an index 
 
 ```sql
-CREATE INDEX index_name ON tbl_name (tagColName）
+CREATE INDEX index_name ON tbl_name (tagColName)
 ```
 
 In the above statement, `index_name` if the name of the index, `tbl_name` is the name of the super table,`tagColName` is the name of the tag on which the index is being created. `tagColName` can be any type supported by TDengine.

docs/en/12-taos-sql/10-function.md

@@ -434,7 +434,7 @@ TO_ISO8601(expr [, timezone])
 
 **More explanations**:
 
-- You can specify a time zone in the following format: [z/Z, +/-hhmm, +/-hh, +/-hh:mm]。 For example, TO_ISO8601(1, "+00:00").
+- You can specify a time zone in the following format: [z/Z, +/-hhmm, +/-hh, +/-hh:mm]. For example, TO_ISO8601(1, "+00:00").
 - If the input is a UNIX timestamp, the precision of the returned value is determined by the digits of the input timestamp
 - If the input is a column of TIMESTAMP type, the precision of the returned value is same as the precision set for the current data base in use
 
@@ -626,7 +626,7 @@ algo_type: {
 
 **Applicable table types**: standard tables and supertables
 
-**Explanations**：
+**Explanations**:
 - _p_ is in range [0,100], when _p_ is 0, the result is same as using function MIN; when _p_ is 100, the result is same as function MAX.
 - `algo_type` can only be input as `default` or `t-digest` Enter `default` to use a histogram-based algorithm. Enter `t-digest` to use the t-digest algorithm to calculate the approximation of the quantile. `default` is used by default.
 - The approximation result of `t-digest` algorithm is sensitive to input data order. For example, when querying STable with different input data order there might be minor differences in calculated results.
@@ -672,7 +672,7 @@ If you input a specific column, the number of non-null values in the column is r
 ELAPSED(ts_primary_key [, time_unit])
 ```
 
-**Description**：`elapsed` function can be used to calculate the continuous time length in which there is valid data. If it's used with `INTERVAL` clause, the returned result is the calculated time length within each time window. If it's used without `INTERVAL` caluse, the returned result is the calculated time length within the specified time range. Please be noted that the return value of `elapsed` is the number of `time_unit` in the calculated time length.
+**Description**: `elapsed` function can be used to calculate the continuous time length in which there is valid data. If it's used with `INTERVAL` clause, the returned result is the calculated time length within each time window. If it's used without `INTERVAL` caluse, the returned result is the calculated time length within the specified time range. Please be noted that the return value of `elapsed` is the number of `time_unit` in the calculated time length.
 
 **Return value type**: Double if the input value is not NULL;
 
@@ -680,7 +680,7 @@ ELAPSED(ts_primary_key [, time_unit])
 
 **Applicable tables**: table, STable, outer in nested query
 
-**Explanations**：
+**Explanations**:
 - `ts_primary_key` parameter can only be the first column of a table, i.e. timestamp primary key.
 - The minimum value of `time_unit` is the time precision of the database. If `time_unit` is not specified, the time precision of the database is used as the default time unit. Time unit specified by `time_unit` can be:
           1b (nanoseconds), 1u (microseconds), 1a (milliseconds), 1s (seconds), 1m (minutes), 1h (hours), 1d (days), or 1w (weeks)
@@ -758,7 +758,7 @@ SUM(expr)
 HYPERLOGLOG(expr)
 ```
 
-**Description**：
+**Description**:
   The cardinal number of a specific column is returned by using hyperloglog algorithm. The benefit of using hyperloglog algorithm is that the memory usage is under control when the data volume is huge.
   However, when the data volume is very small, the result may be not accurate, it's recommended to use `select count(data) from (select unique(col) as data from table)` in this case.
 
@@ -772,10 +772,10 @@ HYPERLOGLOG(expr)
 ### HISTOGRAM
 
 ```sql
-HISTOGRAM(expr，bin_type, bin_description, normalized)
+HISTOGRAM(expr, bin_type, bin_description, normalized)
 ```
 
-**Description**：Returns count of data points in user-specified ranges.
+**Description**: Returns count of data points in user-specified ranges.
 
 **Return value type** If normalized is set to 1, a DOUBLE is returned; otherwise a BIGINT is returned
 
@@ -783,18 +783,18 @@ HISTOGRAM(expr，bin_type, bin_description, normalized)
 
 **Applicable table types**: table, STable
 
-**Explanations**：
-- bin_type: parameter to indicate the bucket type, valid inputs are: "user_input", "linear_bin", "log_bin"。
-- bin_description: parameter to describe how to generate buckets，can be in the following JSON formats for each bin_type respectively:
+**Explanations**:
+- bin_type: parameter to indicate the bucket type, valid inputs are: "user_input", "linear_bin", "log_bin".
+- bin_description: parameter to describe how to generate buckets can be in the following JSON formats for each bin_type respectively:
     - "user_input": "[1, 3, 5, 7]":
        User specified bin values.
 
     - "linear_bin": "{"start": 0.0, "width": 5.0, "count": 5, "infinity": true}"
-       "start" - bin starting point.       "width" - bin offset.       "count" - number of bins generated.       "infinity" - whether to add（-inf, inf）as start/end point in generated set of bins.
+       "start" - bin starting point.       "width" - bin offset.       "count" - number of bins generated.       "infinity" - whether to add (-inf, inf) as start/end point in generated set of bins.
        The above "linear_bin" descriptor generates a set of bins: [-inf, 0.0, 5.0, 10.0, 15.0, 20.0, +inf].
 
     - "log_bin": "{"start":1.0, "factor": 2.0, "count": 5, "infinity": true}"
-       "start" - bin starting point.       "factor" - exponential factor of bin offset.       "count" - number of bins generated.       "infinity" - whether to add（-inf, inf）as start/end point in generated range of bins.
+       "start" - bin starting point.       "factor" - exponential factor of bin offset.       "count" - number of bins generated.       "infinity" - whether to add (-inf, inf) as start/end point in generated range of bins.
        The above "linear_bin" descriptor generates a set of bins: [-inf, 1.0, 2.0, 4.0, 8.0, 16.0, +inf].
 - normalized: setting to 1/0 to turn on/off result normalization. Valid values are 0 or 1.
 
@@ -886,7 +886,7 @@ INTERP(expr)
 - The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1 <= timestamp2. timestamp1 is the starting point of the output time range and must be specified. timestamp2 is the ending point of the output time range and must be specified.
 - The number of rows in the result set of `INTERP` is determined by the parameter `EVERY(time_unit)`. Starting from timestamp1, one interpolation is performed for every time interval specified `time_unit` parameter. The parameter `time_unit` must be an integer, with no quotes, with a time unit of: a(millisecond)), s(second), m(minute), h(hour), d(day), or w(week). For example, `EVERY(500a)` will interpolate every 500 milliseconds.
 - Interpolation is performed based on `FILL` parameter. For more information about FILL clause, see [FILL Clause](../distinguished/#fill-clause).
-- `INTERP` can only be used to interpolate in single timeline. So it must be used with `partition by tbname` when it's used on a STable.
+- `INTERP` can be applied to supertable by interpolating primary key sorted data of all its childtables. It can also be used with `partition by tbname` when applied to supertable to generate interpolation on each single timeline.
 - Pseudocolumn `_irowts` can be used along with `INTERP` to return the timestamps associated with interpolation points(support after version 3.0.2.0).
 - Pseudocolumn `_isfilled` can be used along with `INTERP` to indicate whether the results are original records or data points generated by interpolation algorithm(support after version 3.0.3.0).
 
@@ -1107,7 +1107,7 @@ ignore_negative: {
 **More explanation**:
 
 - It can be used together with `PARTITION BY tbname` against a STable.
-- It can be used together with a selected column. For example: select \_rowts, DERIVATIVE() from。
+- It can be used together with a selected column. For example: select \_rowts, DERIVATIVE() from.
 
 ### DIFF
 
@@ -1131,7 +1131,7 @@ ignore_negative: {
 **More explanation**:
 
 - The number of result rows is the number of rows subtracted by one, no output for the first row
-- It can be used together with a selected column. For example: select \_rowts, DIFF() from。
+- It can be used together with a selected column. For example: select \_rowts, DIFF() from.
 
 
 ### IRATE
@@ -1183,7 +1183,7 @@ STATECOUNT(expr, oper, val)
 **Applicable parameter values**:
 
 - oper : Can be one of `'LT'` (lower than), `'GT'` (greater than), `'LE'` (lower than or equal to), `'GE'` (greater than or equal to), `'NE'` (not equal to), `'EQ'` (equal to), the value is case insensitive, the value must be in quotes.
-- val ： Numeric types
+- val: Numeric types
 
 **Return value type**: Integer
 
@@ -1210,7 +1210,7 @@ STATEDURATION(expr, oper, val, unit)
 **Applicable parameter values**:
 
 - oper : Can be one of `'LT'` (lower than), `'GT'` (greater than), `'LE'` (lower than or equal to), `'GE'` (greater than or equal to), `'NE'` (not equal to), `'EQ'` (equal to), the value is case insensitive, the value must be in quotes.
-- val ： Numeric types
+- val: Numeric types
 - unit: The unit of time interval. Enter one of the following options: 1b (nanoseconds), 1u (microseconds), 1a (milliseconds), 1s (seconds), 1m (minutes), 1h (hours), 1d (days), or 1w (weeks) If you do not enter a unit of time, the precision of the current database is used by default.
 
 **Return value type**: Integer

docs/en/12-taos-sql/12-distinguished.md

@@ -69,19 +69,20 @@ These pseudocolumns occur after the aggregation clause.
 `FILL` clause is used to specify how to fill when there is data missing in any window, including:
 
 1. NONE: No fill (the default fill mode)
-2. VALUE：Fill with a fixed value, which should be specified together, for example `FILL(VALUE, 1.23)` Note: The value filled depends on the data type. For example, if you run FILL(VALUE 1.23) on an integer column, the value 1 is filled.
-3. PREV：Fill with the previous non-NULL value, `FILL(PREV)`
-4. NULL：Fill with NULL, `FILL(NULL)`
-5. LINEAR：Fill with the closest non-NULL value, `FILL(LINEAR)`
-6. NEXT：Fill with the next non-NULL value, `FILL(NEXT)`
+2. VALUE: Fill with a fixed value, which should be specified together, for example `FILL(VALUE, 1.23)` Note: The value filled depends on the data type. For example, if you run FILL(VALUE 1.23) on an integer column, the value 1 is filled.
+3. PREV: Fill with the previous non-NULL value, `FILL(PREV)`
+4. NULL: Fill with NULL, `FILL(NULL)`
+5. LINEAR: Fill with the closest non-NULL value, `FILL(LINEAR)`
+6. NEXT: Fill with the next non-NULL value, `FILL(NEXT)`
 
 In the above filling modes, except for `NONE` mode, the `fill` clause will be ignored if there is no data in the defined time range, i.e. no data would be filled and the query result would be empty. This behavior is reasonable when the filling mode is `PREV`, `NEXT`, `LINEAR`, because filling can't be performed if there is not any data. For filling modes `NULL` and `VALUE`, however, filling can be performed even though there is not any data, filling or not depends on the choice of user's application.  To accomplish the need of this force filling behavior and not break the behavior of existing filling modes, TDengine added two new filling modes since version 3.0.3.0. 
 
 1. NULL_F: Fill `NULL` by force
 2. VALUE_F: Fill `VALUE` by force
 
-The detailed beaviors of `NULL`, `NULL_F`, `VALUE`, and VALUE_F are described below：
-- When used with `INTERVAL`: `NULL_F` and `VALUE_F` are filling by force；`NULL` and `VALUE`  don't fill by force. The behavior of each filling mode is exactly same as what the name suggests.
+The detailed beaviors of `NULL`, `NULL_F`, `VALUE`, and VALUE_F are described below:
+
+- When used with `INTERVAL`: `NULL_F` and `VALUE_F` are filling by force; `NULL` and `VALUE`  don't fill by force. The behavior of each filling mode is exactly same as what the name suggests.
 - When used with `INTERVAL` in stream processing: `NULL_F` and `NULL` are same, i.e. don't fill by force; `VALUE_F` and `VALUE` and same, i.e. don't fill by force. It's suggested that there is no filling by force in stream processing.
 - When used with `INTERP`: `NULL` and `NULL_F` and same, i.e. filling by force; `VALUE` and `VALUE_F` are same, i.e. filling by force. It's suggested that there is always filling by force when used with `INTERP`.
 
@@ -97,7 +98,7 @@ The detailed beaviors of `NULL`, `NULL_F`, `VALUE`, and VALUE_F are described be
 
 There are two kinds of time windows: sliding window and flip time/tumbling window.
 
-The `INTERVAL` clause is used to generate time windows of the same time interval. The `SLIDING` parameter is used to specify the time step for which the time window moves forward. The query is performed on one time window each time, and the time window moves forward with time. When defining a continuous query, both the size of the time window and the step of forward sliding time need to be specified. As shown in the figure blow, [t0s, t0e] ，[t1s , t1e]， [t2s, t2e] are respectively the time ranges of three time windows on which continuous queries are executed. The time step for which time window moves forward is marked by `sliding time`. Query, filter and aggregate operations are executed on each time window respectively. When the time step specified by `SLIDING` is same as the time interval specified by `INTERVAL`, the sliding time window is actually a flip time/tumbling window.
+The `INTERVAL` clause is used to generate time windows of the same time interval. The `SLIDING` parameter is used to specify the time step for which the time window moves forward. The query is performed on one time window each time, and the time window moves forward with time. When defining a continuous query, both the size of the time window and the step of forward sliding time need to be specified. As shown in the figure blow, [t0s, t0e], [t1s, t1e], [t2s, t2e] are respectively the time ranges of three time windows on which continuous queries are executed. The time step for which time window moves forward is marked by `sliding time`. Query, filter and aggregate operations are executed on each time window respectively. When the time step specified by `SLIDING` is same as the time interval specified by `INTERVAL`, the sliding time window is actually a flip time/tumbling window.
 
 ![TDengine Database Time Window](./timewindow-1.webp)
 
@@ -121,7 +122,7 @@ Please note that the `timezone` parameter should be configured to be the same va
 
 ### State Window
 
-In case of using integer, bool, or string to represent the status of a device at any given moment, continuous rows with the same status belong to a status window. Once the status changes, the status window closes. As shown in the following figure, there are two state windows according to status, [2019-04-28 14:22:07，2019-04-28 14:22:10] and [2019-04-28 14:22:11，2019-04-28 14:22:12]. 
+In case of using integer, bool, or string to represent the status of a device at any given moment, continuous rows with the same status belong to a status window. Once the status changes, the status window closes. As shown in the following figure, there are two state windows according to status, [2019-04-28 14:22:07, 2019-04-28 14:22:10] and [2019-04-28 14:22:11, 2019-04-28 14:22:12].
 
 ![TDengine Database Status Window](./timewindow-3.webp)
 
@@ -145,7 +146,7 @@ SELECT tbname, _wstart, CASE WHEN voltage >= 205 and voltage <= 235 THEN 1 ELSE
 
 ### Session Window
 
-The primary key, i.e. timestamp, is used to determine which session window a row belongs to. As shown in the figure below, if the limit of time interval for the session window is specified as 12 seconds, then the 6 rows in the figure constitutes 2 time windows, [2019-04-28 14:22:10，2019-04-28 14:22:30] and [2019-04-28 14:23:10，2019-04-28 14:23:30] because the time difference between 2019-04-28 14:22:30 and 2019-04-28 14:23:10 is 40 seconds, which exceeds the time interval limit of 12 seconds.
+The primary key, i.e. timestamp, is used to determine which session window a row belongs to. As shown in the figure below, if the limit of time interval for the session window is specified as 12 seconds, then the 6 rows in the figure constitutes 2 time windows, [2019-04-28 14:22:10, 2019-04-28 14:22:30] and [2019-04-28 14:23:10, 2019-04-28 14:23:30] because the time difference between 2019-04-28 14:22:30 and 2019-04-28 14:23:10 is 40 seconds, which exceeds the time interval limit of 12 seconds.
 
 ![TDengine Database Session Window](./timewindow-2.webp)
 
@@ -178,7 +179,7 @@ select _wstart, _wend, count(*) from t event_window start with c1 > 0 end with c
 
 ### Examples
 
-A table of intelligent meters can be created by the SQL statement below：
+A table of intelligent meters can be created by the SQL statement below:
 
 ```
 CREATE TABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT);

docs/en/12-taos-sql/14-stream.md

@@ -112,7 +112,7 @@ SHOW STREAMS;
 
 When you create a stream, you can use the TRIGGER parameter to specify triggering conditions for it.
 
-For non-windowed processing, triggering occurs in real time. For windowed processing, there are three methods of triggering，the default value is AT_ONCE:
+For non-windowed processing, triggering occurs in real time. For windowed processing, there are three methods of triggering, the default value is AT_ONCE:
 
 1. AT_ONCE: triggers on write
 

docs/en/12-taos-sql/17-json.md

@@ -67,7 +67,7 @@ description: This document describes the JSON data type in TDengine.
 
 - The maximum length of keys in JSON is 256 bytes, and key must be printable ASCII characters. The maximum total length of a JSON is 4,096 bytes.
 
-- JSON format：
+- JSON format:
 
    - The input string for JSON can be empty, i.e. "", "\t", or NULL, but it can't be non-NULL string, bool or array.
    - object can be {}, and the entire JSON is empty if so. Key can be "", and it's ignored if so.

docs/en/12-taos-sql/18-escape.md

@@ -20,7 +20,7 @@ description: This document describes the usage of escape characters in TDengine.
 
 1. If there are escape characters in identifiers (database name, table name, column name)
    - Identifier without ``: Error will be returned because identifier must be constituted of digits, ASCII characters or underscore and can't be started with digits
-   - Identifier quoted with ``： Original content is kept, no escaping
+   - Identifier quoted with ``: Original content is kept, no escaping
 2. If there are escape characters in values
    - The escape characters will be escaped as the above table. If the escape character doesn't match any supported one, the escape character "\" will be ignored.
    - "%" and "\_" are used as wildcards in `like`. `\%` and `\_` should be used to represent literal "%" and "\_" in `like`,. If `\%` and `\_` are used out of `like` context, the evaluation result is "`\%`"and "`\_`", instead of "%" and "\_".

docs/en/12-taos-sql/22-meta.md

@@ -184,7 +184,7 @@ Provides information about standard tables and subtables.
 
 ## INS_COLUMNS
 
-| #   |  **列名**   | **数据类型**  | **说明**               |
+| #   |  **Column**   | **Data Type**  | **Description**               |
 | --- | :---------: | ------------- | ---------------------- |
 | 1   | table_name  | BINARY(192)   | Table name                   |
 | 2   |   db_name   | BINARY(64)    | Database name |

docs/en/12-taos-sql/24-show.md

@@ -4,7 +4,7 @@ sidebar_label: SHOW Statement
 description: This document describes how to use the SHOW statement in TDengine.
 ---
 
-`SHOW` command can be used to get brief system information. To get details about metadata, information, and status in the system, please use `select` to query the tables in database `INFORMATION_SCHEMA`. 
+`SHOW` command can be used to get brief system information. To get details about metadata, information, and status in the system, please use `select` to query the tables in database `INFORMATION_SCHEMA`.
 
 ## SHOW APPS
 
@@ -129,6 +129,14 @@ SHOW QNODES;
 
 Shows information about qnodes in the system.
 
+## SHOW QUERIES
+
+```sql
+SHOW QUERIES;
+```
+
+Shows the queries in progress in the system.
+
 ## SHOW SCORES
 
 ```sql
@@ -179,45 +187,45 @@ SHOW TABLE DISTRIBUTED table_name;
 
 Shows how table data is distributed.
 
-Examples： Below is an example of this command to display the block distribution of table `d0` in detailed format.
+Examples: Below is an example of this command to display the block distribution of table `d0` in detailed format.
 
 ```sql
-show table distributed d0\G;   
+show table distributed d0\G;
 ```
 
 <details>
  <summary> Show Example </summary>
  <pre><code>
 *************************** 1.row ***************************
-_block_dist: Total_Blocks=[5] Total_Size=[93.65 Kb] Average_size=[18.73 Kb] Compression_Ratio=[23.98 %]
+_block_dist: Total_Blocks=[5] Total_Size=[93.65 KB] Average_size=[18.73 KB] Compression_Ratio=[23.98 %]
 
 Total_Blocks :  Table `d0` contains total 5 blocks
 
-Total_Size:  The total size of all the data blocks in table `d0` is 93.65 KB 
+Total_Size:  The total size of all the data blocks in table `d0` is 93.65 KB
 
 Average_size:  The average size of each block is 18.73 KB
 
 Compression_Ratio: The data compression rate is 23.98%
- 
+
 *************************** 2.row ***************************
 _block_dist: Total_Rows=[20000] Inmem_Rows=[0] MinRows=[3616] MaxRows=[4096] Average_Rows=[4000]
 
 Total_Rows: Table `d0` contains 20,000 rows
 
-Inmem_Rows： The rows still in memory, i.e. not committed in disk, is 0, i.e. none such rows
+Inmem_Rows: The rows still in memory, i.e. not committed in disk, is 0, i.e. none such rows
 
-MinRows：  The minimum number of rows in a block is 3,616 
+MinRows: The minimum number of rows in a block is 3,616
 
-MaxRows： The maximum number of rows in a block is 4,096B
+MaxRows: The maximum number of rows in a block is 4,096B
 
-Average_Rows： The average number of rows in a block is 4,000
+Average_Rows: The average number of rows in a block is 4,000
 
 *************************** 3.row ***************************
 _block_dist: Total_Tables=[1] Total_Files=[2]
 
-Total_Tables:  The number of child tables, 1 in this example
+Total_Tables: The number of child tables, 1 in this example
 
-Total_Files：   The number of files storing the table's data, 2 in this example
+Total_Files: The number of files storing the table's data, 2 in this example
 
 *************************** 4.row ***************************
 
@@ -353,7 +361,7 @@ SHOW VARIABLES;
 SHOW DNODE dnode_id VARIABLES;
 ```
 
-Shows the working configuration of the parameters that must be the same on each node. You can also specify a dnode to show the working configuration for that node. 
+Shows the working configuration of the parameters that must be the same on each node. You can also specify a dnode to show the working configuration for that node.
 
 ## SHOW VGROUPS
 
@@ -361,7 +369,7 @@ Shows the working configuration of the parameters that must be the same on each
 SHOW [db_name.]VGROUPS;
 ```
 
-Shows information about all vgroups in the current database. 
+Shows information about all vgroups in the current database.
 
 ## SHOW VNODES
 

docs/en/12-taos-sql/index.md

@@ -13,7 +13,7 @@ Syntax Specifications used in this chapter:
 - Information that you input is given in lowercase.
 - \[ \] means optional input, excluding [] itself.
 - | means one of a few options, excluding | itself.
-- … means the item prior to it can be repeated multiple times.
+- ... means the item prior to it can be repeated multiple times.
 
 To better demonstrate the syntax, usage and rules of TDengine SQL, hereinafter it's assumed that there is a data set of data from electric meters. Each meter collects 3 data measurements: current, voltage, phase. The data model is shown below:
 

docs/en/13-operation/10-monitor.md

@@ -22,11 +22,11 @@ wget https://github.com/taosdata/grafanaplugin/raw/master/dashboards/TDinsight.s
 chmod +x TDinsight.sh
 ```
 
-Prepare：
+Prepare:
 
 1. TDengine Server
 
-   - The URL of REST service：for example `http://localhost:6041` if TDengine is deployed locally
+   - The URL of REST service: for example `http://localhost:6041` if TDengine is deployed locally
    - User name and password
 
 2. Grafana Alert Notification

docs/en/13-operation/17-diagnose.md

@@ -9,13 +9,13 @@ When a TDengine client is unable to access a TDengine server, the network connec
 
 Diagnostics for network connections can be executed between Linux/Windows/macOS.
 
-Diagnostic steps：
+Diagnostic steps:
 
 1. If the port range to be diagnosed is being occupied by a `taosd` server process, please first stop `taosd.
 2. On the server side, execute command `taos -n server -P <port> -l <pktlen>` to monitor the port range starting from the port specified by `-P` parameter with the role of "server".
 3. On the client side, execute command `taos -n client -h <fqdn of server> -P <port> -l <pktlen>` to send a testing package to the specified server and port.
 
--l <pktlen\>： The size of the testing package, in bytes. The value range is [11, 64,000] and default value is 1,000.
+-l <pktlen\>: The size of the testing package, in bytes. The value range is [11, 64,000] and default value is 1,000.
 Please note that the package length must be same in the above 2 commands executed on server side and client side respectively.
 
 Output of the server side for the example is below:

docs/en/14-reference/02-rest-api/02-rest-api.mdx

@@ -83,13 +83,13 @@ For example, `http://h1.taos.com:6041/rest/sql/test` is a URL to `h1.taos.com:60
 
 TDengine supports both Basic authentication and custom authentication mechanisms, and subsequent versions will provide a standard secure digital signature mechanism for authentication.
 
-- authentication information is shown below：
+- authentication information is shown below:
 
   ```text
   Authorization: Taosd <TOKEN>
   ```
 
-- Basic authentication information is shown below：
+- Basic authentication information is shown below:
 
   ```text
   Authorization: Basic <TOKEN>

docs/en/14-reference/03-connector/03-cpp.mdx

@@ -12,9 +12,9 @@ C/C++ developers can use TDengine's client driver and the C/C++ connector, to de
 
 After TDengine server or client installation, `taos.h` is located at
 
-- Linux：`/usr/local/taos/include`
-- Windows：`C:\TDengine\include`
-- macOS：`/usr/local/include`
+- Linux: usr/local/taos/include`
+- Windows: C:\TDengine\include`
+- macOS: usr/local/include`
 
 The dynamic libraries for the TDengine client driver are located in.
 
@@ -412,7 +412,8 @@ In addition to writing data using the SQL method or the parameter binding API, w
   Note that the timestamp resolution parameter only takes effect when the protocol type is `SML_LINE_PROTOCOL`.
   For OpenTSDB's text protocol, timestamp resolution follows its official resolution rules - time precision is confirmed by the number of characters contained in the timestamp.
 
-  schemaless 其他相关的接口
+  schemaless interfaces:
+
 - `TAOS_RES *taos_schemaless_insert_with_reqid(TAOS *taos, char *lines[], int numLines, int protocol, int precision, int64_t reqid)`
 - `TAOS_RES *taos_schemaless_insert_raw(TAOS *taos, char *lines, int len, int32_t *totalRows, int protocol, int precision)`
 - `TAOS_RES *taos_schemaless_insert_raw_with_reqid(TAOS *taos, char *lines, int len, int32_t *totalRows, int protocol, int precision, int64_t reqid)`

docs/en/14-reference/03-connector/06-rust.mdx

@@ -11,6 +11,7 @@ import TabItem from '@theme/TabItem';
 import Preparition from "./_preparation.mdx"
 import RustInsert from "../../07-develop/03-insert-data/_rust_sql.mdx"
 import RustBind from "../../07-develop/03-insert-data/_rust_stmt.mdx"
+import RustSml from "../../07-develop/03-insert-data/_rust_schemaless.mdx"
 import RustQuery from "../../07-develop/04-query-data/_rust.mdx"
 
 [![Crates.io](https://img.shields.io/crates/v/taos)](https://crates.io/crates/taos) ![Crates.io](https://img.shields.io/crates/d/taos) [![docs.rs](https://img.shields.io/docsrs/taos)](https://docs.rs/taos)
@@ -120,7 +121,7 @@ The parameters are described as follows:
 - **username/password**: Username and password used to create connections.
 - **host/port**: Specifies the server and port to establish a connection. If you do not specify a hostname or port, native connections default to `localhost:6030` and Websocket connections default to `localhost:6041`.
 - **database**: Specify the default database to connect to. It's optional.
-- **params**：Optional parameters.
+- **params**: Optional parameters.
 
 A sample DSN description string is as follows:
 
@@ -232,6 +233,10 @@ There are two ways to query data: Using built-in types or the [serde](https://se
 
 <RustBind />
 
+#### Schemaless Write
+
+<RustSml />
+
 ### Query data
 
 <RustQuery />

docs/en/14-reference/03-connector/07-python.mdx

@@ -255,7 +255,7 @@ The `connect()` function returns a `taos.TaosConnection` instance. In client-sid
 
 All arguments to the `connect()` function are optional keyword arguments. The following are the connection parameters specified.
 
-- `url`： The URL of taosAdapter REST service. The default is <http://localhost:6041>.
+- `url`: The URL of taosAdapter REST service. The default is <http://localhost:6041>.
 - `user`: TDengine user name. The default is `root`.
 - `password`: TDengine user password. The default is `taosdata`.
 - `timeout`: HTTP request timeout. Enter a value in seconds. The default is `socket._GLOBAL_DEFAULT_TIMEOUT`. Usually, no configuration is needed.

docs/en/14-reference/03-connector/08-node.mdx

@@ -321,18 +321,18 @@ let cursor = conn.cursor();
 | package name     | version | TDengine version    | Description                                                             |
 |------------------|---------|---------------------|------------------------------------------------------------------|
 | @tdengine/client | 3.0.0   | 3.0.0               | Supports TDengine 3.0. Not compatible with TDengine 2.x.                                                          |
-| td2.0-connector  | 2.0.12  | 2.4.x；2.5.x；2.6.x | Fixed cursor.close() bug.                                 |
-| td2.0-connector  | 2.0.11  | 2.4.x；2.5.x；2.6.x | Supports parameter binding, JSON tags and schemaless interface                  |
-| td2.0-connector  | 2.0.10  | 2.4.x；2.5.x；2.6.x | Supports connection management, standard queries, connection queries, system information, and data subscription |
+| td2.0-connector  | 2.0.12  | 2.4.x; 2.5.x; 2.6.x | Fixed cursor.close() bug.                                 |
+| td2.0-connector  | 2.0.11  | 2.4.x; 2.5.x; 2.6.x | Supports parameter binding, JSON tags and schemaless interface                  |
+| td2.0-connector  | 2.0.10  | 2.4.x; 2.5.x; 2.6.x | Supports connection management, standard queries, connection queries, system information, and data subscription |
 ### REST Connector
 
 | package name         | version | TDengine version    | Description                                                                      |
 |----------------------|---------|---------------------|---------------------------------------------------------------------------|
 | @tdengine/rest | 3.0.0   | 3.0.0               | Supports TDengine 3.0. Not compatible with TDengine 2.x.                                               |
-| td2.0-rest-connector | 1.0.7   | 2.4.x；2.5.x；2.6.x | Removed default port 6041。                                                       |
-| td2.0-rest-connector | 1.0.6   | 2.4.x；2.5.x；2.6.x | Fixed affectRows bug with create, insert, update, and alter. |
-| td2.0-rest-connector | 1.0.5   | 2.4.x；2.5.x；2.6.x | Support cloud token                                                  |
-| td2.0-rest-connector  | 1.0.3  | 2.4.x；2.5.x；2.6.x | Supports connection management, standard queries, system information, error information, and continuous queries          |
+| td2.0-rest-connector | 1.0.7   | 2.4.x; 2.5.x; 2.6.x | Removed default port 6041                                                       |
+| td2.0-rest-connector | 1.0.6   | 2.4.x; 2.5.x; 2.6.x | Fixed affectRows bug with create, insert, update, and alter. |
+| td2.0-rest-connector | 1.0.5   | 2.4.x; 2.5.x; 2.6.x | Support cloud token                                                  |
+| td2.0-rest-connector  | 1.0.3  | 2.4.x; 2.5.x; 2.6.x | Supports connection management, standard queries, system information, error information, and continuous queries          |
 
 ## API Reference
 

docs/en/14-reference/03-connector/09-csharp.mdx

@@ -165,7 +165,7 @@ The parameters are described as follows:
 * **username/password**: Username and password used to create connections.
 * **host/port**: Specifies the server and port to establish a connection. Websocket connections default to `localhost:6041`.
 * **database**: Specify the default database to connect to. It's optional.
-* **params**：Optional parameters.
+* **params**: Optional parameters.
 
 A sample DSN description string is as follows:
 
@@ -279,7 +279,7 @@ ws://localhost:6041/test
 | TDengine.Connector | Description |
 |--------------------|--------------------------------|
 |        3.0.2       | Support .NET Framework 4.5 and above. Support .Net standard 2.0. Nuget package includes dynamic library for WebSocket.|
-|        3.0.1       | Support WebSocket and Cloud，With function query, insert, and parameter binding|
+|        3.0.1       | Support WebSocket and Cloud, With function query, insert, and parameter binding|
 |        3.0.0       | Supports TDengine 3.0.0.0. TDengine 2.x is not supported. Added `TDengine.Impl.GetData()` interface to deserialize query results. |
 |        1.0.7       | Fixed TDengine.Query() memory leak. |
 | 1.0.6 | Fix schemaless bug in 1.0.4 and 1.0.5. |

docs/en/14-reference/03-connector/10-php.mdx

@@ -8,23 +8,23 @@ description: This document describes the TDengine PHP connector.
 
 PHP Connector relies on TDengine client driver.
 
-Project Repository：<https://github.com/Yurunsoft/php-tdengine>
+Project Repository: <https://github.com/Yurunsoft/php-tdengine>
 
 After TDengine client or server is installed, `taos.h` is located at:
 
-- Linux：`/usr/local/taos/include`
-- Windows：`C:\TDengine\include`
-- macOS：`/usr/local/include`
+- Linux: `/usr/local/taos/include`
+- Windows: `C:\TDengine\include`
+- macOS: `/usr/local/include`
 
 TDengine client driver is located at:
 
 - Linux: `/usr/local/taos/driver/libtaos.so`
 - Windows: `C:\TDengine\taos.dll`
-- macOS：`/usr/local/lib/libtaos.dylib`
+- macOS: `/usr/local/lib/libtaos.dylib`
 
 ## Supported Platforms
 
-- Windows、Linux、MacOS
+- Windows, Linux, and macOS
 
 - PHP >= 7.4
 
@@ -44,7 +44,7 @@ Regarding how to install TDengine client driver please refer to [Install Client
 
 ### Install php-tdengine
 
-**Download Source Code Package and Unzip：**
+**Download Source Code Package and Unzip: **
 
 ```shell
 curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.2.tar.gz \
@@ -54,13 +54,13 @@ curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive
 
 > Version number `v1.0.2` is only for example, it can be replaced to any newer version, please find available versions in [TDengine PHP Connector Releases](https://github.com/Yurunsoft/php-tdengine/releases).
 
-**Non-Swoole Environment：**
+**Non-Swoole Environment: **
 
 ```shell
 phpize && ./configure && make -j && make install
 ```
 
-**Specify TDengine location：**
+**Specify TDengine location: **
 
 ```shell
 phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 && make -j && make install
@@ -69,7 +69,7 @@ phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/3.0.0.0 &&
 > `--with-tdengine-dir=` is followed by TDengine location.
 > It's useful in case TDengine installatio location can't be found automatically or MacOS.
 
-**Swoole Environment：**
+**Swoole Environment: **
 
 ```shell
 phpize && ./configure --enable-swoole && make -j && make install

docs/en/14-reference/05-taosbenchmark.md

@@ -245,7 +245,7 @@ The parameters listed in this section apply to all function modes.
 - ** trying_interval ** : Specify interval between keep trying insert. Valid value is a positive number. Only valid when keep trying be enabled. Available with v3.0.9+.
 
 - ** childtable_from and childtable_to ** : specify the child table range to create. The range is [childtable_from, childtable_to).
- 
+
 - ** continue_if_fail ** :  allow the user to specify the reaction if the insertion failed.
 
   - "continue_if_fail" : "no"  // means taosBenchmark will exit if it fails to insert as default reaction behavior.

docs/en/14-reference/07-tdinsight/index.md

@@ -12,8 +12,8 @@ After TDengine starts, it automatically writes many metrics in specific interval
 
 To deploy TDinsight, we need
 - a single-node TDengine server or a multi-node TDengine cluster and a [Grafana] server are required. This dashboard requires TDengine 3.0.1.0 and above, with the monitoring feature enabled. For detailed configuration, please refer to [TDengine monitoring configuration](../config/#monitoring-parameters).
-- taosAdapter has been instaleld and running, please refer to [taosAdapter](../taosadapter).
-- taosKeeper has been installed and running, please refer to  [taosKeeper](../taoskeeper).
+- taosAdapter has been installed and running, please refer to [taosAdapter](../taosadapter).
+- taosKeeper has been installed and running, please refer to [taosKeeper](../taosKeeper).
 
 Please record
 - The endpoint of taosAdapter REST service, for example `http://tdengine.local:6041`
@@ -233,7 +233,7 @@ After the importing is done, `TDinsight for 3.x` dashboard is available on the p
 
 In the `TDinsight for 3.x` dashboard, choose the database used by taosKeeper to store monitoring data, you can see the monitoring result.
 
-![TDengine Database TDinsight 选择数据库](./assets/select_dashboard_db.webp)
+![TDengine Database TDinsight select database](./assets/select_dashboard_db.webp)
 
 ## TDinsight dashboard details
 

docs/en/14-reference/12-config/index.md

@@ -151,7 +151,7 @@ Please note the `taoskeeper` needs to be installed and running to create the `lo
 | -------- | -------------------------------------------- |
 | Applicable | Server Only                                 |
 | Meaning     |Switch for allowing TDengine to collect and report crash related information |
-| Value Range | 0,1   0: Not allowed；1：allowed                                 |
+| Value Range | 0,1   0: Not allowed; 1: allowed                                 |
 | Default Value   | 1                                           |
 
 
@@ -183,7 +183,7 @@ Please note the `taoskeeper` needs to be installed and running to create the `lo
 | -------- | -------------------------------- |
 | Applicable | Server only                     |
 | Meaning   | count()/hyperloglog() return value or not if the input data is empty or NULL |
-| Vlue Range | 0：Return empty line，1：Return 0       |
+| Vlue Range | 0: Return empty line, 1: Return 0       |
 | Default   | 1                            |
 | Notes | When this parameter is setting to 1, for queries containing GROUP BY, PARTITION BY and INTERVAL clause, and input data in certain groups or windows is empty or NULL, the corresponding groups or windows have no return values |
 
@@ -661,7 +661,7 @@ The charset that takes effect is UTF-8.
 
 ## 3.0 Parameters
 
-| #   |        **参数**         | **Applicable to 2.x ** | **Applicable to  3.0 ** | Current behavior in 3.0             |
+| #   |        **Parameter**         | **Applicable to 2.x ** | **Applicable to  3.0 ** | Current behavior in 3.0             |
 | --- | :---------------------: | --------------- | --------------- | ------------------------------------------------- |
 | 1   |         firstEp         | Yes              | Yes              |                                                   |
 | 2   |        secondEp         | Yes              | Yes              |                                                   |

docs/en/20-third-party/01-grafana.mdx

@@ -200,11 +200,16 @@ As shown above, select the `TDengine` data source in the `Query` and enter the c
 - Group by column name(s): `group by` or `partition by` columns name split by comma. By setting `Group by column name(s)`, it can show multi-dimension data if Sql is `group by` or `partition by`. Such as, it can show data by `dnode_ep` if sql is  `select _wstart as ts, avg(mem_system), dnode_ep from log.dnodes_info where ts>=$from and ts<=$to partition by dnode_ep interval($interval)` and `Group by column name(s)` is `dnode_ep`.
 - Format to: format legend for `group by` or `partition by`. Such as it can display series data by `dnode_ep` if sql is `select _wstart as ts, avg(mem_system), dnode_ep from log.dnodes_info where ts>=$from and ts<=$to partition by dnode_ep interval($interval)` and `Group by column name(s)` is `dnode_ep` and `Format to` is `mem_system_{{dnode_ep}}`.
 
+:::note
+
+Since the REST connection because is stateless. Grafana plugin can use <db_name>.<table_name> in the SQL command to specify the database name.
+
+:::
+
 Follow the default prompt to query the average system memory usage for the specified interval on the server where the current TDengine deployment is located as follows.
 
 ![TDengine Database TDinsight plugin create dashboard 2](./grafana/create_dashboard2.webp)
 
-查询每台 TDengine 服务器指定间隔系统内存平均使用量如下.
 The example to query the average system memory usage for the specified interval on each server as follows.
 
 ![TDengine Database TDinsight plugin create dashboard 2](./grafana/create_dashboard3.webp)
@@ -217,7 +222,7 @@ You can install TDinsight dashboard in data source configuration page (like `htt
 
 ![TDengine Database Grafana plugine import dashboard](./import_dashboard.webp)
 
-A dashboard for TDengine 2.x has been published on Grafana: [Dashboard 15167 - TDinsight](https://grafana.com/grafana/dashboards/15167)) 。 Check the [TDinsight User Manual](/reference/tdinsight/) for the details.
+A dashboard for TDengine 2.x has been published on Grafana: [Dashboard 15167 - TDinsight](https://grafana.com/grafana/dashboards/15167)). Check the [TDinsight User Manual](/reference/tdinsight/) for the details.
 
 For more dashboards using TDengine data source, [search here in Grafana](https://grafana.com/grafana/dashboards/?dataSource=tdengine-datasource). Here is a sub list:
 

docs/en/20-third-party/09-emq-broker.md

@@ -47,7 +47,7 @@ Select "Rule" in the "Rule Engine" on the left and click the "Create" button: !
 
 ### Edit SQL fields
 
-Copy SQL bellow and paste it to the SQL edit area：
+Copy SQL bellow and paste it to the SQL edit area:
 
 ```sql
 SELECT
@@ -76,7 +76,8 @@ Select "WebHook" and fill in the request URL as the address and port of the serv
 
 ### Edit "action"
 
-Edit the resource configuration to add the key/value pairing for Authorization. If you use the default TDengine username and password then the value of key Authorization is：
+Edit the resource configuration to add the key/value pairing for Authorization. If you use the default TDengine username and password then the value of key Authorization is:
+
 ```
 Basic cm9vdDp0YW9zZGF0YQ==
 ```

docs/en/20-third-party/11-kafka.md

@@ -46,15 +46,14 @@ Execute in any directory:
 
 ````
 curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
-tar xzf confluent-7.1.1.tar.gz -C /opt/test
+tar xzf confluent-7.1.1.tar.gz -C /opt/
 ````
 
 Then you need to add the `$CONFLUENT_HOME/bin` directory to the PATH.
 
 ```title=".profile"
 export CONFLUENT_HOME=/opt/confluent-7.1.1
-PATH=$CONFLUENT_HOME/bin
-export PATH
+export PATH=$CONFLUENT_HOME/bin:$PATH
 ```
 
 Users can append the above script to the current user's profile file (~/.profile or ~/.bash_profile)
@@ -315,7 +314,6 @@ connection.backoff.ms=5000
 topic.prefix=tdengine-source-
 poll.interval.ms=1000
 fetch.max.rows=100
-out.format=line
 key.converter=org.apache.kafka.connect.storage.StringConverter
 value.converter=org.apache.kafka.connect.storage.StringConverter
 ```
@@ -329,7 +327,15 @@ DROP DATABASE IF EXISTS test;
 CREATE DATABASE test;
 USE test;
 CREATE STABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT);
-INSERT INTO d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:05.000',10.30000,219,0.31000) d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:15.000',12.60000,218,0.33000) d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:16.800',12.30000,221,0.31000) d1002 USING meters TAGS(California.SanFrancisco, 3) VALUES('2018-10-03 14:38:16.650',10.30000,218,0.25000) d1003 USING meters TAGS(California.LoSangeles, 2) VALUES('2018-10-03 14:38:05.500',11.80000,221,0.28000) d1003 USING meters TAGS(California.LoSangeles, 2) VALUES('2018-10-03 14:38:16.600',13.40000,223,0.29000) d1004 USING meters TAGS(California.LoSangeles, 3) VALUES('2018-10-03 14:38:05.000',10.80000,223,0.29000) d1004 USING meters TAGS(California.LoSangeles, 3) VALUES('2018-10-03 14:38:06.500',11.50000,221,0.35000);
+
+INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:05.000',10.30000,219,0.31000) \
+            d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:15.000',12.60000,218,0.33000) \
+            d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:16.800',12.30000,221,0.31000) \
+            d1002 USING meters TAGS('California.SanFrancisco', 3) VALUES('2018-10-03 14:38:16.650',10.30000,218,0.25000) \
+            d1003 USING meters TAGS('California.LosAngeles', 2)   VALUES('2018-10-03 14:38:05.500',11.80000,221,0.28000) \
+            d1003 USING meters TAGS('California.LosAngeles', 2)   VALUES('2018-10-03 14:38:16.600',13.40000,223,0.29000) \
+            d1004 USING meters TAGS('California.LosAngeles', 3)   VALUES('2018-10-03 14:38:05.000',10.80000,223,0.29000) \
+            d1004 USING meters TAGS('California.LosAngeles', 3)   VALUES('2018-10-03 14:38:06.500',11.50000,221,0.35000);
 ```
 
 Use TDengine CLI to execute SQL script
@@ -346,7 +352,7 @@ confluent local services connect connector load TDengineSourceConnector --config
 
 ### View topic data
 
-Use the kafka-console-consumer command-line tool to monitor data in the topic tdengine-source-test. In the beginning, all historical data will be output. After inserting two new data into TDengine, kafka-console-consumer immediately outputs the two new data.
+Use the kafka-console-consumer command-line tool to monitor data in the topic tdengine-source-test. In the beginning, all historical data will be output. After inserting two new data into TDengine, kafka-console-consumer immediately outputs the two new data. The output is in InfluxDB line protocol format.
 
 ````
 kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
@@ -384,7 +390,7 @@ confluent local services connect connector status
 You should now have two active connectors if you followed the previous steps. Use the following command to unload:
 
 ````
-confluent local services connect connector unload TDengineSourceConnector
+confluent local services connect connector unload TDengineSinkConnector
 confluent local services connect connector unload TDengineSourceConnector
 ````
 
@@ -417,11 +423,13 @@ The following configuration items apply to TDengine Sink Connector and TDengine
 ### TDengine Source Connector specific configuration
 
 1. `connection.database`: source database name, no default value.
-2. `topic.prefix`: topic name prefix after data is imported into kafka. Use `topic.prefix` + `connection.database` name as the full topic name. Defaults to the empty string "".
-3. `timestamp.initial`: Data synchronization start time. The format is 'yyyy-MM-dd HH:mm:ss'. Default "1970-01-01 00:00:00".
-4. `poll.interval.ms`: Pull data interval, the unit is ms. Default is 1000.
-5. `fetch.max.rows`: The maximum number of rows retrieved when retrieving the database. Default is 100.
-6. `out.format`: The data format. The value could be line or json. The line represents the InfluxDB Line protocol format, and json represents the OpenTSDB JSON format. Default is `line`.
+2. `topic.prefix`: topic name prefix used when importing data into kafka. Its defaults value is empty string "".
+3. `timestamp.initial`: Data synchronization start time. The format is 'yyyy-MM-dd HH:mm:ss'. If it is not set, the data importing to Kafka will be started from the first/oldest row in the database.
+4. `poll.interval.ms`: The time interval for checking newly created tables or removed tables, default value is 1000.
+5. `fetch.max.rows`: The maximum number of rows retrieved when retrieving the database, default is 100.
+6. `query.interval.ms`: The time range of reading data from TDengine each time, its unit is millisecond. It should be adjusted according to the data flow in rate, the default value is 1000.
+7. `topic.per.stable`: If it's set to true, it means one super table in TDengine corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>-<stable.name>`; if it's set to false, it means the whole DB corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>`.
+
 
 
 ## Other notes

docs/en/20-third-party/12-google-data-studio.md

@@ -10,7 +10,7 @@ TDengine is a high-performance, scalable time-series database that supports SQL.
 
 The TDengine team immediately saw the benefits of using TDengine to process time-series data with Data Studio to analyze it, and they got to work to create a connector for Data Studio.
 
-With the release of the TDengine connector in Data Studio, you can now get even more out of your data. To obtain the connector, first go to the Data Studio Connector Gallery, click Connect to Data, and search for “TDengine”.
+With the release of the TDengine connector in Data Studio, you can now get even more out of your data. To obtain the connector, first go to the Data Studio Connector Gallery, click Connect to Data, and search for "TDengine".
 
 ![02](gds/gds-02.png.webp)
 
@@ -30,8 +30,8 @@ After the connection is established, you can use Data Studio to process your dat
 
 ![06](gds/gds-06.png.webp)
 
-In Data Studio, TDengine timestamps and tags are considered dimensions, and all other items are considered metrics. You can create all kinds of custom charts with your data – some examples are shown below.
+In Data Studio, TDengine timestamps and tags are considered dimensions, and all other items are considered metrics. You can create all kinds of custom charts with your data - some examples are shown below.
 
 ![07](gds/gds-07.png.webp)
 
-With the ability to process petabytes of data per day and provide monitoring and alerting in real time, TDengine is a great solution for time-series data management. Now, with the Data Studio connector, we’re sure you’ll be able to gain new insights and obtain even more value from your data.
+With the ability to process petabytes of data per day and provide monitoring and alerting in real time, TDengine is a great solution for time-series data management. Now, with the Data Studio connector, we're sure you'll be able to gain new insights and obtain even more value from your data.

docs/en/21-tdinternal/01-arch.md

@@ -26,9 +26,9 @@ A complete TDengine system runs on one or more physical nodes. Logically, a comp
 
 **Management node (mnode)**: A virtual logical unit (M in the figure) responsible for monitoring and maintaining the running status of all data nodes and load balancing among nodes. At the same time, the management node is also responsible for the storage and management of metadata (including users, databases, tables, static tags, etc.), so it is also called Meta Node. Multiple (up to 3) mnodes can be configured in a TDengine cluster, and they are automatically constructed into a virtual management node group (M0, M1, M2 in the figure). mnode adopts RAFT protocol to guarantee high data availability and high data reliability. Any data operation can only be performed through the Leader in the RAFT group. The first mnode in the mnode RAFT group is created automatically when the first dnode of the cluster is deployed. Other two follower mnodes need to be created through SQL command in TDengine CLI. There can be at most one mnode in a single dnode, and the mnode is identified by the EP of the dnode where it's located. Each dnode can communicate with each other to automatically get the EP of all mnodes. 
 
-**Computation node (qnode)**： A virtual logical unit (Q in the figure) responsible for executing query and computing tasks including the `show` commands based on system built-in tables. There can be multiple qnodes configured in a TDengine cluster to share the query and computing tasks. A qnode is not coupled with a specific database, that means each qnode can execute the query tasks for multiple databases in parallel. There can be at most one qnode in a single dnode, and the qnode is identified by the EP of the dnode. TDengine client driver can get the list of qnodes through the communication with mnode. If there is no qnode available in the system, query and computing tasks are executed by vnodes. When a query task is executed, according to the execution plan, one or more qnodes may be scheduled by the scheduler to execute the task. qnode can get data from vnode, and send the execution result to other qnodes for further processing. With introducing qnodes, TDengine achieves the separation between storage and computing.
+**Computation node (qnode)**: A virtual logical unit (Q in the figure) responsible for executing query and computing tasks including the `show` commands based on system built-in tables. There can be multiple qnodes configured in a TDengine cluster to share the query and computing tasks. A qnode is not coupled with a specific database, that means each qnode can execute the query tasks for multiple databases in parallel. There can be at most one qnode in a single dnode, and the qnode is identified by the EP of the dnode. TDengine client driver can get the list of qnodes through the communication with mnode. If there is no qnode available in the system, query and computing tasks are executed by vnodes. When a query task is executed, according to the execution plan, one or more qnodes may be scheduled by the scheduler to execute the task. qnode can get data from vnode, and send the execution result to other qnodes for further processing. With introducing qnodes, TDengine achieves the separation between storage and computing.
 
-**Stream Processing node (snode)**： A virtual logical unit (S in the figure) responsible for stream processing tasks is introduced in TDengine. There can be multiple snodes configured in a TDengine cluster to share the burden of stream processing tasks. snode is not coupled with a specific stream, that means a single snode can execute the tasks of multiple streams. There can be at most one snode in a single dnode, it's identified by the EP of the dnode. mnode schedules available snodes to perform the stream processing tasks. If there is no snode available in the system, stream processing tasks are executed in vnodes.
+**Stream Processing node (snode)**: A virtual logical unit (S in the figure) responsible for stream processing tasks is introduced in TDengine. There can be multiple snodes configured in a TDengine cluster to share the burden of stream processing tasks. snode is not coupled with a specific stream, that means a single snode can execute the tasks of multiple streams. There can be at most one snode in a single dnode, it's identified by the EP of the dnode. mnode schedules available snodes to perform the stream processing tasks. If there is no snode available in the system, stream processing tasks are executed in vnodes.
 
 **Virtual node group (VGroup)**: Vnodes on different data nodes can form a virtual node group to ensure the high availability of the system. The virtual node group is managed using RAFT protocol. Write operations can only be performed on the leader vnode, and then replicated to follower vnodes, thus ensuring that one single replica of data is copied on multiple physical nodes. The number of virtual nodes in a vgroup equals the number of data replicas. If the number of replicas of a DB is N, the system must have at least N data nodes. The number of replicas can be specified by the parameter `replica` when creating a DB, and the default is 1. Using the multiple replication feature of TDengine, the same high data reliability can be achieved without the need for expensive storage devices such as disk arrays. Virtual node groups are created and managed by the management node, and the management node assigns a system unique ID, aka VGroup ID, to each vgroup. Virtual nodes with the same vnode group ID belong to the same vgroup. If `replica` is set to 1, it means no data replication. The number of replication for a database can be dynamically changed to 3 for high data reliability. Even if a virtual node group is deleted, its ID will not be reused.
 
@@ -59,7 +59,7 @@ After obtaining the mnode EP list, the data node initiates the connection. It wi
 - Step : Connect to the existing working data node using TDengine CLI, and then add the End Point of the new data node with the command "create dnode"
 - Step 2: In the system configuration parameter file `taos.cfg` of the new data node, set the `firstEp` and `secondEp` parameters to the EP of any two data nodes in the existing cluster. If there is only one existing data node in the system, skip parameter `secondEp`. Please refer to the user tutorial for detailed steps. In this way, the cluster will be established step by step.
 
-**Redirection**: Regardless of dnode or TAOSC, the connection to the mnode is initiated first. The mnode is automatically created and maintained by the system, so the user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or TAOSC, if it’s not an mnode itself, it will reply to the connection initiator with the mnode EP List. After receiving this list, TAOSC or the newly started dnode will try to establish the connection again with mnode. When the mnode EP List changes, each data node quickly obtains the latest list and notifies TAOSC through messaging interaction among nodes.
+**Redirection**: Regardless of dnode or TAOSC, the connection to the mnode is initiated first. The mnode is automatically created and maintained by the system, so the user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or TAOSC, if it's not an mnode itself, it will reply to the connection initiator with the mnode EP List. After receiving this list, TAOSC or the newly started dnode will try to establish the connection again with mnode. When the mnode EP List changes, each data node quickly obtains the latest list and notifies TAOSC through messaging interaction among nodes.
 
 ### A Typical Data Writing Process
 
@@ -107,7 +107,7 @@ For large-scale data management, to achieve scale-out, it is generally necessary
 
 VNode (Virtual Data Node) is responsible for providing writing, query and computing functions for collected time-series data. To facilitate load balancing, data recovery and support heterogeneous environments, TDengine splits a data node into multiple vnodes according to its computing and storage resources. The management of these vnodes is done automatically by TDengine and is completely transparent to the application.
 
-For a single data collection point, regardless of the amount of data, a vnode (or vnode group, if the number of replicas is greater than 1) has enough computing resource and storage resource to process (if a 16-byte record is generated per second, the original data generated in one year will be less than 0.5 G). So TDengine stores all the data of a table (a data collection point) in one vnode instead of distributing the data to two or more dnodes. Moreover, a vnode can store data from multiple data collection points (tables), and the upper limit of the tables’ quantity for a vnode is one million. By design, all tables in a vnode belong to the same DB. On a data node, unless specially configured, the number of vnodes owned by a DB will not exceed the number of system cores.
+For a single data collection point, regardless of the amount of data, a vnode (or vnode group, if the number of replicas is greater than 1) has enough computing resource and storage resource to process (if a 16-byte record is generated per second, the original data generated in one year will be less than 0.5 G). So TDengine stores all the data of a table (a data collection point) in one vnode instead of distributing the data to two or more dnodes. Moreover, a vnode can store data from multiple data collection points (tables), and the upper limit of the tables' quantity for a vnode is one million. By design, all tables in a vnode belong to the same DB. On a data node, unless specially configured, the number of vnodes owned by a DB will not exceed the number of system cores.
 
 When creating a DB, the system does not allocate resources immediately. However, when creating a table, the system will check if there is an allocated vnode with free tablespace. If so, the table will be created in the vacant vnode immediately. If not, the system will create a new vnode on a dnode from the cluster according to the current workload, and then a table. If there are multiple replicas of a DB, the system does not create only one vnode, but a vgroup (virtual data node group). The system has no limit on the number of vnodes, which is just limited by the computing and storage resources of physical nodes.
 
@@ -132,9 +132,9 @@ Leader Vnode uses a writing process as follows:
 <center> Figure 3: TDengine Leader writing process </center>
 
 1. Leader vnode receives the application data insertion request, verifies, and moves to next step;
-2. Leader vnode will write the original request packet into database log file WAL. If the database configuration parameter `“wal_level”` is set to 1, vnode doesn't invoked fsync. If `wal_level` is set to 2, fsync is invoked according to another database parameter `wal_fsync_period`.
+2. Leader vnode will write the original request packet into database log file WAL. If the database configuration parameter `"wal_level"` is set to 1, vnode doesn't invoked fsync. If `wal_level` is set to 2, fsync is invoked according to another database parameter `wal_fsync_period`.
 3. If there are multiple replicas, the leader vnode will forward data packet to follower vnodes in the same virtual node group, and the forwarded packet has a version number with data;
-4. Leader vnode Writes the data into memory and add the record to “skip list”;
+4. Leader vnode Writes the data into memory and add the record to "skip list";
 5. Leader vnode returns a confirmation message to the application, indicating a successful write.
 6. If any of Step 2, 3 or 4 fails, the error will directly return to the application.
 
@@ -148,7 +148,7 @@ For a follower vnode, the write process as follows:
 
 1. Follower vnode receives a data insertion request forwarded by Leader vnode;
 2. The behavior regarding `wal_level` and `wal_fsync_period` in a follower vnode is same as the leader vnode.
-3. Write into memory and add the record to “skip list”.
+3. Write into memory and add the record to "skip list".
 
 Compared with Leader vnode, follower vnode has no forwarding or reply confirmation step. But writing into memory and WAL is exactly the same.
 
@@ -156,7 +156,7 @@ Compared with Leader vnode, follower vnode has no forwarding or reply confirmati
 
 Vnode maintains a version number. When memory data is persisted, the version number is also persisted. For each data update operation, whether it is time-series data or metadata, this version number will be increased by one.
 
-When a vnode starts, its role (leader, follower) is uncertain, and the data is in an unsynchronized state. It’s necessary to establish TCP connections with other vnodes in the virtual node group and exchange status, including version and its own role. Through the exchange, the system implements a leader-selection process according to standard RAFT protocol.
+When a vnode starts, its role (leader, follower) is uncertain, and the data is in an unsynchronized state. It's necessary to establish TCP connections with other vnodes in the virtual node group and exchange status, including version and its own role. Through the exchange, the system implements a leader-selection process according to standard RAFT protocol.
 
 ### Synchronous Replication
 
@@ -192,7 +192,7 @@ When data is written to disk, the system decides whether to compress the data ba
 
 ### Tiered Storage
 
-By default, TDengine saves all data in /var/lib/taos directory, and the data files of each vnode are saved in a different directory under this directory. In order to expand the storage space, minimize the bottleneck of file reading and improve the data throughput rate, TDengine can configure the system parameter “dataDir” to allow multiple mounted hard disks to be used by system at the same time. In addition, TDengine also provides the function of tiered data storage, i.e. storage on different storage media according to the time stamps of data files. For example, the latest data is stored on SSD, the data older than a week is stored on local hard disk, and data older than four weeks is stored on network storage device. This reduces storage costs and ensures efficient data access. The movement of data on different storage media is automatically done by the system and is completely transparent to applications. Tiered storage of data is also configured through the system parameter “dataDir”.
+By default, TDengine saves all data in /var/lib/taos directory, and the data files of each vnode are saved in a different directory under this directory. In order to expand the storage space, minimize the bottleneck of file reading and improve the data throughput rate, TDengine can configure the system parameter "dataDir" to allow multiple mounted hard disks to be used by system at the same time. In addition, TDengine also provides the function of tiered data storage, i.e. storage on different storage media according to the time stamps of data files. For example, the latest data is stored on SSD, the data older than a week is stored on local hard disk, and data older than four weeks is stored on network storage device. This reduces storage costs and ensures efficient data access. The movement of data on different storage media is automatically done by the system and is completely transparent to applications. Tiered storage of data is also configured through the system parameter "dataDir".
 
 dataDir format is as follows:
 
@@ -202,7 +202,7 @@ dataDir data_path [tier_level]
 
 Where data_path is the folder path of mount point and tier_level is the media storage-tier. The higher the media storage-tier, means the older the data file. Multiple hard disks can be mounted at the same storage-tier, and data files on the same storage-tier are distributed on all hard disks within the tier. TDengine supports up to 3 tiers of storage, so tier_level values are 0, 1, and 2. When configuring dataDir, there must be only one mount path without specifying tier_level, which is called special mount disk (path). The mount path defaults to level 0 storage media and contains special file links, which cannot be removed, otherwise it will have a devastating impact on the written data.
 
-Suppose there is a physical node with six mountable hard disks/mnt/disk1,/mnt/disk2, …,/mnt/disk6, where disk1 and disk2 need to be designated as level 0 storage media, disk3 and disk4 are level 1 storage media, and disk5 and disk6 are level 2 storage media. Disk1 is a special mount disk, you can configure it in/etc/taos/taos.cfg as follows:
+Suppose there is a physical node with six mountable hard disks/mnt/disk1,/mnt/disk2, ..., /mnt/disk6, where disk1 and disk2 need to be designated as level 0 storage media, disk3 and disk4 are level 1 storage media, and disk5 and disk6 are level 2 storage media. Disk1 is a special mount disk, you can configure it in/etc/taos/taos.cfg as follows:
 
 ```
 dataDir /mnt/disk1/taos

docs/en/25-application/01-telegraf.md

@@ -35,7 +35,7 @@ Please refer to the [official documentation](https://grafana.com/grafana/downloa
 
 ### TDengine
 
-Download the latest TDengine-server from the [Downloads](http://tdengine.com/en/all-downloads/) page on the TAOSData website and install it.
+Download and install the [latest version of TDengine](https://docs.tdengine.com/releases/tdengine/).
 
 ## Data Connection Setup
 

docs/en/25-application/02-collectd.md

@@ -38,7 +38,7 @@ Please refer to the [official documentation](https://grafana.com/grafana/downloa
 
 ### Install TDengine
 
-Download the latest TDengine-server from the [Downloads](http://tdengine.com/en/all-downloads/) page on the TAOSData website and install it.
+Download and install the [latest version of TDengine](https://docs.tdengine.com/releases/tdengine/).
 
 ## Data Connection Setup
 

docs/en/25-application/_03-immigrate.md

@@ -200,7 +200,7 @@ After migrating via DataX, we found that we can significantly improve the effici
 
 ### 2. Manual data migration
 
-Suppose you need to use the multi-value model for data writing. In that case, you need to develop a tool to export data from OpenTSDB, confirm which timelines can be merged and imported into the same timeline, and then pass the time to import simultaneously through the SQL statement—written to the database.
+Suppose you need to use the multi-value model for data writing. In that case, you need to develop a tool to export data from OpenTSDB, confirm which timelines can be merged and imported into the same timeline, and then pass the time to import simultaneously through the SQL statement-written to the database.
 
 Manual migration of data requires attention to the following two issues:
 
@@ -258,7 +258,7 @@ Equivalent function: apercentile
 Example:
 
 ```sql
-Select apercentile(col1, 50, “t-digest”) from table_name
+select apercentile(col1, 50, "t-digest") from table_name
 ```
 
 Remark:

docs/en/27-train-faq/01-faq.md

@@ -32,7 +32,7 @@ TDengine 3.0 is not compatible with the configuration and data files from previo
 2. Run `sudo rm -rf /var/log/taos/` to delete your log files.
 3. Run `sudo rm -rf /var/lib/taos/` to delete your data files.
 4. Install TDengine 3.0.
-5. For assistance in migrating data to TDengine 3.0, contact [TDengine Support](https://tdengine.com/support).
+5. For assistance in migrating data to TDengine 3.0, contact [TDengine Support](https://tdengine.com/support/).
 
 ### 2. How can I resolve the "Unable to establish connection" error?
 

docs/examples/java/pom.xml

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.taosdata.jdbc</groupId>
       <artifactId>taos-jdbcdriver</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.1</version>
     </dependency>
     <!--    ANCHOR_END: dep-->
     <dependency>

docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java

 package com.taos.example;
 
+import com.taosdata.jdbc.tmq.ConsumerRecord;
 import com.taosdata.jdbc.tmq.ConsumerRecords;
 import com.taosdata.jdbc.tmq.TMQConstants;
 import com.taosdata.jdbc.tmq.TaosConsumer;
@@ -64,7 +65,8 @@ public class SubscribeDemo {
                 consumer.subscribe(Collections.singletonList(TOPIC));
                 while (!shutdown.get()) {
                     ConsumerRecords<Meters> meters = consumer.poll(Duration.ofMillis(100));
-                    for (Meters meter : meters) {
+                    for (ConsumerRecord<Meters> recode : meters) {
+                        Meters meter = recode.value();
                         System.out.println(meter);
                     }
                 }

docs/examples/rust/nativeexample/examples/schemaless_insert_json.rs

+use taos_query::common::SchemalessPrecision;
+use taos_query::common::SchemalessProtocol;
+use taos_query::common::SmlDataBuilder;
+
+use crate::AsyncQueryable;
+use crate::AsyncTBuilder;
+use crate::TaosBuilder;
+
+async fn put_json() -> anyhow::Result<()> {
+    // std::env::set_var("RUST_LOG", "taos=trace");
+    std::env::set_var("RUST_LOG", "taos=debug");
+    pretty_env_logger::init();
+    let dsn =
+        std::env::var("TDENGINE_ClOUD_DSN").unwrap_or("http://localhost:6041".to_string());
+    log::debug!("dsn: {:?}", &dsn);
+
+    let client = TaosBuilder::from_dsn(dsn)?.build().await?;
+
+    let db = "demo_schemaless_ws";
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    client
+        .exec(format!("create database if not exists {db}"))
+        .await?;
+
+    // should specify database before insert
+    client.exec(format!("use {db}")).await?;
+
+    // SchemalessProtocol::Json
+    let data = [
+        r#"[{"metric": "meters.current", "timestamp": 1681345954000, "value": 10.3, "tags": {"location": "California.SanFrancisco", "groupid": 2}}, {"metric": "meters.voltage", "timestamp": 1648432611249, "value": 219, "tags": {"location": "California.LosAngeles", "groupid": 1}}, {"metric": "meters.current", "timestamp": 1648432611250, "value": 12.6, "tags": {"location": "California.SanFrancisco", "groupid": 2}}, {"metric": "meters.voltage", "timestamp": 1648432611250, "value": 221, "tags": {"location": "California.LosAngeles", "groupid": 1}}]"#
+    ]
+    .map(String::from)
+    .to_vec();
+
+    // demo with all fields
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Json)
+        .precision(SchemalessPrecision::Millisecond)
+        .data(data.clone())
+        .ttl(1000)
+        .req_id(300u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default precision
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Json)
+        .data(data.clone())
+        .ttl(1000)
+        .req_id(301u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default ttl
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Json)
+        .data(data.clone())
+        .req_id(302u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default req_id
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Json)
+        .data(data.clone())
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    Ok(())
+}

docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs

+use taos_query::common::SchemalessPrecision;
+use taos_query::common::SchemalessProtocol;
+use taos_query::common::SmlDataBuilder;
+
+use crate::AsyncQueryable;
+use crate::AsyncTBuilder;
+use crate::TaosBuilder;
+
+async fn put_line() -> anyhow::Result<()> {
+    // std::env::set_var("RUST_LOG", "taos=trace");
+    std::env::set_var("RUST_LOG", "taos=debug");
+    pretty_env_logger::init();
+
+    let dsn =
+        std::env::var("TDENGINE_ClOUD_DSN").unwrap_or("http://localhost:6041".to_string());
+    log::debug!("dsn: {:?}", &dsn);
+
+    let client = TaosBuilder::from_dsn(dsn)?.build().await?;
+
+    let db = "demo_schemaless_ws";
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    client
+        .exec(format!("create database if not exists {db}"))
+        .await?;
+
+    // should specify database before insert
+    client.exec(format!("use {db}")).await?;
+
+    let data = [
+        "measurement,host=host1 field1=2i,field2=2.0 1577837300000",
+        "measurement,host=host1 field1=2i,field2=2.0 1577837400000",
+        "measurement,host=host1 field1=2i,field2=2.0 1577837500000",
+        "measurement,host=host1 field1=2i,field2=2.0 1577837600000",
+    ]
+    .map(String::from)
+    .to_vec();
+
+    // demo with all fields
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Line)
+        .precision(SchemalessPrecision::Millisecond)
+        .data(data.clone())
+        .ttl(1000)
+        .req_id(100u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default ttl
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Line)
+        .precision(SchemalessPrecision::Millisecond)
+        .data(data.clone())
+        .req_id(101u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default ttl and req_id 
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Line)
+        .precision(SchemalessPrecision::Millisecond)
+        .data(data.clone())
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default precision
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Line)
+        .data(data)
+        .req_id(103u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    Ok(())
+}

docs/examples/rust/nativeexample/examples/schemaless_insert_telnet.rs

+use taos_query::common::SchemalessPrecision;
+use taos_query::common::SchemalessProtocol;
+use taos_query::common::SmlDataBuilder;
+
+use crate::AsyncQueryable;
+use crate::AsyncTBuilder;
+use crate::TaosBuilder;
+
+async fn put_telnet() -> anyhow::Result<()> {
+    // std::env::set_var("RUST_LOG", "taos=trace");
+    std::env::set_var("RUST_LOG", "taos=debug");
+    pretty_env_logger::init();
+    let dsn =
+        std::env::var("TDENGINE_ClOUD_DSN").unwrap_or("http://localhost:6041".to_string());
+    log::debug!("dsn: {:?}", &dsn);
+
+    let client = TaosBuilder::from_dsn(dsn)?.build().await?;
+
+    let db = "demo_schemaless_ws";
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    client
+        .exec(format!("create database if not exists {db}"))
+        .await?;
+
+    // should specify database before insert
+    client.exec(format!("use {db}")).await?;
+
+    let data = [
+        "meters.current 1648432611249 10.3 location=California.SanFrancisco group=2",
+        "meters.current 1648432611250 12.6 location=California.SanFrancisco group=2",
+        "meters.current 1648432611249 10.8 location=California.LosAngeles group=3",
+        "meters.current 1648432611250 11.3 location=California.LosAngeles group=3",
+        "meters.voltage 1648432611249 219 location=California.SanFrancisco group=2",
+        "meters.voltage 1648432611250 218 location=California.SanFrancisco group=2",
+        "meters.voltage 1648432611249 221 location=California.LosAngeles group=3",
+        "meters.voltage 1648432611250 217 location=California.LosAngeles group=3",
+    ]
+    .map(String::from)
+    .to_vec();
+
+    // demo with all fields
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Telnet)
+        .precision(SchemalessPrecision::Millisecond)
+        .data(data.clone())
+        .ttl(1000)
+        .req_id(200u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default precision
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Telnet)
+        .data(data.clone())
+        .ttl(1000)
+        .req_id(201u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default ttl
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Telnet)
+        .data(data.clone())
+        .req_id(202u64)
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    // demo with default req_id
+    let sml_data = SmlDataBuilder::default()
+        .protocol(SchemalessProtocol::Telnet)
+        .data(data.clone())
+        .build()?;
+    assert_eq!(client.put(&sml_data).await?, ());
+
+    client.exec(format!("drop database if exists {db}")).await?;
+
+    Ok(())
+}

docs/zh/02-intro.md

@@ -92,7 +92,7 @@ TDengine 的主要功能如下：
 
 ## 典型适用场景
 
-作为一个高性能、分布式、支持 SQL 的时序数据库（Database），TDengine 的典型适用场景包括但不限于 IoT、工业互联网、车联网、IT 运维、能源、金融证券等领域。需要指出的是，TDengine 是针对时序数据场景设计的专用数据库和专用大数据处理工具，因其充分利用了时序大数据的特点，它无法用来处理网络爬虫、微博、微信、电商、ERP、CRM 等通用型数据。下面本文将对适用场景做更多详细的分析。
+作为一个高性能、分布式、支持 SQL 的时序数据库（Time-series Database），TDengine 的典型适用场景包括但不限于 IoT、工业互联网、车联网、IT 运维、能源、金融证券等领域。需要指出的是，TDengine 是针对时序数据场景设计的专用数据库和专用大数据处理工具，因其充分利用了时序大数据的特点，它无法用来处理网络爬虫、微博、微信、电商、ERP、CRM 等通用型数据。下面本文将对适用场景做更多详细的分析。
 
 ### 数据源特点和需求
 

docs/zh/05-get-started/03-package.md

@@ -207,6 +207,8 @@ Active: inactive (dead)
 
 - 查看服务状态：`sudo launchctl list | grep taosd`
 
+- 查看服务详细信息：`launchctl print system/com.tdengine.taosd`
+
 :::info
 
 - `launchctl` 命令管理`com.tdengine.taosd`需要管理员权限，务必在前面加 `sudo` 来增强安全性。

docs/zh/07-develop/03-insert-data/_rust_schemaless.mdx

+```rust
+{{#include docs/examples/rust/nativeexample/examples/schemaless_insert_line.rs}}
+```

docs/zh/07-develop/04-query-data/index.mdx

@@ -161,7 +161,7 @@ Query OK, 6 rows in database (0.005515s)
 :::note
 
 1. 无论是使用 REST 连接还是原生连接的连接器，以上示例代码都能正常工作。
-2. 唯一需要注意的是：由于 REST 接口无状态， 不能使用 `use db` 语句来切换数据库。
+2. 唯一需要注意的是：由于 REST 接口无状态， 不能使用 `use db` 语句来切换数据库。除了在 REST 参数中指定数据库以外也可以在 SQL 语句中使用 <db_name>.<table_name> 来指定数据库。
 
 :::
 

docs/zh/07-develop/07-tmq.mdx

@@ -25,7 +25,8 @@ import CDemo from "./_sub_c.mdx";
 
 本文档不对消息队列本身的基础知识做介绍，如果需要了解，请自行搜索。
 
-注意：默认是从wal消费数据，如果wal被删除，消费到的数据会不全，此时可以将参数 experimental.snapshot.enable 设置为true，从tsdb获取全部数据，但是这样的话就不能保证数据的消费顺序。所以建议根据自己的消费情况合理的设置wal的保留策略，保证可以从wal里订阅到全部数据。
+注意：数据订阅是从 WAL 消费数据，如果一些 WAL 文件被基于 WAL 保留策略删除，则已经删除的 WAL 文件中的数据就无法再消费到。需要根据业务需要在创建数据库时合理设置 `WAL_RETENTION_PERIOD` 或 `WAL_RETENTION_SIZE` ，并确保应用及时消费数据，这样才不会产生数据丢失的现象。数据订阅的行为与 Kafka 等广泛使用的消息队列类产品的行为相似。
+
 ## 主要数据结构和 API
 
 不同语言下， TMQ 订阅相关的 API 及数据结构如下：
@@ -293,7 +294,6 @@ CREATE TOPIC topic_name AS DATABASE db_name;
 |      `auto.offset.reset`       |  enum   | 消费组订阅的初始位置                                     | <br />`earliest`: default;从头开始订阅; <br/>`latest`: 仅从最新数据开始订阅; <br/>`none`: 没有提交的 offset 无法订阅 |
 |      `enable.auto.commit`      | boolean | 是否启用消费位点自动提交，true: 自动提交，客户端应用无需commit；false：客户端应用需要自行commit     | 默认值为 true                   |
 |   `auto.commit.interval.ms`    | integer | 消费记录自动提交消费位点时间间隔，单位为毫秒           | 默认值为 5000                                |
-| `experimental.snapshot.enable` | boolean | 是否允许从 TSDB 消费数据。当其关闭时，只能消费依据 WAL 保留策略仍然在WAL中的数据；当其打开时，除WAL中的数据以外，也能够消费已经从WAL中删除但落盘到TSDB中的数据                              | 实验功能，默认关闭                          |
 |     `msg.with.table.name`      | boolean | 是否允许从消息中解析表名, 不适用于列订阅（列订阅时可将 tbname 作为列写入 subquery 语句）               |默认关闭 |
 
 对于不同编程语言，其设置方式如下：
@@ -311,7 +311,6 @@ tmq_conf_set(conf, "group.id", "cgrpName");
 tmq_conf_set(conf, "td.connect.user", "root");
 tmq_conf_set(conf, "td.connect.pass", "taosdata");
 tmq_conf_set(conf, "auto.offset.reset", "earliest");
-tmq_conf_set(conf, "experimental.snapshot.enable", "true");
 tmq_conf_set(conf, "msg.with.table.name", "true");
 tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
 
@@ -367,7 +366,6 @@ conf := &tmq.ConfigMap{
  "td.connect.port":              "6030",
  "client.id":                    "test_tmq_c",
  "enable.auto.commit":           "false",
- "experimental.snapshot.enable": "true",
  "msg.with.table.name":          "true",
 }
 consumer, err := NewConsumer(conf)
@@ -417,7 +415,6 @@ consumer = Consumer({"group.id": "local", "td.connect.ip": "127.0.0.1"})
 | `enable.auto.commit` | string | 启用自动提交 | 合法值：`true`, `false` |
 | `auto.commit.interval.ms` | string | 以毫秒为单位的自动提交时间间隔 | 默认值：5000 ms |
 | `auto.offset.reset` | string | 消费组订阅的初始位置 | 可选：`earliest`(default), `latest`, `none` |
-| `experimental.snapshot.enable` | string | 是否允许从 TSDB 消费数据 | 合法值：`true`, `false` |
 
 </TabItem>
 

docs/zh/08-connector/26-rust.mdx

@@ -10,6 +10,7 @@ import TabItem from '@theme/TabItem';
 import Preparation from "./_preparation.mdx"
 import RustInsert from "../07-develop/03-insert-data/_rust_sql.mdx"
 import RustBind from "../07-develop/03-insert-data/_rust_stmt.mdx"
+import RustSml from "../07-develop/03-insert-data/_rust_schemaless.mdx"
 import RustQuery from "../07-develop/04-query-data/_rust.mdx"
 
 [![Crates.io](https://img.shields.io/crates/v/taos)](https://crates.io/crates/taos) ![Crates.io](https://img.shields.io/crates/d/taos) [![docs.rs](https://img.shields.io/docsrs/taos)](https://docs.rs/taos)
@@ -230,6 +231,10 @@ async fn demo(taos: &Taos, db: &str) -> Result<(), Error> {
 
 <RustBind />
 
+#### Schemaless 写入
+
+<RustSml />
+
 ### 查询数据
 
 <RustQuery />

docs/zh/12-taos-sql/04-stable.md

@@ -33,7 +33,7 @@ column_definition:
 SHOW STABLES [LIKE tb_name_wildcard];
 ```
 
-查看数据库内全部 STable，及其相关信息，包括 STable 的名称、创建时间、列数量、标签（TAG）数量、通过该 STable 建表的数量。
+查看数据库内全部超级表。
 
 ### 显示一个超级表的创建语句
 

docs/zh/12-taos-sql/06-select.md

@@ -55,7 +55,7 @@ window_clause: {
   | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 
 interp_clause:
-    RANGE(ts_val, ts_val), EVERY(every_val), FILL(fill_mod_and_val)
+    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
     PARTITION BY expr [, expr] ...

docs/zh/12-taos-sql/10-function.md

@@ -888,7 +888,7 @@ INTERP(expr)
 - INTERP 的输出时间范围根据 RANGE(timestamp1,timestamp2)字段来指定，需满足 timestamp1 <= timestamp2。其中 timestamp1（必选值）为输出时间范围的起始值，即如果 timestamp1 时刻符合插值条件则 timestamp1 为输出的第一条记录，timestamp2（必选值）为输出时间范围的结束值，即输出的最后一条记录的 timestamp 不能大于 timestamp2。
 - INTERP 根据 EVERY(time_unit) 字段来确定输出时间范围内的结果条数，即从 timestamp1 开始每隔固定长度的时间（time_unit 值）进行插值，time_unit 可取值时间单位：1a(毫秒)，1s(秒)，1m(分)，1h(小时)，1d(天)，1w(周)。例如 EVERY(500a) 将对于指定数据每500毫秒间隔进行一次插值.
 - INTERP 根据 FILL 字段来决定在每个符合输出条件的时刻如何进行插值。关于 FILL 子句如何使用请参考 [FILL 子句](../distinguished/#fill-子句)
-- INTERP 只能在一个时间序列内进行插值，因此当作用于超级表时必须跟 partition by tbname 一起使用。
+- INTERP 作用于超级表时, 会将该超级表下的所有子表数据按照主键列排序后进行插值计算，也可以搭配 PARTITION BY tbname 使用，将结果强制规约到单个时间线。
 - INTERP 可以与伪列 _irowts 一起使用，返回插值点所对应的时间戳(3.0.2.0版本以后支持)。
 - INTERP 可以与伪列 _isfilled 一起使用，显示返回结果是否为原始记录或插值算法产生的数据(3.0.3.0版本以后支持)。
 

docs/zh/12-taos-sql/24-show.md

@@ -129,6 +129,14 @@ SHOW QNODES;
 
 显示当前系统中 QNODE （查询节点）的信息。
 
+## SHOW QUERIES
+
+```sql
+SHOW QUERIES;
+```
+
+显示当前系统中正在进行的查询。
+
 ## SHOW SCORES
 
 ```sql
@@ -189,7 +197,7 @@ SHOW TABLE DISTRIBUTED table_name;
 
 *************************** 1.row ***************************
 
-_block_dist: Total_Blocks=[5] Total_Size=[93.65 Kb] Average_size=[18.73 Kb] Compression_Ratio=[23.98 %]
+_block_dist: Total_Blocks=[5] Total_Size=[93.65 KB] Average_size=[18.73 KB] Compression_Ratio=[23.98 %]
 
 Total_Blocks:  表 d0 占用的 block 个数为 5 个
 

docs/zh/14-reference/12-config/index.md

@@ -735,7 +735,6 @@ charset 的有效值是 UTF-8。
 | 16  |       maxTmrCtrl        | 是              | 否              | 3.0 行为未知                                      |
 | 17 |     monitorReplica      | 是              | 否              | 由 RAFT 协议管理多副本                            |
 | 18 |     smlTagNullName      | 是              | 否              | 3.0 行为未知                                      |
-| 19 |     keepColumnName      | 是              | 否              | 3.0 行为未知                                      |
 | 20 |    ratioOfQueryCores    | 是              | 否              | 由 线程池 相关配置参数决定                        |
 | 21 |   maxStreamCompDelay    | 是              | 否              | 3.0 行为未知                                      |
 | 22 | maxFirstStreamCompDelay | 是              | 否              | 3.0 行为未知                                      |

docs/zh/20-third-party/01-grafana.mdx

@@ -200,6 +200,12 @@ docker run -d \
 - Group by column name(s)： **半角**逗号分隔的 `group by` 或 `partition by` 列名。如果是 `group by` or `partition by` 查询语句，设置 `Group by` 列，可以展示多维数据。例如：INPUT SQL 为 `select _wstart as ts, avg(mem_system), dnode_ep from log.dnodes_info where ts>=$from and ts<=$to partition by dnode_ep interval($interval)`，设置 Group by 列名为 `dnode_ep`，可以按 `dnode_ep` 展示数据。
 - Format to： Group by 或 Partition by 场景下多维数据 legend 格式化格式。例如上述 INPUT SQL，将 Format to 设置为 `mem_system_{{dnode_ep}}`，展示的 legend 名字为格式化的列名。
 
+:::note
+
+由于 REST 接口无状态， 不能使用 `use db` 语句来切换数据库。Grafana 插件中 SQL 语句中可以使用 <db_name>.<table_name> 来指定数据库。
+
+:::
+
 按照默认提示查询当前 TDengine 部署所在服务器指定间隔系统内存平均使用量如下：
 
 ![TDengine Database Grafana plugin create dashboard](./create_dashboard2.webp)

docs/zh/20-third-party/11-kafka.md

@@ -48,15 +48,14 @@ Confluent 提供了 Docker 和二进制包两种安装方式。本文仅介绍
 
 ```
 curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
-tar xzf confluent-7.1.1.tar.gz -C /opt/test
+tar xzf confluent-7.1.1.tar.gz -C /opt/
 ```
 
 然后需要把 `$CONFLUENT_HOME/bin` 目录加入 PATH。
 
 ```title=".profile"
 export CONFLUENT_HOME=/opt/confluent-7.1.1
-PATH=$CONFLUENT_HOME/bin
-export PATH
+export PATH=$CONFLUENT_HOME/bin:$PATH
 ```
 
 以上脚本可以追加到当前用户的 profile 文件（~/.profile 或 ~/.bash_profile）
@@ -319,7 +318,6 @@ connection.backoff.ms=5000
 topic.prefix=tdengine-source-
 poll.interval.ms=1000
 fetch.max.rows=100
-out.format=line
 key.converter=org.apache.kafka.connect.storage.StringConverter
 value.converter=org.apache.kafka.connect.storage.StringConverter
 ```
@@ -333,7 +331,15 @@ DROP DATABASE IF EXISTS test;
 CREATE DATABASE test;
 USE test;
 CREATE STABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT);
-INSERT INTO d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:05.000',10.30000,219,0.31000) d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:15.000',12.60000,218,0.33000) d1001 USING meters TAGS(California.SanFrancisco, 2) VALUES('2018-10-03 14:38:16.800',12.30000,221,0.31000) d1002 USING meters TAGS(California.SanFrancisco, 3) VALUES('2018-10-03 14:38:16.650',10.30000,218,0.25000) d1003 USING meters TAGS(California.LosAngeles, 2) VALUES('2018-10-03 14:38:05.500',11.80000,221,0.28000) d1003 USING meters TAGS(California.LosAngeles, 2) VALUES('2018-10-03 14:38:16.600',13.40000,223,0.29000) d1004 USING meters TAGS(California.LosAngeles, 3) VALUES('2018-10-03 14:38:05.000',10.80000,223,0.29000) d1004 USING meters TAGS(California.LosAngeles, 3) VALUES('2018-10-03 14:38:06.500',11.50000,221,0.35000);
+
+INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:05.000',10.30000,219,0.31000) \
+            d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:15.000',12.60000,218,0.33000) \
+            d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-10-03 14:38:16.800',12.30000,221,0.31000) \
+            d1002 USING meters TAGS('California.SanFrancisco', 3) VALUES('2018-10-03 14:38:16.650',10.30000,218,0.25000) \
+            d1003 USING meters TAGS('California.LosAngeles', 2)   VALUES('2018-10-03 14:38:05.500',11.80000,221,0.28000) \
+            d1003 USING meters TAGS('California.LosAngeles', 2)   VALUES('2018-10-03 14:38:16.600',13.40000,223,0.29000) \
+            d1004 USING meters TAGS('California.LosAngeles', 3)   VALUES('2018-10-03 14:38:05.000',10.80000,223,0.29000) \
+            d1004 USING meters TAGS('California.LosAngeles', 3)   VALUES('2018-10-03 14:38:06.500',11.50000,221,0.35000);
 ```
 
 使用 TDengine CLI, 执行 SQL 文件。
@@ -350,7 +356,7 @@ confluent local services connect connector load TDengineSourceConnector --config
 
 ### 查看 topic 数据
 
-使用 kafka-console-consumer 命令行工具监控主题 tdengine-source-test 中的数据。一开始会输出所有历史数据， 往 TDengine 插入两条新的数据之后，kafka-console-consumer 也立即输出了新增的两条数据。
+使用 kafka-console-consumer 命令行工具监控主题 tdengine-source-test 中的数据。一开始会输出所有历史数据， 往 TDengine 插入两条新的数据之后，kafka-console-consumer 也立即输出了新增的两条数据。 输出数据 InfluxDB line protocol 的格式。
 
 ```
 kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
@@ -388,7 +394,7 @@ confluent local services connect connector status
 如果按照前述操作，此时应有两个活跃的 connector。使用下面的命令 unload：
 
 ```
-confluent local services connect connector unload TDengineSourceConnector
+confluent local services connect connector unload TDengineSinkConnector
 confluent local services connect connector unload TDengineSourceConnector
 ```
 
@@ -427,11 +433,12 @@ confluent local services connect connector unload TDengineSourceConnector
 ### TDengine Source Connector 特有的配置
 
 1. `connection.database`: 源数据库名称，无缺省值。
-2. `topic.prefix`： 数据导入 kafka 后 topic 名称前缀。 使用 `topic.prefix` + `connection.database` 名称作为完整 topic 名。默认为空字符串 ""。
-3. `timestamp.initial`: 数据同步起始时间。格式为'yyyy-MM-dd HH:mm:ss'。默认为 "1970-01-01 00:00:00"。
-4. `poll.interval.ms`: 拉取数据间隔，单位为 ms。默认为 1000。
+2. `topic.prefix`： 数据导入 kafka 时使用的 topic 名称的前缀。默认为空字符串 ""。
+3. `timestamp.initial`: 数据同步起始时间。格式为'yyyy-MM-dd HH:mm:ss'，若未指定则从指定 DB 中最早的一条记录开始。
+4. `poll.interval.ms`: 检查是否有新建或删除的表的时间间隔，单位为 ms。默认为 1000。
 5. `fetch.max.rows` : 检索数据库时最大检索条数。 默认为 100。
-6. `out.format`: 数据格式。取值 line 或 json。line 表示 InfluxDB Line 协议格式， json 表示 OpenTSDB JSON 格式。默认为 line。
+6. `query.interval.ms`: 从 TDengine 一次读取数据的时间跨度，需要根据表中的数据特征合理配置，避免一次查询的数据量过大或过小；在具体的环境中建议通过测试设置一个较优值，默认值为 1000.
+7. `topic.per.stable`: 如果设置为true，表示一个超级表对应一个 Kafka topic，topic的命名规则 `<topic.prefix>-<connection.database>-<stable.name>`；如果设置为 false，则指定的 DB 中的所有数据进入一个 Kafka topic，topic 的命名规则为 `<topic.prefix>-<connection.database>`
 
 ## 其他说明
 

docs/zh/27-train-faq/01-faq.md

@@ -77,7 +77,7 @@ description: 一些常见问题的解决方法汇总
 
  - Windows 系统请使用 PowerShell 命令 Test-NetConnection -ComputerName {fqdn} -Port {port} 检测服务段端口是否访问
 
-11. 也可以使用 taos 程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅：[诊断及其他](https://docs.taosdata.com/3.0-preview/operation/diagnose/)。
+11. 也可以使用 taos 程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅：[诊断及其他](../../operation/diagnose/)。
 
 ### 5. 遇到错误 Unable to resolve FQDN” 怎么办？
 

examples/JDBC/taosdemo/pom.xml

@@ -10,7 +10,7 @@
     <description>Demo project for TDengine</description>
 
     <properties>
-        <spring.version>5.3.26</spring.version>
+        <spring.version>5.3.27</spring.version>
     </properties>
 
     <dependencies>

include/client/taos.h

@@ -167,7 +167,7 @@ DLL_EXPORT int        taos_stmt_set_sub_tbname(TAOS_STMT *stmt, const char *name
 DLL_EXPORT int        taos_stmt_get_tag_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fields);
 DLL_EXPORT int        taos_stmt_get_col_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fields);
 // let stmt to reclaim TAOS_FIELD_E that was allocated by `taos_stmt_get_tag_fields`/`taos_stmt_get_col_fields`
-DLL_EXPORT void       taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields);
+DLL_EXPORT void taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields);
 
 DLL_EXPORT int       taos_stmt_is_insert(TAOS_STMT *stmt, int *insert);
 DLL_EXPORT int       taos_stmt_num_params(TAOS_STMT *stmt, int *nums);
@@ -230,6 +230,9 @@ DLL_EXPORT int taos_get_tables_vgId(TAOS *taos, const char *db, const char *tabl
 
 DLL_EXPORT int taos_load_table_info(TAOS *taos, const char *tableNameList);
 
+// set heart beat thread quit mode , if quicByKill 1 then kill thread else quit from inner
+DLL_EXPORT void taos_set_hb_quit(int8_t quitByKill);
+
 DLL_EXPORT int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type);
 
 /*  --------------------------schemaless INTERFACE------------------------------- */
@@ -270,10 +273,10 @@ DLL_EXPORT const char *tmq_err2str(int32_t code);
 
 /* ------------------------TMQ CONSUMER INTERFACE------------------------ */
 typedef struct tmq_topic_assignment {
-  int32_t  vgId;
-  int64_t  currentOffset;
-  int64_t  begin;
-  int64_t  end;
+  int32_t vgId;
+  int64_t currentOffset;
+  int64_t begin;
+  int64_t end;
 } tmq_topic_assignment;
 
 DLL_EXPORT int32_t   tmq_subscribe(tmq_t *tmq, const tmq_list_t *topic_list);
@@ -283,8 +286,9 @@ DLL_EXPORT TAOS_RES *tmq_consumer_poll(tmq_t *tmq, int64_t timeout);
 DLL_EXPORT int32_t   tmq_consumer_close(tmq_t *tmq);
 DLL_EXPORT int32_t   tmq_commit_sync(tmq_t *tmq, const TAOS_RES *msg);
 DLL_EXPORT void      tmq_commit_async(tmq_t *tmq, const TAOS_RES *msg, tmq_commit_cb *cb, void *param);
-DLL_EXPORT int32_t   tmq_get_topic_assignment(tmq_t *tmq, const char* pTopicName, tmq_topic_assignment **assignment, int32_t *numOfAssignment);
-DLL_EXPORT int32_t   tmq_offset_seek(tmq_t *tmq, const char* pTopicName, int32_t vgId, int64_t offset);
+DLL_EXPORT int32_t   tmq_get_topic_assignment(tmq_t *tmq, const char *pTopicName, tmq_topic_assignment **assignment,
+                                              int32_t *numOfAssignment);
+DLL_EXPORT int32_t   tmq_offset_seek(tmq_t *tmq, const char *pTopicName, int32_t vgId, int64_t offset);
 
 /* ----------------------TMQ CONFIGURATION INTERFACE---------------------- */
 
@@ -306,6 +310,7 @@ DLL_EXPORT void           tmq_conf_set_auto_commit_cb(tmq_conf_t *conf, tmq_comm
 DLL_EXPORT const char *tmq_get_topic_name(TAOS_RES *res);
 DLL_EXPORT const char *tmq_get_db_name(TAOS_RES *res);
 DLL_EXPORT int32_t     tmq_get_vgroup_id(TAOS_RES *res);
+DLL_EXPORT int64_t     tmq_get_vgroup_offset(TAOS_RES* res);
 
 /* ------------------------------ TAOSX -----------------------------------*/
 // note: following apis are unstable

include/common/systable.h

@@ -12,7 +12,7 @@
  * 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/>.
  */
- 
+
 #ifndef TDENGINE_SYSTABLE_H
 #define TDENGINE_SYSTABLE_H
 

include/common/tcommon.h

@@ -82,7 +82,7 @@ typedef struct STuplePos {
       int32_t pageId;
       int32_t offset;
     };
-    STupleKey streamTupleKey;
+    SWinKey streamTupleKey;
   };
 } STuplePos;
 
@@ -208,19 +208,6 @@ typedef struct SSDataBlock {
   SDataBlockInfo   info;
 } SSDataBlock;
 
-enum {
-  FETCH_TYPE__DATA = 0,
-  FETCH_TYPE__NONE,
-};
-
-typedef struct {
-  int8_t       fetchType;
-  union {
-    SSDataBlock data;
-    void*       meta;
-  };
-} SFetchRet;
-
 typedef struct SVarColAttr {
   int32_t* offset;    // start position for each entry in the list
   uint32_t length;    // used buffer size that contain the valid data
@@ -342,6 +329,8 @@ typedef struct {
     float       f;
   };
   size_t length;
+  bool keyEscaped;
+  bool valueEscaped;
 } SSmlKv;
 
 #define QUERY_ASC_FORWARD_STEP  1
@@ -380,6 +369,8 @@ typedef struct STUidTagInfo {
 #define UD_GROUPID_COLUMN_INDEX    1
 #define UD_TAG_COLUMN_INDEX        2
 
+int32_t taosGenCrashJsonMsg(int signum, char **pMsg, int64_t clusterId, int64_t startTime);
+
 #ifdef __cplusplus
 }
 #endif

include/common/tglobal.h

@@ -176,7 +176,9 @@ extern int32_t tsUptimeInterval;
 extern int32_t tsRpcRetryLimit;
 extern int32_t tsRpcRetryInterval;
 
-extern bool tsDisableStream;
+extern bool    tsDisableStream;
+extern int64_t tsStreamBufferSize;
+extern int64_t tsCheckpointInterval;
 
 // #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
 

include/common/tgrant.h

@@ -26,6 +26,10 @@ extern "C" {
 #include "tgrantCfg.h"
 #endif
 
+#ifndef GRANTS_COL_MAX_LEN
+#define GRANTS_COL_MAX_LEN 196
+#endif
+
 typedef enum {
   TSDB_GRANT_ALL,
   TSDB_GRANT_TIME,
@@ -47,23 +51,49 @@ typedef enum {
 int32_t grantCheck(EGrantType grant);
 
 #ifndef GRANTS_CFG
-#define GRANTS_SCHEMA                                                                            \
-  static const SSysDbTableSchema grantsSchema[] = {                                              \
-      {.name = "version", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},      \
-      {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR}, \
-      {.name = "expired", .bytes = 5 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},      \
-      {.name = "storage", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},     \
-      {.name = "timeseries", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},  \
-      {.name = "databases", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},   \
-      {.name = "users", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},       \
-      {.name = "accounts", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},    \
-      {.name = "dnodes", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},      \
-      {.name = "connections", .bytes = 11 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR}, \
-      {.name = "streams", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},      \
-      {.name = "cpu_cores", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},    \
-      {.name = "speed", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},        \
-      {.name = "querytime", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},    \
+#ifdef TD_ENTERPRISE
+#define GRANTS_SCHEMA                                                                                         \
+  static const SSysDbTableSchema grantsSchema[] = {                                                           \
+      {.name = "version", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},              \
+      {.name = "expired", .bytes = 5 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "storage", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                  \
+      {.name = "timeseries", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},               \
+      {.name = "databases", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                \
+      {.name = "users", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                    \
+      {.name = "accounts", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+      {.name = "dnodes", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "connections", .bytes = 11 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},              \
+      {.name = "streams", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "cpu_cores", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+      {.name = "speed", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                     \
+      {.name = "querytime", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+      {.name = "opc_da", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},   \
+      {.name = "opc_ua", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},   \
+      {.name = "pi", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},       \
+      {.name = "kafka", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},    \
+      {.name = "influxdb", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR}, \
+      {.name = "mqtt", .bytes = GRANTS_COL_MAX_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},     \
   }
+#else
+#define GRANTS_SCHEMA                                                                                         \
+  static const SSysDbTableSchema grantsSchema[] = {                                                           \
+      {.name = "version", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},              \
+      {.name = "expired", .bytes = 5 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "storage", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                  \
+      {.name = "timeseries", .bytes = 21 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},               \
+      {.name = "databases", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                \
+      {.name = "users", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                    \
+      {.name = "accounts", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+      {.name = "dnodes", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "connections", .bytes = 11 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},              \
+      {.name = "streams", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                   \
+      {.name = "cpu_cores", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+      {.name = "speed", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                     \
+      {.name = "querytime", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},                 \
+  }
+#endif
 #define GRANT_CFG_ADD
 #define GRANT_CFG_SET
 #define GRANT_CFG_GET

include/common/tmsg.h

@@ -416,7 +416,7 @@ static FORCE_INLINE SSchemaWrapper* tCloneSSchemaWrapper(const SSchemaWrapper* p
   return pSW;
 }
 
-static FORCE_INLINE void tDeleteSSchemaWrapper(SSchemaWrapper* pSchemaWrapper) {
+static FORCE_INLINE void tDeleteSchemaWrapper(SSchemaWrapper* pSchemaWrapper) {
   if (pSchemaWrapper) {
     taosMemoryFree(pSchemaWrapper->pSchema);
     taosMemoryFree(pSchemaWrapper);
@@ -691,6 +691,7 @@ typedef struct {
 
 int32_t tSerializeSAlterUserReq(void* buf, int32_t bufLen, SAlterUserReq* pReq);
 int32_t tDeserializeSAlterUserReq(void* buf, int32_t bufLen, SAlterUserReq* pReq);
+void    tFreeSAlterUserReq(SAlterUserReq* pReq);
 
 typedef struct {
   char user[TSDB_USER_LEN];
@@ -951,6 +952,9 @@ int32_t tSerializeSVDropTtlTableReq(void* buf, int32_t bufLen, SVDropTtlTableReq
 int32_t tDeserializeSVDropTtlTableReq(void* buf, int32_t bufLen, SVDropTtlTableReq* pReq);
 
 typedef struct {
+  char    db[TSDB_DB_FNAME_LEN];
+  int64_t dbId;
+  int32_t cfgVersion;
   int32_t numOfVgroups;
   int32_t numOfStables;
   int32_t buffer;
@@ -983,8 +987,13 @@ typedef struct {
   int16_t sstTrigger;
 } SDbCfgRsp;
 
+typedef SDbCfgRsp     SDbCfgInfo;
+
+int32_t tSerializeSDbCfgRspImpl(SEncoder *encoder, const SDbCfgRsp *pRsp);
 int32_t tSerializeSDbCfgRsp(void* buf, int32_t bufLen, const SDbCfgRsp* pRsp);
 int32_t tDeserializeSDbCfgRsp(void* buf, int32_t bufLen, SDbCfgRsp* pRsp);
+int32_t tDeserializeSDbCfgRspImpl(SDecoder* decoder, SDbCfgRsp *pRsp);
+void tFreeSDbCfgRsp(SDbCfgRsp *pRsp);
 
 typedef struct {
   int32_t rowNum;
@@ -1041,12 +1050,17 @@ int32_t tDeserializeSDnodeListRsp(void* buf, int32_t bufLen, SDnodeListRsp* pRsp
 void    tFreeSDnodeListRsp(SDnodeListRsp* pRsp);
 
 typedef struct {
-  SArray* pArray;  // Array of SUseDbRsp
-} SUseDbBatchRsp;
+  SUseDbRsp *useDbRsp;
+  SDbCfgRsp *cfgRsp;
+} SDbHbRsp;
 
-int32_t tSerializeSUseDbBatchRsp(void* buf, int32_t bufLen, SUseDbBatchRsp* pRsp);
-int32_t tDeserializeSUseDbBatchRsp(void* buf, int32_t bufLen, SUseDbBatchRsp* pRsp);
-void    tFreeSUseDbBatchRsp(SUseDbBatchRsp* pRsp);
+typedef struct {
+  SArray* pArray;  // Array of SDbHbRsp
+} SDbHbBatchRsp;
+
+int32_t tSerializeSDbHbBatchRsp(void* buf, int32_t bufLen, SDbHbBatchRsp* pRsp);
+int32_t tDeserializeSDbHbBatchRsp(void* buf, int32_t bufLen, SDbHbBatchRsp* pRsp);
+void    tFreeSDbHbBatchRsp(SDbHbBatchRsp* pRsp);
 
 typedef struct {
   SArray* pArray;  // Array of SGetUserAuthRsp
@@ -1232,6 +1246,14 @@ typedef struct {
   SEp     ep;
 } SDnodeEp;
 
+typedef struct {
+  int32_t id;
+  int8_t  isMnode;
+  SEp     ep;
+  char    active[TSDB_ACTIVE_KEY_LEN];
+  char    connActive[TSDB_CONN_ACTIVE_KEY_LEN];
+} SDnodeInfo;
+
 typedef struct {
   int64_t   dnodeVer;
   SDnodeCfg dnodeCfg;
@@ -1620,11 +1642,27 @@ typedef struct {
   char    fqdn[TSDB_FQDN_LEN];
   int32_t port;
   int8_t  force;
+  int8_t  unsafe;
 } SDropDnodeReq;
 
 int32_t tSerializeSDropDnodeReq(void* buf, int32_t bufLen, SDropDnodeReq* pReq);
 int32_t tDeserializeSDropDnodeReq(void* buf, int32_t bufLen, SDropDnodeReq* pReq);
 
+enum {
+  RESTORE_TYPE__ALL = 1,
+  RESTORE_TYPE__MNODE,
+  RESTORE_TYPE__VNODE,
+  RESTORE_TYPE__QNODE,
+};
+
+typedef struct {
+  int32_t dnodeId;
+  int8_t  restoreType;
+} SRestoreDnodeReq;
+
+int32_t tSerializeSRestoreDnodeReq(void* buf, int32_t bufLen, SRestoreDnodeReq* pReq);
+int32_t tDeserializeSRestoreDnodeReq(void* buf, int32_t bufLen, SRestoreDnodeReq* pReq);
+
 typedef struct {
   int32_t dnodeId;
   char    config[TSDB_DNODE_CONFIG_LEN];
@@ -1905,7 +1943,7 @@ typedef struct {
 #define STREAM_FILL_HISTORY_ON        1
 #define STREAM_FILL_HISTORY_OFF       0
 #define STREAM_DEFAULT_FILL_HISTORY   STREAM_FILL_HISTORY_OFF
-#define STREAM_DEFAULT_IGNORE_UPDATE  0
+#define STREAM_DEFAULT_IGNORE_UPDATE  1
 #define STREAM_CREATE_STABLE_TRUE     1
 #define STREAM_CREATE_STABLE_FALSE    0
 
@@ -2098,7 +2136,6 @@ static FORCE_INLINE void* tDeserializeSMVSubscribeReq(void* buf, SMVSubscribeReq
 
 typedef struct {
   char    key[TSDB_SUBSCRIBE_KEY_LEN];
-  SArray* lostConsumers;     // SArray<int64_t>
   SArray* removedConsumers;  // SArray<int64_t>
   SArray* newConsumers;      // SArray<int64_t>
 } SMqRebInfo;
@@ -2109,10 +2146,6 @@ static FORCE_INLINE SMqRebInfo* tNewSMqRebSubscribe(const char* key) {
     return NULL;
   }
   tstrncpy(pRebInfo->key, key, TSDB_SUBSCRIBE_KEY_LEN);
-  pRebInfo->lostConsumers = taosArrayInit(0, sizeof(int64_t));
-  if (pRebInfo->lostConsumers == NULL) {
-    goto _err;
-  }
   pRebInfo->removedConsumers = taosArrayInit(0, sizeof(int64_t));
   if (pRebInfo->removedConsumers == NULL) {
     goto _err;
@@ -2123,7 +2156,6 @@ static FORCE_INLINE SMqRebInfo* tNewSMqRebSubscribe(const char* key) {
   }
   return pRebInfo;
 _err:
-  taosArrayDestroy(pRebInfo->lostConsumers);
   taosArrayDestroy(pRebInfo->removedConsumers);
   taosArrayDestroy(pRebInfo->newConsumers);
   taosMemoryFreeClear(pRebInfo);
@@ -2908,6 +2940,42 @@ typedef struct SMqVgOffset {
 int32_t tEncodeMqVgOffset(SEncoder* pEncoder, const SMqVgOffset* pOffset);
 int32_t tDecodeMqVgOffset(SDecoder* pDecoder, SMqVgOffset* pOffset);
 
+typedef struct {
+  SMsgHead head;
+  int32_t  taskId;
+} SVPauseStreamTaskReq;
+
+typedef struct {
+  int8_t reserved;
+} SVPauseStreamTaskRsp;
+
+typedef struct {
+  char   name[TSDB_STREAM_FNAME_LEN];
+  int8_t igNotExists;
+} SMPauseStreamReq;
+
+int32_t tSerializeSMPauseStreamReq(void* buf, int32_t bufLen, const SMPauseStreamReq* pReq);
+int32_t tDeserializeSMPauseStreamReq(void* buf, int32_t bufLen, SMPauseStreamReq* pReq);
+
+typedef struct {
+  SMsgHead head;
+  int32_t  taskId;
+  int8_t   igUntreated;
+} SVResumeStreamTaskReq;
+
+typedef struct {
+  int8_t reserved;
+} SVResumeStreamTaskRsp;
+
+typedef struct {
+  char   name[TSDB_STREAM_FNAME_LEN];
+  int8_t igNotExists;
+  int8_t igUntreated;
+} SMResumeStreamReq;
+
+int32_t tSerializeSMResumeStreamReq(void* buf, int32_t bufLen, const SMResumeStreamReq* pReq);
+int32_t tDeserializeSMResumeStreamReq(void* buf, int32_t bufLen, SMResumeStreamReq* pReq);
+
 typedef struct {
   char    name[TSDB_TABLE_FNAME_LEN];
   char    stb[TSDB_TABLE_FNAME_LEN];
@@ -3429,10 +3497,10 @@ typedef struct {
   char     data[];  // SSubmitReq2
 } SSubmitReq2Msg;
 
-int32_t tEncodeSSubmitReq2(SEncoder* pCoder, const SSubmitReq2* pReq);
-int32_t tDecodeSSubmitReq2(SDecoder* pCoder, SSubmitReq2* pReq);
-void    tDestroySSubmitTbData(SSubmitTbData* pTbData, int32_t flag);
-void    tDestroySSubmitReq2(SSubmitReq2* pReq, int32_t flag);
+int32_t tEncodeSubmitReq(SEncoder* pCoder, const SSubmitReq2* pReq);
+int32_t tDecodeSubmitReq(SDecoder* pCoder, SSubmitReq2* pReq);
+void    tDestroySubmitTbData(SSubmitTbData* pTbData, int32_t flag);
+void    tDestroySubmitReq(SSubmitReq2* pReq, int32_t flag);
 
 typedef struct {
   int32_t affectedRows;

include/common/tmsgdef.h

@@ -178,6 +178,9 @@ enum {
   // TD_DEF_MSG_TYPE(TDMT_MND_STREAM_BEGIN_CHECKPOINT, "stream-begin-checkpoint", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_MAX_MSG, "mnd-max", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_BALANCE_VGROUP_LEADER, "balance-vgroup-leader", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_RESTORE_DNODE, "restore-dnode", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_PAUSE_STREAM, "pause-stream", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_RESUME_STREAM, "resume-stream", NULL, NULL)
 
   TD_NEW_MSG_SEG(TDMT_VND_MSG)
   TD_DEF_MSG_TYPE(TDMT_VND_SUBMIT, "submit", SSubmitReq, SSubmitRsp)
@@ -255,6 +258,8 @@ enum {
   TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_REPORT_CHECKPOINT, "stream-report-checkpoint", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_RESTORE_CHECKPOINT, "stream-restore-checkpoint", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_STREAM_MAX_MSG, "stream-max", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_PAUSE, "stream-task-pause", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_STREAM_TASK_RESUME, "stream-task-resume", NULL, NULL)
 
   TD_NEW_MSG_SEG(TDMT_MON_MSG)
   TD_DEF_MSG_TYPE(TDMT_MON_MAX_MSG, "monitor-max", NULL, NULL)

include/libs/catalog/catalog.h

@@ -82,6 +82,7 @@ typedef struct SCatalogReq {
   SArray* pUser;          // element is SUserAuthInfo
   SArray* pTableIndex;    // element is SNAME
   SArray* pTableCfg;      // element is SNAME
+  SArray* pTableTag;      // element is SNAME
   bool    qNodeRequired;  // valid qnode
   bool    dNodeRequired;  // valid dnode
   bool    svrVerRequired;
@@ -105,6 +106,7 @@ typedef struct SMetaData {
   SArray*   pUser;        // pRes = SUserAuthRes*
   SArray*   pQnodeList;   // pRes = SArray<SQueryNodeLoad>*
   SArray*   pTableCfg;    // pRes = STableCfg*
+  SArray*   pTableTag;    // pRes = SArray<STagVal>*
   SArray*   pDnodeList;   // pRes = SArray<SEpSet>*
   SMetaRes* pSvrVer;      // pRes = char*
 } SMetaData;
@@ -122,18 +124,19 @@ typedef struct SSTableVersion {
   char     stbName[TSDB_TABLE_NAME_LEN];
   uint64_t dbId;
   uint64_t suid;
-  int16_t  sversion;
-  int16_t  tversion;
+  int32_t  sversion;
+  int32_t  tversion;
   int32_t  smaVer;
 } SSTableVersion;
 
-typedef struct SDbVgVersion {
+typedef struct SDbCacheInfo {
   char    dbFName[TSDB_DB_FNAME_LEN];
   int64_t dbId;
   int32_t vgVersion;
+  int32_t cfgVersion;
   int32_t numOfTable;  // unit is TSDB_TABLE_NUM_UNIT
   int64_t stateTs;
-} SDbVgVersion;
+} SDbCacheInfo;
 
 typedef struct STbSVersion {
   char*   tbFName;
@@ -146,7 +149,6 @@ typedef struct SUserAuthVersion {
   int32_t version;
 } SUserAuthVersion;
 
-typedef SDbCfgRsp     SDbCfgInfo;
 typedef SUserIndexRsp SIndexInfo;
 
 typedef void (*catalogCallback)(SMetaData* pResult, void* param, int32_t code);
@@ -178,6 +180,8 @@ int32_t catalogGetDBVgInfo(SCatalog* pCtg, SRequestConnInfo* pConn, const char*
 
 int32_t catalogUpdateDBVgInfo(SCatalog* pCatalog, const char* dbName, uint64_t dbId, SDBVgInfo* dbInfo);
 
+int32_t catalogUpdateDbCfg(SCatalog* pCtg, const char* dbFName, uint64_t dbId, SDbCfgInfo* cfgInfo);
+
 int32_t catalogRemoveDB(SCatalog* pCatalog, const char* dbName, uint64_t dbId);
 
 int32_t catalogRemoveTableMeta(SCatalog* pCtg, SName* pTableName);
@@ -302,7 +306,7 @@ int32_t catalogGetDnodeList(SCatalog* pCatalog, SRequestConnInfo* pConn, SArray*
 
 int32_t catalogGetExpiredSTables(SCatalog* pCatalog, SSTableVersion** stables, uint32_t* num);
 
-int32_t catalogGetExpiredDBs(SCatalog* pCatalog, SDbVgVersion** dbs, uint32_t* num);
+int32_t catalogGetExpiredDBs(SCatalog* pCatalog, SDbCacheInfo** dbs, uint32_t* num);
 
 int32_t catalogGetExpiredUsers(SCatalog* pCtg, SUserAuthVersion** users, uint32_t* num);
 
@@ -312,6 +316,8 @@ int32_t catalogGetIndexMeta(SCatalog* pCtg, SRequestConnInfo* pConn, const char*
 
 int32_t catalogGetTableIndex(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pTableName, SArray** pRes);
 
+int32_t catalogGetTableTag(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pTableName, SArray** pRes);
+
 int32_t catalogRefreshGetTableCfg(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pTableName, STableCfg** pCfg);
 
 int32_t catalogUpdateTableIndex(SCatalog* pCtg, STableIndexRsp* pRsp);

include/libs/executor/executor.h

@@ -192,8 +192,6 @@ SArray* qGetQueriedTableListInfo(qTaskInfo_t tinfo);
 
 int32_t qStreamPrepareScan(qTaskInfo_t tinfo, STqOffsetVal* pOffset, int8_t subType);
 
-int32_t qStreamSetScanMemData(qTaskInfo_t tinfo, SPackedData submit);
-
 void qStreamSetOpen(qTaskInfo_t tinfo);
 
 void qStreamExtractOffset(qTaskInfo_t tinfo, STqOffsetVal* pOffset);
@@ -208,8 +206,6 @@ void* qExtractReaderFromStreamScanner(void* scanner);
 
 int32_t qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner);
 
-int32_t qStreamInput(qTaskInfo_t tinfo, void* pItem);
-
 int32_t qStreamSetParamForRecover(qTaskInfo_t tinfo);
 int32_t qStreamSourceRecoverStep1(qTaskInfo_t tinfo, int64_t ver);
 int32_t qStreamSourceRecoverStep2(qTaskInfo_t tinfo, int64_t ver);

include/libs/function/functionMgt.h

@@ -230,6 +230,7 @@ typedef enum EFuncDataRequired {
   FUNC_DATA_REQUIRED_SMA_LOAD,
   FUNC_DATA_REQUIRED_NOT_LOAD,
   FUNC_DATA_REQUIRED_FILTEROUT,
+  FUNC_DATA_REQUIRED_ALL_FILTEROUT,
 } EFuncDataRequired;
 
 EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow);

include/libs/nodes/cmdnodes.h

@@ -249,6 +249,7 @@ typedef struct SDropDnodeStmt {
   char      fqdn[TSDB_FQDN_LEN];
   int32_t   port;
   bool      force;
+  bool      unsafe;
 } SDropDnodeStmt;
 
 typedef struct SAlterDnodeStmt {
@@ -350,6 +351,11 @@ typedef struct SDropComponentNodeStmt {
   int32_t   dnodeId;
 } SDropComponentNodeStmt;
 
+typedef struct SRestoreComponentNodeStmt {
+  ENodeType type;
+  int32_t   dnodeId;
+} SRestoreComponentNodeStmt;
+
 typedef struct SCreateTopicStmt {
   ENodeType type;
   char      topicName[TSDB_TABLE_NAME_LEN];
@@ -436,6 +442,19 @@ typedef struct SDropStreamStmt {
   bool      ignoreNotExists;
 } SDropStreamStmt;
 
+typedef struct SPauseStreamStmt {
+  ENodeType type;
+  char      streamName[TSDB_TABLE_NAME_LEN];
+  bool      ignoreNotExists;
+} SPauseStreamStmt;
+
+typedef struct SResumeStreamStmt {
+  ENodeType type;
+  char      streamName[TSDB_TABLE_NAME_LEN];
+  bool      ignoreNotExists;
+  bool      ignoreUntreated;
+} SResumeStreamStmt;
+
 typedef struct SCreateFunctionStmt {
   ENodeType type;
   bool      orReplace;

include/libs/nodes/nodes.h

@@ -211,6 +211,12 @@ typedef enum ENodeType {
   QUERY_NODE_SHOW_DB_ALIVE_STMT,
   QUERY_NODE_SHOW_CLUSTER_ALIVE_STMT,
   QUERY_NODE_BALANCE_VGROUP_LEADER_STMT,
+  QUERY_NODE_RESTORE_DNODE_STMT,
+  QUERY_NODE_RESTORE_QNODE_STMT,
+  QUERY_NODE_RESTORE_MNODE_STMT,
+  QUERY_NODE_RESTORE_VNODE_STMT,
+  QUERY_NODE_PAUSE_STREAM_STMT,
+  QUERY_NODE_RESUME_STREAM_STMT,
 
   // logic plan node
   QUERY_NODE_LOGIC_PLAN_SCAN = 1000,
@@ -307,6 +313,7 @@ void    nodesDestroyAllocator(int64_t allocatorId);
 
 SNode* nodesMakeNode(ENodeType type);
 void   nodesDestroyNode(SNode* pNode);
+void   nodesFree(void* p);
 
 SNodeList* nodesMakeList();
 int32_t    nodesListAppend(SNodeList* pList, SNode* pNode);

include/libs/nodes/querynodes.h

@@ -379,6 +379,8 @@ typedef struct SVnodeModifyOpStmt {
   SName                 usingTableName;
   const char*           pBoundCols;
   struct STableMeta*    pTableMeta;
+  SNode*                pTagCond;
+  SArray*               pTableTag;
   SHashObj*             pVgroupsHashObj;
   SHashObj*             pTableBlockHashObj;  // SHashObj<tuid, STableDataCxt*>
   SHashObj*             pSubTableHashObj;

include/libs/qcom/query.h

@@ -116,8 +116,8 @@ typedef struct STableMeta {
 
   // if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta
   // info
-  int16_t       sversion;
-  int16_t       tversion;
+  int32_t       sversion;
+  int32_t       tversion;
   STableComInfo tableInfo;
   SSchema       schema[];
 } STableMeta;
@@ -260,6 +260,7 @@ int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst);
 int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst);
 int32_t cloneSVreateTbReq(SVCreateTbReq* pSrc, SVCreateTbReq** pDst);
 void    freeVgInfo(SDBVgInfo* vgInfo);
+void    freeDbCfgInfo(SDbCfgInfo *pInfo);
 
 extern int32_t (*queryBuildMsg[TDMT_MAX])(void* input, char** msg, int32_t msgSize, int32_t* msgLen,
                                           void* (*mallocFp)(int64_t));