Merge branch 'develop' into feature/TD-11220

870c16d4 · Ganlin Zhao · 4467ade7 · 4f24ebc0 · 870c16d4 · 870c16d4
112 changed file
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -247,14 +247,14 @@ pipeline {
                }
            }
            parallel {
-                stage ('build worker06_arm64') {
-                    agent {label " worker06_arm64 "}
+                stage ('build worker08_arm32') {
+                    agent {label " worker08_arm32 "}
                    steps {
                        timeout(time: 20, unit: 'MINUTES') {
                            pre_test()
                            script {
                                sh '''
-                                    echo "worker06_arm64 build done"
+                                    echo "worker08_arm32 build done"
                                    date
                                '''
                            }

--- a/README-CN.md
+++ b/README-CN.md
@@ -11,18 +11,29 @@

 # TDengine 简介

-TDengine是涛思数据专为物联网、车联网、工业互联网、IT运维等设计和优化的大数据平台。除核心的快10倍以上的时序数据库功能外，还提供缓存、数据订阅、流式计算等功能，最大程度减少研发和运维的复杂度，且核心代码，包括集群功能全部开源（开源协议，AGPL v3.0）。
+TDengine是一款高性能、分布式、支持SQL的时序数据库。而且除时序数据库功能外，它还提供缓存、数据订阅、流式计算等功能，最大程度减少研发和运维的复杂度，且核心代码，包括集群功能全部开源（开源协议，AGPL v3.0）。与其他时序数据数据库相比，TDengine有以下特点：

- 10 倍以上性能提升。定义了创新的数据存储结构，单核每秒就能处理至少2万次请求，插入数百万个数据点，读出一千万以上数据点，比现有通用数据库快了十倍以上。
- 硬件或云服务成本降至1/5。由于超强性能，计算资源不到通用大数据方案的1/5；通过列式存储和先进的压缩算法，存储空间不到通用数据库的1/10。
- 全栈时序数据处理引擎。将数据库、消息队列、缓存、流式计算等功能融合一起，应用无需再集成Kafka/Redis/HBase/Spark等软件，大幅降低应用开发和维护成本。
- 强大的分析功能。无论是十年前还是一秒钟前的数据，指定时间范围即可查询。数据可在时间轴上或多个设备上进行聚合。即席查询可通过Shell/Python/R/Matlab随时进行。
- 与第三方工具无缝连接。不用一行代码，即可与Telegraf, Grafana, EMQ X, Prometheus, Matlab, R集成。后续还将支持MQTT, OPC, Hadoop，Spark等, BI工具也将无缝连接。
- 零运维成本、零学习成本。安装、集群一秒搞定，无需分库分表，实时备份。标准SQL，支持JDBC,RESTful，支持Python/Java/C/C++/Go/Node.JS, 与MySQL相似，零学习成本。
+- **高性能**：通过创新的存储引擎设计，无论是数据写入还是查询，TDengine 的性能比通用数据库快10倍以上，也远超其他时序数据库，而且存储空间也大为节省。
+
+- **分布式**：通过原生分布式的设计，TDengine 提供了水平扩展的能力，只需要增加节点就能获得更强的数据处理能力，同时通过多副本机制保证了系统的高可用。
+
+- **支持SQL**：TDengine 采用 SQL 作为数据查询语言，减少学习和迁移成本，同时提供 SQL扩展来处理时序数据特有的分析，而且支持方便灵活的 schemaless 数据写入。
+
+- **All in One**。将数据库、消息队列、缓存、流式计算等功能融合一起，应用无需再集成Kafka/Redis/HBase/Spark等软件，大幅降低应用开发和维护成本。
+
+- **零管理**：安装、集群几秒搞定，无任何依赖，不用分库分表，系统运行状态监测能与 Grafana 或其他运维工具无缝集成。
+
+- **零学习成本**：采用SQL查询语言，支持Python, Java, C/C++, Go, Rust, Node.JS等多种编程语言,与MySQL相似，零学习成本。
+
+- **无缝集成**：不用一行代码，即可与 Telegraf, Grafana, EMQ X, Prometheus, StatsD, collectd, Matlab, R 等第三方工具无缝集成。
+
+- **互动Console**: 通过命令行 console，不用编程，执行 SQL 语句就能做即席查询、各种数据库的操作、管理以及集群的维护.
+
+TDengine可以广泛应用于物联网、工业互联网、车联网、IT运维、能源、金融等领域, 让大量设备、数据采集器每天产生的高达TB甚至PB级的数据能得到高效实时的处理，对业务的运行状态进行实时的监测、预警，从大数据中挖掘出商业价值。

 # 文档

-TDengine是一个高效的存储、查询、分析时序大数据的平台，专为物联网、车联网、工业互联网、运维监测等优化而设计。您可以像使用关系型数据库MySQL一样来使用它，但建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](https://www.taosdata.com/cn/documentation/architecture) 与 [数据建模](https://www.taosdata.com/cn/documentation/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。
+TDengine采用传统的关系数据库模型，您可以像使用关系型数据库MySQL一样来使用它。但由于引入了超级表，一个采集点一张表的概念，建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](https://www.taosdata.com/cn/documentation/architecture) 与 [数据建模](https://www.taosdata.com/cn/documentation/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。

 # 构建


--- a/README.md
+++ b/README.md
@@ -11,19 +11,25 @@ We are hiring, check [here](https://www.taosdata.com/en/careers/)

 # What is TDengine？

-TDengine is an open-sourced big data platform under [GNU AGPL v3.0](http://www.gnu.org/licenses/agpl-3.0.html), designed and optimized for the Internet of Things (IoT), Connected Cars, Industrial IoT, and IT Infrastructure and Application Monitoring. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and cost of development and operation.
+TDengine is a high-performance, scalable time-series database with SQL support. Its code including cluster feature is open source under [GNU AGPL v3.0](http://www.gnu.org/licenses/agpl-3.0.html). Besides the database, it provides caching, stream processing, data data subscription and other functionalities to reduce the complexity and cost of development and operation. TDengine differentiates itself from other TSDBs with the following advanatages.

- **10x Faster on Insert/Query Speeds**: Through the innovative design on storage, on a single-core machine, over 20K requests can be processed, millions of data points can be ingested, and over 10 million data points can be retrieved in a second. It is 10 times faster than other databases.
+- **High Peroformance**: TDengine outperforms other time series databases in data ingestion and querying while significantly reducing storage cost and compute costs, with an innovatively designed and purpose-built storage engine. 

- **1/5 Hardware/Cloud Service Costs**: Compared with typical big data solutions, less than 1/5 of computing resources are required. Via column-based storage and tuned compression algorithms for different data types, less than 1/10 of storage space is needed.
+- **Scalable**: TDengine provides out-of-box scalability and high-availability through its native distributed design. Nodes can be added through simple configuration to achieve greater data processing power. In addition, this feature is open source.

- **Full Stack for Time-Series Data**: By integrating a database with message queuing, caching, and stream computing features together, it is no longer necessary to integrate Kafka/Redis/HBase/Spark or other software. It makes the system architecture much simpler and more robust.
+- **SQL Support**: TDengine uses SQL as the query language, thereby reducing learning and migration costs, while adding SQL extensions to handle time-series data better, and supporting convenient and flexible schemaless data ingestion.

- **Powerful Data Analysis**: Whether it is 10 years or one minute ago, data can be queried just by specifying the time range. Data can be aggregated over time, multiple time streams or both. Ad Hoc queries or analyses can be executed via TDengine shell, Python, R or Matlab.
+- **All in One**: TDengine has built-in caching, stream processing and data subscription functions, it is no longer necessary to integrate Kafka/Redis/HBase/Spark or other software in some scenarios. It makes the system architecture much simpler and easy to maintain.

- **Seamless Integration with Other Tools**: Telegraf, Grafana, Matlab, R, and other tools can be integrated with TDengine without a line of code. MQTT, OPC, Hadoop, Spark, and many others will be integrated soon.
+- **Seamless Integration**: Without a single line of code, TDengine provide seamless integration with third-party tools such as Telegraf, Grafana, EMQ X, Prometheus, StatsD, collectd, etc. More will be integrated.
+ 
+- **Zero Management**: Installation and cluster setup can be done in seconds. Data partitioning and sharding are executed automatically. TDengine’s running status can be monitored via Grafana or other DevOps tools. 

- **Zero Management, No Learning Curve**: It takes only seconds to download, install, and run it successfully; there are no other dependencies. Automatic partitioning on tables or DBs. Standard SQL is used, with C/C++, Python, JDBC, Go and RESTful connectors.
+- **Zero Learning Cost**: With SQL as the query language, support for ubiquitous tools like Python, Java, C/C++, Go, Rust, Node.js connectors, there is zero learning cost.
+
+- **Interactive Console**: TDengine provides convenient console access to the database to run ad hoc queries, maintain the database, or manage the cluster without any programming.
+
+TDengine can be widely applied to Internet of Things (IoT), Connected Vehicles, Industrial IoT, DevOps, energy, finance and many other scenarios. 

 # Documentation


--- a/TDenginelogo.png
+++ b/TDenginelogo.png
--- a/cmake/install.inc
+++ b/cmake/install.inc
@@ -9,11 +9,12 @@ ELSEIF (TD_WINDOWS)
  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/nodejs DESTINATION connector)
  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/python DESTINATION connector)
  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/C\# DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
+  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/examples DESTINATION .)
  INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
  INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
  INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taoserror.h DESTINATION include)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos_static.lib DESTINATION driver)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)

--- a/documentation20/cn/00.index/docs.md
+++ b/documentation20/cn/00.index/docs.md
--- a/documentation20/cn/02.getting-started/03.install/docs.md
+++ b/documentation20/cn/02.getting-started/03.install/docs.md
@@ -11,24 +11,27 @@ TDengine 开源版本提供 deb 和 rpm 格式安装包，用户可以根据自
 2、进入到TDengine-server-2.0.0.0-Linux-x64.deb安装包所在目录，执行如下的安装命令：

 ```
-plum@ubuntu:~/git/taosv16$ sudo dpkg -i TDengine-server-2.0.0.0-Linux-x64.deb
-
-Selecting previously unselected package tdengine.
-(Reading database ... 233181 files and directories currently installed.)
-Preparing to unpack TDengine-server-2.0.0.0-Linux-x64.deb ...
-Failed to stop taosd.service: Unit taosd.service not loaded.
-Stop taosd service success!
-Unpacking tdengine (2.0.0.0) ...
-Setting up tdengine (2.0.0.0) ...
-Start to install TDEngine...
-Synchronizing state of taosd.service with SysV init with /lib/systemd/systemd-sysv-install...
-Executing /lib/systemd/systemd-sysv-install enable taosd
-insserv: warning: current start runlevel(s) (empty) of script `taosd' overrides LSB defaults (2 3 4 5).
-insserv: warning: current stop runlevel(s) (0 1 2 3 4 5 6) of script `taosd' overrides LSB defaults (0 1 6).
-Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :
+$ sudo dpkg -i TDengine-server-2.4.0.7-Linux-x64.deb
+(Reading database ... 137504 files and directories currently installed.)
+Preparing to unpack TDengine-server-2.4.0.7-Linux-x64.deb ...
+TDengine is removed successfully!
+Unpacking tdengine (2.4.0.7) over (2.4.0.7) ...
+Setting up tdengine (2.4.0.7) ...
+Start to install TDengine...
+
+System hostname is: shuduo-1804
+
+Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
+OR leave it blank to build one:
+
+Enter your email address for priority support or enter empty to skip:
+Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
+
 To configure TDengine : edit /etc/taos/taos.cfg
 To start TDengine     : sudo systemctl start taosd
-To access TDengine    : use taos in shell
+To access TDengine    : taos -h shuduo-1804 to login into TDengine server
+
+
 TDengine is installed successfully!
 ```

@@ -41,10 +44,10 @@ TDengine is installed successfully!
 卸载命令如下:

 ```
-    plum@ubuntu:~/git/tdengine/debs$ sudo dpkg -r tdengine
-    (Reading database ... 233482 files and directories currently installed.)
-    Removing tdengine (2.0.0.0) ...
-    TDEngine is removed successfully!
+$ sudo dpkg -r tdengine
+(Reading database ... 137504 files and directories currently installed.)
+Removing tdengine (2.4.0.7) ...
+TDengine is removed successfully!
 ```

 ## rpm包的安装和卸载
@@ -55,16 +58,27 @@ TDengine is installed successfully!
 2、进入到TDengine-server-2.0.0.0-Linux-x64.rpm安装包所在目录，执行如下的安装命令：

 ```
-    [root@bogon x86_64]# rpm -iv TDengine-server-2.0.0.0-Linux-x64.rpm
-    Preparing packages...
-    TDengine-2.0.0.0-3.x86_64
-    Start to install TDEngine...
-    Created symlink from /etc/systemd/system/multi-user.target.wants/taosd.service to /etc/systemd/system/taosd.service.
-    Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :
-    To configure TDengine : edit /etc/taos/taos.cfg
-    To start TDengine     : sudo systemctl start taosd
-    To access TDengine    : use taos in shell
-    TDengine is installed successfully!
+$ sudo rpm -ivh TDengine-server-2.4.0.7-Linux-x64.rpm
+Preparing...                          ################################# [100%]
+Updating / installing...
+   1:tdengine-2.4.0.7-3               ################################# [100%]
+Start to install TDengine...
+
+System hostname is: centos7
+
+Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
+OR leave it blank to build one:
+
+Enter your email address for priority support or enter empty to skip:
+
+Created symlink from /etc/systemd/system/multi-user.target.wants/taosd.service to /etc/systemd/system/taosd.service.
+
+To configure TDengine : edit /etc/taos/taos.cfg
+To start TDengine     : sudo systemctl start taosd
+To access TDengine    : taos -h centos7 to login into TDengine server
+
+
+TDengine is installed successfully!
 ```

 ### 卸载 rpm
@@ -72,8 +86,8 @@ TDengine is installed successfully!
 卸载命令如下:

 ```
-    [root@bogon x86_64]# rpm -e tdengine
-    TDEngine is removed successfully!
+$ sudo rpm -e tdengine
+TDengine is removed successfully!
 ```

 ## tar.gz 格式安装包的安装和卸载
@@ -84,37 +98,47 @@ TDengine is installed successfully!
 2、进入到TDengine-server-2.0.0.0-Linux-x64.tar.gz安装包所在目录，先解压文件后，进入子目录，执行其中的install.sh安装脚本：

 ```
-    plum@ubuntu:~/git/tdengine/release$ sudo tar -xzvf TDengine-server-2.0.0.0-Linux-x64.tar.gz
-    plum@ubuntu:~/git/tdengine/release$ ll
-    total 3796
-    drwxr-xr-x  3 root root    4096 Aug  9 14:20 ./
-    drwxrwxr-x 11 plum plum    4096 Aug  8 11:03 ../
-    drwxr-xr-x  5 root root    4096 Aug  8 11:03 TDengine-server/
-    -rw-r--r--  1 root root 3871844 Aug  8 11:03 TDengine-server-2.0.0.0-Linux-x64.tar.gz
-    plum@ubuntu:~/git/tdengine/release$ cd TDengine-server/
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ ll
-    total 2640
-    drwxr-xr-x 5 root root    4096 Aug  8 11:03 ./
-    drwxr-xr-x 3 root root    4096 Aug  9 14:20 ../
-    drwxr-xr-x 5 root root    4096 Aug  8 11:03 connector/
-    drwxr-xr-x 2 root root    4096 Aug  8 11:03 driver/
-    drwxr-xr-x 8 root root    4096 Aug  8 11:03 examples/
-    -rwxr-xr-x 1 root root   13095 Aug  8 11:03 install.sh*
-    -rw-r--r-- 1 root root 2651954 Aug  8 11:03 taos.tar.gz
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ sudo ./install.sh
-    This is ubuntu system
-    verType=server interactiveFqdn=yes
-    Start to install TDengine...
-    Synchronizing state of taosd.service with SysV init with /lib/systemd/systemd-sysv-install...
-    Executing /lib/systemd/systemd-sysv-install enable taosd
-    insserv: warning: current start runlevel(s) (empty) of script `taosd' overrides LSB defaults (2 3 4 5).
-    insserv: warning: current stop runlevel(s) (0 1 2 3 4 5 6) of script `taosd' overrides LSB defaults (0 1 6).
-    Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :hostname.taosdata.com:7030
-    To configure TDengine : edit /etc/taos/taos.cfg
-    To start TDengine     : sudo systemctl start taosd
-    To access TDengine    : use taos in shell
-    Please run: taos -h hostname.taosdata.com:7030  to login into cluster, then execute : create dnode 'newDnodeFQDN:port'; in TAOS shell to add this new node into the clsuter
-    TDengine is installed successfully!
+$ tar xvzf TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
+TDengine-enterprise-server-2.4.0.7/
+TDengine-enterprise-server-2.4.0.7/driver/
+TDengine-enterprise-server-2.4.0.7/driver/vercomp.txt
+TDengine-enterprise-server-2.4.0.7/driver/libtaos.so.2.4.0.7
+TDengine-enterprise-server-2.4.0.7/install.sh
+TDengine-enterprise-server-2.4.0.7/examples/
+...
+
+$ ll
+total 43816
+drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ./
+drwxr-xr-x 20 ubuntu ubuntu     4096 Feb 22 09:30 ../
+drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 TDengine-enterprise-server-2.4.0.7/
+-rw-rw-r--  1 ubuntu ubuntu 44852544 Feb 22 09:31 TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
+
+$ cd TDengine-enterprise-server-2.4.0.7/
+
+ $ ll
+total 40784
+drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 ./
+drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ../
+drwxrwxr-x  2 ubuntu ubuntu     4096 Feb 22 09:30 driver/
+drwxrwxr-x 10 ubuntu ubuntu     4096 Feb 22 09:30 examples/
+-rwxrwxr-x  1 ubuntu ubuntu    33294 Feb 22 09:30 install.sh*
+-rw-rw-r--  1 ubuntu ubuntu 41704288 Feb 22 09:30 taos.tar.gz
+
+$ sudo ./install.sh
+
+Start to update TDengine...
+Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
+Nginx for TDengine is updated successfully!
+
+To configure TDengine : edit /etc/taos/taos.cfg
+To configure Taos Adapter (if has) : edit /etc/taos/taosadapter.toml
+To start TDengine     : sudo systemctl start taosd
+To access TDengine    : use taos -h shuduo-1804 in shell OR from http://127.0.0.1:6060
+
+TDengine is updated successfully!
+Install taoskeeper as a standalone service
+taoskeeper is installed, enable it by `systemctl enable taoskeeper`
 ```

 说明：install.sh 安装脚本在执行过程中，会通过命令行交互界面询问一些配置信息。如果希望采取无交互安装方式，那么可以用 -e no 参数来执行 install.sh 脚本。运行 ./install.sh -h 指令可以查看所有参数的详细说明信息。
@@ -124,8 +148,11 @@ TDengine is installed successfully!
 卸载命令如下:

 ```
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ rmtaos
-    TDEngine is removed successfully!
+$ rmtaos
+Nginx for TDengine is running, stopping it...
+TDengine is removed successfully!
+
+taosKeeper is removed successfully!
 ```

 ## 安装目录说明
@@ -133,19 +160,19 @@ TDengine is installed successfully!
 TDengine成功安装后，主安装目录是/usr/local/taos，目录内容如下：

 ```
-    plum@ubuntu:/usr/local/taos$ cd /usr/local/taos
-    plum@ubuntu:/usr/local/taos$ ll
-    total 36
-    drwxr-xr-x  9 root root 4096 7月  30 19:20 ./
-    drwxr-xr-x 13 root root 4096 7月  30 19:20 ../
-    drwxr-xr-x  2 root root 4096 7月  30 19:20 bin/
-    drwxr-xr-x  2 root root 4096 7月  30 19:20 cfg/
-    lrwxrwxrwx  1 root root   13 7月  30 19:20 data -> /var/lib/taos/
-    drwxr-xr-x  2 root root 4096 7月  30 19:20 driver/
-    drwxr-xr-x  8 root root 4096 7月  30 19:20 examples/
-    drwxr-xr-x  2 root root 4096 7月  30 19:20 include/
-    drwxr-xr-x  2 root root 4096 7月  30 19:20 init.d/
-    lrwxrwxrwx  1 root root   13 7月  30 19:20 log -> /var/log/taos/
+$ cd /usr/local/taos
+$ ll
+$ ll
+total 28
+drwxr-xr-x  7 root root 4096 Feb 22 09:34 ./
+drwxr-xr-x 12 root root 4096 Feb 22 09:34 ../
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 bin/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 cfg/
+lrwxrwxrwx  1 root root   13 Feb 22 09:34 data -> /var/lib/taos/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 driver/
+drwxr-xr-x 10 root root 4096 Feb 22 09:34 examples/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 include/
+lrwxrwxrwx  1 root root   13 Feb 22 09:34 log -> /var/log/taos/
 ```

 - 自动生成配置文件目录、数据库目录、日志目录。
@@ -169,7 +196,7 @@ TDengine成功安装后，主安装目录是/usr/local/taos，目录内容如下
 - 对于deb包安装后，如果安装目录被手工误删了部分，出现卸载、或重新安装不能成功。此时，需要清除 tdengine 包的安装信息，执行如下命令：

 ```
-    plum@ubuntu:~/git/tdengine/$ sudo rm -f /var/lib/dpkg/info/tdengine*
+$ sudo rm -f /var/lib/dpkg/info/tdengine*
 ```

 然后再重新进行安装就可以了。
@@ -177,7 +204,7 @@ TDengine成功安装后，主安装目录是/usr/local/taos，目录内容如下
 - 对于rpm包安装后，如果安装目录被手工误删了部分，出现卸载、或重新安装不能成功。此时，需要清除tdengine包的安装信息，执行如下命令：

 ```
-    [root@bogon x86_64]# rpm -e --noscripts tdengine
+$ sudo rpm -e --noscripts tdengine
 ```

 然后再重新进行安装就可以了。
--- a/documentation20/cn/02.getting-started/docs.md
+++ b/documentation20/cn/02.getting-started/docs.md
@@ -2,7 +2,8 @@

 ## <a class="anchor" id="install"></a>快捷安装

-TDengine 包括服务端、客户端和周边生态工具软件，目前 2.0 版服务端仅在 Linux 系统上安装和运行，后续将支持 Windows、Mac OS 等系统。客户端可以在 Windows 或 Linux 上安装和运行。在任何操作系统上的应用都可以使用 RESTful 接口连接服务端程序 taosd，其中 2.4 之后版本默认使用单独运行的独立组件 taosAdapter 提供 http 服务和更多数据写入方式。taosAdapter 需要手动启动。而之前版本 TDengine 使用内置 http 服务。
+TDengine 包括服务端、客户端和周边生态工具软件，目前 2.0 版服务端仅在 Linux 系统上安装和运行，后续将支持 Windows、Mac OS 等系统。客户端可以在 Windows 或 Linux 上安装和运行。在任何操作系统上的应用都可以使用 RESTful 接口连接服务端程序 taosd，其中 2.4 之后版本默认使用单独运行的独立组件 taosAdapter 提供 http 服务和更多数据写入方式。taosAdapter 需要手动启动。
+之前版本 TDengine 服务端，以及所有服务端lite版，均使用内置 http 服务。

 TDengine 支持 X64/ARM64/MIPS64/Alpha64 硬件平台，后续将支持 ARM32、RISC-V 等 CPU 架构。

@@ -16,9 +17,18 @@ docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengin

 注：暂时不建议生产环境采用 Docker 来部署 TDengine 的客户端或服务端，但在开发环境下或初次尝试时，使用 Docker 方式部署是十分方便的。特别是，利用 Docker，可以方便地在 Mac OS X 和 Windows 环境下尝试 TDengine。

+从 2.4.0.10 开始，除taosd以外，docker镜像还包含：taos、taosAdapter、taosdump、taosBenchmark、TDinsight安装脚本和示例代码。启动docker容器时，将同时启动taosAdapter和taosd，实现对restful的支持。
+
+
 ### <a class="anchor" id="package-install"></a>通过安装包安装

-TDengine 的安装非常简单，从下载到安装成功仅仅只要几秒钟。为方便使用，标准的服务端安装包包含了客户端程序和示例代码；如果您只需要用到服务端程序和客户端连接的 C/C++ 语言支持，也可以仅下载 lite 版本的安装包。在安装包格式上，我们提供 rpm 和 deb 格式，也为企业客户提供 tar.gz 格式安装包，以方便在特定操作系统上使用。发布版本包括稳定版和 Beta 版，Beta版含有更多新功能。正式上线或测试建议安装稳定版。您可以根据需要选择下载：
+TDengine 的安装非常简单，从下载到安装成功仅仅只要几秒钟。
+
+为方便使用，从 2.4.0.10 开始，标准的服务端安装包包含了taos、taosd、taosAdapter、taosdump、taosBenchmark、TDinsight安装脚本和示例代码；如果您只需要用到服务端程序和客户端连接的 C/C++ 语言支持，也可以仅下载 lite 版本的安装包。
+
+在安装包格式上，我们提供tar.gz, rpm 和 deb 格式，为企业客户提供 tar.gz 格式安装包，以方便在特定操作系统上使用。需要注意的是，rpm和deb包不含taosdump、taosBenchmark和TDinsight安装脚本，这些工具需要通过安装taosTool包获得。
+
+发布版本包括稳定版和 Beta 版，Beta版含有更多新功能。正式上线或测试建议安装稳定版。您可以根据需要选择下载：

 <ul id="server-packageList" class="package-list"></ul>


--- a/documentation20/cn/05.insert/docs.md
+++ b/documentation20/cn/05.insert/docs.md
@@ -315,7 +315,7 @@ taosAdapter 相关配置参数请参考 taosadapter --help 命令输出以及相

 ## <a class="anchor" id="emq"></a>EMQ Broker 直接写入

-MQTT是流行的物联网数据传输协议，[EMQ](https://github.com/emqx/emqx)是一开源的MQTT Broker软件，无需任何代码，只需要在EMQ Dashboard里使用“规则”做简单配置，即可将MQTT的数据直接写入TDengine。EMQ X 支持通过 发送到 Web 服务的方式保存数据到 TDEngine，也在企业版上提供原生的 TDEngine 驱动实现直接保存。详细使用方法请参考 [EMQ 官方文档](https://docs.emqx.io/broker/latest/cn/rule/rule-example.html#%E4%BF%9D%E5%AD%98%E6%95%B0%E6%8D%AE%E5%88%B0-tdengine)。
+MQTT是流行的物联网数据传输协议，[EMQ](https://github.com/emqx/emqx)是一开源的MQTT Broker软件，无需任何代码，只需要在EMQ Dashboard里使用“规则”做简单配置，即可将MQTT的数据直接写入TDengine。EMQ X 支持通过 发送到 Web 服务的方式保存数据到 TDengine，也在企业版上提供原生的 TDengine 驱动实现直接保存。详细使用方法请参考 [EMQ 官方文档](https://docs.emqx.com/zh/enterprise/v4.4/rule/backend_tdengine.html#%E4%BF%9D%E5%AD%98%E6%95%B0%E6%8D%AE%E5%88%B0-tdengine)。

 ## <a class="anchor" id="hivemq"></a>HiveMQ Broker 直接写入


--- a/documentation20/cn/07.advanced-features/docs.md
+++ b/documentation20/cn/07.advanced-features/docs.md
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -56,15 +56,15 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(
 ## <a class="anchor" id="version"></a>TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本

 | taos-jdbcdriver 版本 | TDengine 2.0.x.x 版本 | TDengine 2.2.x.x 版本 | TDengine 2.4.x.x 版本 | JDK 版本 |
-|---------------------| ----------------------| ----------------------| ----------------------| -------- |
-| 2.0.37              |            X          |            X          | 2.4.0.6 以上           | 1.8.x    |
-| 2.0.36              |            X          | 2.2.2.11 以上          | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
-| 2.0.35              |            X          | 2.2.2.11 以上          | 2.3.0.0 - 2.4.0.5     | 1.8.x    |
-| 2.0.33 - 2.0.34     | 2.0.3.0 以上           | 2.2.0.0 以上           | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
-| 2.0.31 - 2.0.32     | 2.1.3.0 - 2.1.7.7     |            X          |            X          | 1.8.x    |
-| 2.0.22 - 2.0.30     | 2.0.18.0 - 2.1.2.1    |            X          |            X          | 1.8.x    |
-| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.4    |            X          |            X          | 1.8.x    |
-| 2.0.4 - 2.0.11      | 2.0.0.0 - 2.0.7.3     |            X          |            X          | 1.8.x    |
+| -------------------- | --------------------- | --------------------- | --------------------- | -------- |
+| 2.0.37               | X                     | X                     | 2.4.0.6 以上          | 1.8.x    |
+| 2.0.36               | X                     | 2.2.2.11 以上         | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.35               | X                     | 2.2.2.11 以上         | 2.3.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.33 - 2.0.34      | 2.0.3.0 以上          | 2.2.0.0 以上          | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.31 - 2.0.32      | 2.1.3.0 - 2.1.7.7     | X                     | X                     | 1.8.x    |
+| 2.0.22 - 2.0.30      | 2.0.18.0 - 2.1.2.1    | X                     | X                     | 1.8.x    |
+| 2.0.12 - 2.0.21      | 2.0.8.0 - 2.0.17.4    | X                     | X                     | 1.8.x    |
+| 2.0.4 - 2.0.11       | 2.0.0.0 - 2.0.7.3     | X                     | X                     | 1.8.x    |


 ## TDengine DataType 和 Java DataType
@@ -72,18 +72,18 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(
 TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对应类型转换如下：

 | TDengine DataType | JDBCType （driver 版本 < 2.0.24） | JDBCType （driver 版本 >= 2.0.24） |
-|-------------------|-------------------------------| ------------------ |
-| TIMESTAMP         | java.lang.Long                | java.sql.Timestamp |
-| INT               | java.lang.Integer             | java.lang.Integer  |
-| BIGINT            | java.lang.Long                | java.lang.Long     |
-| FLOAT             | java.lang.Float               | java.lang.Float    |
-| DOUBLE            | java.lang.Double              | java.lang.Double   |
-| SMALLINT          | java.lang.Short               | java.lang.Short    |
-| TINYINT           | java.lang.Byte                | java.lang.Byte     |
-| BOOL              | java.lang.Boolean             | java.lang.Boolean  |
-| BINARY            | java.lang.String              | byte array         |
-| NCHAR             | java.lang.String              | java.lang.String   |
-| JSON              | -                             | java.lang.String   |
+| ----------------- | --------------------------------- | ---------------------------------- |
+| TIMESTAMP         | java.lang.Long                    | java.sql.Timestamp                 |
+| INT               | java.lang.Integer                 | java.lang.Integer                  |
+| BIGINT            | java.lang.Long                    | java.lang.Long                     |
+| FLOAT             | java.lang.Float                   | java.lang.Float                    |
+| DOUBLE            | java.lang.Double                  | java.lang.Double                   |
+| SMALLINT          | java.lang.Short                   | java.lang.Short                    |
+| TINYINT           | java.lang.Byte                    | java.lang.Byte                     |
+| BOOL              | java.lang.Boolean                 | java.lang.Boolean                  |
+| BINARY            | java.lang.String                  | byte array                         |
+| NCHAR             | java.lang.String                  | java.lang.String                   |
+| JSON              | -                                 | java.lang.String                   |

 注意：JSON类型仅在tag中支持。

@@ -177,7 +177,7 @@ url中的配置参数如下：
 * timezone：客户端使用的时区，默认值为系统当前时区。
 * batchfetch: 仅在使用JDBC-JNI时生效。true：在执行查询时批量拉取结果集；false：逐行拉取结果集。默认值为：false。
 * timestampFormat: 仅在使用JDBC-RESTful时生效. 'TIMESTAMP'：结果集中timestamp类型的字段为一个long值; 'UTC'：结果集中timestamp类型的字段为一个UTC时间格式的字符串; 'STRING'：结果集中timestamp类型的字段为一个本地时间格式的字符串。默认值为'STRING'。
-* batchErrorIgnore：true：在执行Statement的executeBatch时，如果中间有一条sql执行失败，继续执行下面的sq了。false：不再执行失败sql后的任何语句。默认值为：false。
+* batchErrorIgnore：true：在执行Statement的executeBatch时，如果中间有一条sql执行失败，继续执行下面的sql了。false：不再执行失败sql后的任何语句。默认值为：false。

 #### 指定URL和Properties获取连接

@@ -345,6 +345,7 @@ JDBC连接器可能报错的错误码包括3种：JDBC driver本身的报错（
 * setString 和 setNString 都要求用户在 size 参数里声明表定义中对应列的列宽

 示例代码：
+
 ```java
 public class ParameterBindingDemo {
 
@@ -572,6 +573,7 @@ public class ParameterBindingDemo {
 ```

 用于设定 TAGS 取值的方法总共有：
+
 ```java
 public void setTagNull(int index, int type)
 public void setTagBoolean(int index, boolean value)
@@ -587,6 +589,7 @@ public void setTagNString(int index, String value)
 ```

 用于设定 VALUES 数据列的取值的方法总共有：
+
 ```java
 public void setInt(int columnIndex, ArrayList<Integer> list) throws SQLException
 public void setFloat(int columnIndex, ArrayList<Float> list) throws SQLException
@@ -600,14 +603,56 @@ public void setString(int columnIndex, ArrayList<String> list, int size) throws
 public void setNString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 ```

+### <a class="anchor" id="schemaless_java"></a>无模式写入
+
+从 2.2.0.0 版本开始，TDengine 增加了对无模式写入功能。无模式写入兼容 InfluxDB 的 行协议（Line Protocol）、OpenTSDB 的 telnet 行协议和 OpenTSDB 的 JSON 格式协议。详情请参见[无模式写入](https://www.taosdata.com/docs/cn/v2.0/insert#schemaless)。
+
+注意：
+* JDBC-RESTful 实现并不提供无模式写入这种使用方式
+* 以下示例代码基于taos-jdbcdriver-2.0.36
+
+示例代码：
+
+```java
+public class SchemalessInsertTest {
+    private static final String host = "127.0.0.1";
+    private static final String lineDemo = "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000";
+    private static final String telnetDemo = "stb0_0 1626006833 4 host=host0 interface=eth0";
+    private static final String jsonDemo = "{\"metric\": \"meter_current\",\"timestamp\": 1346846400,\"value\": 10.3, \"tags\": {\"groupid\": 2, \"location\": \"Beijing\", \"id\": \"d1001\"}}";
+
+    public static void main(String[] args) throws SQLException {
+        final String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+        try (Connection connection = DriverManager.getConnection(url)) {
+            init(connection);
+
+            SchemalessWriter writer = new SchemalessWriter(connection);
+            writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
+            writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
+            writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.NOT_CONFIGURED);
+        }
+    }
+
+    private static void init(Connection connection) throws SQLException {
+        try (Statement stmt = connection.createStatement()) {
+            stmt.executeUpdate("drop database if exists test_schemaless");
+            stmt.executeUpdate("create database if not exists test_schemaless");
+            stmt.executeUpdate("use test_schemaless");
+        }
+    }
+}
+```
+
 ### <a class="anchor" id="set-client-configuration"></a>设置客户端参数
+
 从TDengine-2.3.5.0版本开始，jdbc driver支持在应用的第一次连接中，设置TDengine的客户端参数。Driver支持JDBC-JNI方式中，通过jdbcUrl和properties两种方式设置client parameter。
+
 注意：
 * JDBC-RESTful不支持设置client parameter的功能。
 * 应用中设置的client parameter为进程级别的，即如果要更新client的参数，需要重启应用。这是因为client parameter是全局参数，仅在应用程序的第一次设置生效。
 * 以下示例代码基于taos-jdbcdriver-2.0.36。

 示例代码：
+
 ```java
 public class ClientParameterSetting {
    private static final String host = "127.0.0.1";

--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
--- a/documentation20/cn/11.administrator/docs.md
+++ b/documentation20/cn/11.administrator/docs.md
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -4,7 +4,7 @@

 TAOS SQL 是用户对 TDengine 进行数据写入和查询的主要工具。TAOS SQL 为了便于用户快速上手，在一定程度上提供类似于标准 SQL 类似的风格和模式。严格意义上，TAOS SQL 并不是也不试图提供 SQL 标准的语法。此外，由于 TDengine 针对的时序性结构化数据不提供删除功能，因此在 TAO SQL 中不提供数据删除的相关功能。

-TAOS SQL 不支持关键字的缩写，例如 DESCRIBE 不能缩写为 DESC。 
+TAOS SQL 目前仅支持 DESCRIBE 关键字的缩写，DESCRIBE 可以缩写为 DESC。

 本章节 SQL 语法遵循如下约定：

@@ -135,7 +135,7 @@ CREATE DATABASE db_name PRECISION 'ns';
    ```mysql
    ALTER DATABASE db_name BLOCKS 100;
    ```
-    BLOCKS 参数是每个 VNODE (TSDB) 中有多少 cache 大小的内存块，因此一个 VNODE 的用的内存大小粗略为（cache * blocks）。取值范围 [3, 1000]。
+    BLOCKS 参数是每个 VNODE (TSDB) 中有多少 cache 大小的内存块，因此一个 VNODE 的用的内存大小粗略为（cache * blocks）。取值范围 [3, 10000]。

    ```mysql
    ALTER DATABASE db_name CACHELAST 0;

--- a/documentation20/en/00.index/docs.md
+++ b/documentation20/en/00.index/docs.md
@@ -84,10 +84,9 @@ TDengine is a highly efficient platform to store, query, and analyze time-series

 * [taosAdapter](/tools/adapter): a bridge/adapter between TDengine cluster and applications.
 * [TDinsight](/tools/insight): monitoring TDengine cluster with Grafana.
+* [taosTools](/tools/taos-tools): taosTools are some useful tool collections for TDengine. 
 * [taosdump](/tools/taosdump): backup tool for TDengine. Please install `taosTools` package for it.
 * [taosBenchmark](/tools/taosbenchmark): stress test tool for TDengine.
-* [taosTools](/tools/taos-tools): taosTools are some useful tool collections for TDengine. 
-

 ## [Connections with Other Tools](/connections)


--- a/documentation20/en/01.evaluation/docs.md
+++ b/documentation20/en/01.evaluation/docs.md
@@ -2,64 +2,71 @@

 ## <a class="anchor" id="intro"></a> About TDengine

-TDengine is an innovative Big Data processing product launched by TAOS Data in the face of the fast-growing Internet of Things (IoT) Big Data market and technical challenges. It does not rely on any third-party software, nor does it optimize or package any open-source database or stream computing product. Instead, it is a product independently developed after absorbing the advantages of many traditional relational databases, NoSQL databases, stream computing engines, message queues, and other software. TDengine has its own unique Big Data processing advantages in time-series space.
+TDengine is a high-performance, scalable time-series database with SQL support. Its code, including its cluster feature is open source under GNU AGPL v3.0. Besides the database engine, it provides caching, stream processing, data subscription and other functionalities to reduce the complexity and cost of development and operation. TDengine differentiates itself from other TSDBs with the following advantages.

-One of the modules of TDengine is the time-series database. However, in addition to this,  to reduce the complexity of research and development and the difficulty of system operation, TDengine also provides functions such as caching, message queuing, subscription, stream computing, etc. TDengine provides a full-stack technical solution for the processing of IoT and Industrial Internet BigData. It is an efficient and easy-to-use IoT Big Data platform. Compared with typical Big Data platforms such as Hadoop, TDengine has the following distinct characteristics:
+- **High Performance**: TDengine outperforms other time series databases in data ingestion and querying while significantly reducing storage cost and compute costs, with an innovatively designed and purpose-built storage engine.

- **Performance improvement over 10 times**: An innovative data storage structure is defined, with every single core that can process at least 20,000 requests per second, insert millions of data points, and read more than 10 million data points, which is more than 10 times faster than other existing general database.
- **Reduce the cost of hardware or cloud services to 1/5**: Due to its ultra-performance, TDengine’s computing resources consumption is less than 1/5 of other common Big Data solutions; through columnar storage and advanced compression algorithms, the storage consumption is less than 1/10 of other general databases.
- **Full-stack time-series data processing engine**: Integrate database, message queue, cache, stream computing, and other functions, and the applications do not need to integrate with software such as Kafka/Redis/HBase/Spark/HDFS, thus greatly reducing the complexity cost of application development and maintenance.
- **Highly Available and Horizontal Scalable**: With the distributed architecture and consistency algorithm, via multi-replication and clustering features, TDengine ensures high availability and horizontal scalability to support mission-critical applications.
- **Zero operation cost & zero learning cost**: Installing clusters is simple and quick, with real-time backup built-in, and no need to split libraries or tables. Similar to standard SQL, TDengine can support RESTful, Python/Java/C/C++/C#/Go/Node.js, and similar to MySQL with zero learning cost.
- **Core is Open Sourced:** Except for some auxiliary features, the core of TDengine is open-sourced. Enterprise won't be locked by the database anymore. The ecosystem is more strong, products are more stable, and developer communities are more active. 
+- **Scalable**: TDengine provides out-of-box scalability and high-availability through its native distributed design. Nodes can be added through simple configuration to achieve greater data processing power. In addition, this feature is open source.

-With TDengine, the total cost of ownership of typical IoT, Internet of Vehicles, and Industrial Internet Big Data platforms can be greatly reduced. However, since it makes full use of the characteristics of IoT time-series data, TDengine cannot be used to process general data from web crawlers, microblogs, WeChat, e-commerce, ERP, CRM, and other sources.
+- **SQL Support**: TDengine uses SQL as the query language, thereby reducing learning and migration costs, while adding SQL extensions to handle time-series data better, and supporting convenient and flexible schemaless data ingestion.
+
+- **All in One**: TDengine has built-in caching, stream processing and data subscription functions. It is no longer necessary to integrate Kafka/Redis/HBase/Spark or other software in some scenarios. It makes the system architecture much simpler, cost-effective and easier to maintain.
+
+- **Seamless Integration**: Without a single line of code, TDengine provide seamless, configurable integration with third-party tools such as Telegraf, Grafana, EMQ X, Prometheus, StatsD, collectd, etc. More third-party tools are being integrated.
+
+- **Zero Management**: Installation and cluster setup can be done in seconds. Data partitioning and sharding are executed automatically. TDengine’s running status can be monitored via Grafana or other DevOps tools.
+
+- **Zero Learning Cost**: With SQL as the query language, support for ubiquitous tools like Python, Java, C/C++, Go, Rust, Node.js connectors, there is zero learning cost.
+
+- **Interactive Console**: TDengine provides convenient console access to the database to run ad hoc queries, maintain the database, or manage the cluster without any programming.
+
+With TDengine, the total cost of ownership of typical IoT, Connected Vehicles, Industrial Internet, Energy, Financial, DevOps and other Big Data applications can be greatly reduced. Note that because TDengine makes full use of the characteristics of IoT time-series data and is highly optimized for it, TDengine cannot be used as a general purpose database engine to process general data from web crawlers, microblogs, WeChat, e-commerce, ERP, CRM, and other sources.

 ![TDengine Technology Ecosystem](../images/eco_system.png)
+<center>Figure 1. TDengine Ecosystem</center>

-<center>Figure 1. TDengine Technology Ecosystem</center>

 ## <a class="anchor" id="scenes"></a>Overall Scenarios of TDengine

-As an IoT Big Data platform, the typical application scenarios of TDengine are mainly presented in the IoT category, with users having a certain amount of data. The following sections of this document are mainly aimed at  IoT-relevant systems. Other systems, such as CRM, ERP, etc., are beyond the scope of this article.
+As an IoT time-series Big Data platform, TDengine is optimal for application scenarios with the requirements described below. Therefore the following sections of this document are mainly aimed at IoT-relevant systems. Other systems, such as CRM, ERP, etc., are beyond the scope of this article.

 ### Characteristics and Requirements of Data Sources

-From the perspective of data sources, designers can analyze the applicability of TDengine in target application systems as following.
+From the perspective of data sources, designers can analyze the applicability of TDengine in target application systems as follows.

 | **Data Source Characteristics and Requirements**         | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
 | -------------------------------------------------------- | ------------------ | ----------------------- | ------------------- | :----------------------------------------------------------- |
-| A huge amount of total data                              |                    |                         | √                   | TDengine provides excellent scale-out functions in terms of capacity, and has a storage structure matching high compression ratio to achieve the best storage efficiency in the industry. |
-| Data input velocity is occasionally or continuously huge |                    |                         | √                   | TDengine's performance is much higher than other similar products. It can continuously process a large amount of input data in the same hardware environment, and provide a performance evaluation tool that can easily run in the user environment. |
-| A huge amount of data sources                            |                    |                         | √                   | TDengine is designed to include optimizations specifically for a huge amount of data sources, such as data writing and querying, which is especially suitable for efficiently processing massive (tens of millions or more) data sources. |
+| A massive amount of total data                              |                    |                         | √                   | TDengine provides excellent scale-out functions in terms of capacity, and has a storage structure with matching high compression ratio to achieve the best storage efficiency in the industry.|
+| Data input velocity is extremely high |                    |                         | √                   | TDengine's performance is much higher than that of other similar products. It can continuously process larger amounts of input data in the same hardware environment, and provides a performance evaluation tool that can easily run in the user environment. |
+| A huge number of data sources                            |                    |                         | √                   | TDengine is optimized specifically for a huge number of data sources. It is especially suitable for efficiently ingesting, writing and querying data from billions of data sources. |

 ### System Architecture Requirements

 | **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
 | ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
-| Require a simple and reliable system architecture |                    |                         | √                   | TDengine's system architecture is very simple and reliable, with its own message queue, cache, stream computing, monitoring and other functions, and no need to integrate any additional third-party products. |
-| Require fault-tolerance and high-reliability      |                    |                         | √                   | TDengine has cluster functions to automatically provide high-reliability functions such as fault tolerance and disaster recovery. |
-| Standardization specifications                    |                    |                         | √                   | TDengine uses standard SQL language to provide main functions and follow standardization specifications. |
+| A simple and reliable system architecture |                    |                         | √                   | TDengine's system architecture is very simple and reliable, with its own message queue, cache, stream computing, monitoring and other functions. There is no need to integrate any additional third-party products. |
+| Fault-tolerance and high-reliability      |                    |                         | √                   | TDengine has cluster functions to automatically provide high-reliability and high-availability functions such as fault tolerance and disaster recovery. |
+| Standardization support                    |                    |                         | √                   | TDengine supports standard SQL and also provides extensions specifically to analyze time-series data. |

 ### System Function Requirements

-| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| **System Function Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
 | ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
-| Require completed data processing algorithms built-in |                    | √                    |                     | TDengine implements various general data processing algorithms, but has not properly handled all requirements of different industries, so special types of processing shall be processed at the application level. |
-| Require a huge amount of crosstab queries             |                    | √                    |                     | This type of processing should be handled more by relational database systems, or TDengine and relational database systems should fit together to implement system functions. |
+| Complete data processing algorithms built-in |                    | √                    |                     | While TDengine implements various general data processing algorithms, industry specific algorithms and special types of processing will need to be implemented at the application level.|
+| A large number of crosstab queries             |                    | √                    |                     | This type of processing is better handled by general purpose relational database systems but TDengine can work in concert with relational database systems to provide more complete solutions. |

 ### System Performance Requirements

-| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| **System Performance Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
 | ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
-| Require larger total processing capacity     |                    |                      | √                   | TDengine’s cluster functions can easily improve processing capacity via multi-server-cooperating. |
-| Require high-speed data processing           |                    |                      | √                   | TDengine’s storage and data processing are designed to be optimized for IoT, can generally improve the processing speed by multiple times than other similar products. |
-| Require fast processing of fine-grained data |                    |                      | √                   | TDengine has achieved the same level of performance with relational and NoSQL data processing systems. |
+| 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 fine-grained data |                    |                      | √                   | TDengine has achieved the same or better performance than other relational and NoSQL data processing systems. |

 ### System Maintenance Requirements

-| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| **System Maintenance Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
 | ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
-| Require system with high-reliability         |                    |                      | √                   | TDengine has a very robust and reliable system architecture to implement simple and convenient daily operation with streamlined experiences for operators, thus human errors and accidents are eliminated to the greatest extent. |
-| Require controllable operation learning cost |                    |                      | √                   | As above.                                                    |
-| Require abundant talent supply               | √                  |                      |                     | As a new-generation product, it’s still difficult to find talents with TDengine experiences from the market. However, the learning cost is low. As the vendor, we also provide extensive operation training and counseling services. |
+| Native high-reliability         |                    |                      | √                   | TDengine has a very robust, reliable and easily configurable system architecture to simplify routine operation. Human errors and accidents are eliminated to the greatest extent, with a streamlined experience for operators. |
+| Minimize learning and maintenance costs |                    |                      | √                   | In addition to being easily configurable, standard SQL support and the Taos shell for ad hoc queries makes maintenance simpler, allows reuse and reduces learning costs.|
+| Abundant talent supply               | √                  |                      |                     | Given the above, and given the extensive training and professional services provided by TDengine, it is easy to migrate from existing solutions or create a new and lasting solution based on TDengine.|
--- a/documentation20/en/02.getting-started/03.install/docs.md
+++ b/documentation20/en/02.getting-started/03.install/docs.md
@@ -11,24 +11,27 @@ TDengine open source version provides `deb` and `rpm` format installation packag
 - Go to the directory where the TDengine-server-2.0.0.0-Linux-x64.deb installation package is located and execute the following installation command.

 ```
-plum@ubuntu:~/git/taosv16$ sudo dpkg -i TDengine-server-2.0.0.0-Linux-x64.deb
-
-Selecting previously unselected package tdengine.
-(Reading database ... 233181 files and directories currently installed.)
-Preparing to unpack TDengine-server-2.0.0.0-Linux-x64.deb ...
-Failed to stop taosd.service: Unit taosd.service not loaded.
-Stop taosd service success!
-Unpacking tdengine (2.0.0.0) ...
-Setting up tdengine (2.0.0.0) ...
-Start to install TDEngine...
-Synchronizing state of taosd.service with SysV init with /lib/systemd/systemd-sysv-install...
-Executing /lib/systemd/systemd-sysv-install enable taosd
-insserv: warning: current start runlevel(s) (empty) of script `taosd' overrides LSB defaults (2 3 4 5).
-insserv: warning: current stop runlevel(s) (0 1 2 3 4 5 6) of script `taosd' overrides LSB defaults (0 1 6).
-Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :
+$ sudo dpkg -i TDengine-server-2.4.0.7-Linux-x64.deb
+(Reading database ... 137504 files and directories currently installed.)
+Preparing to unpack TDengine-server-2.4.0.7-Linux-x64.deb ...
+TDengine is removed successfully!
+Unpacking tdengine (2.4.0.7) over (2.4.0.7) ...
+Setting up tdengine (2.4.0.7) ...
+Start to install TDengine...
+
+System hostname is: shuduo-1804
+
+Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
+OR leave it blank to build one:
+
+Enter your email address for priority support or enter empty to skip:
+Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
+
 To configure TDengine : edit /etc/taos/taos.cfg
 To start TDengine     : sudo systemctl start taosd
-To access TDengine    : use taos in shell
+To access TDengine    : taos -h shuduo-1804 to login into TDengine server
+
+
 TDengine is installed successfully!
 ```

@@ -42,10 +45,10 @@ The same operation is performed for the other installation packages format.
 Uninstall command is below:

 ```
-    plum@ubuntu:~/git/tdengine/debs$ sudo dpkg -r tdengine
-    (Reading database ... 233482 files and directories currently installed.)
-    Removing tdengine (2.0.0.0) ...
-    TDEngine is removed successfully!
+$ sudo dpkg -r tdengine
+(Reading database ... 137504 files and directories currently installed.)
+Removing tdengine (2.4.0.7) ...
+TDengine is removed successfully!
 ```

 ## Install and unstall rpm package
@@ -56,16 +59,27 @@ Uninstall command is below:
 - Go to the directory where the TDengine-server-2.0.0.0-Linux-x64.rpm installation package is located and execute the following installation command.

 ```
-    [root@bogon x86_64]# rpm -iv TDengine-server-2.0.0.0-Linux-x64.rpm
-    Preparing packages...
-    TDengine-2.0.0.0-3.x86_64
-    Start to install TDEngine...
-    Created symlink from /etc/systemd/system/multi-user.target.wants/taosd.service to /etc/systemd/system/taosd.service.
-    Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :
-    To configure TDengine : edit /etc/taos/taos.cfg
-    To start TDengine     : sudo systemctl start taosd
-    To access TDengine    : use taos in shell
-    TDengine is installed successfully!
+$ sudo rpm -ivh TDengine-server-2.4.0.7-Linux-x64.rpm
+Preparing...                          ################################# [100%]
+Updating / installing...
+   1:tdengine-2.4.0.7-3               ################################# [100%]
+Start to install TDengine...
+
+System hostname is: centos7
+
+Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
+OR leave it blank to build one:
+
+Enter your email address for priority support or enter empty to skip:
+
+Created symlink from /etc/systemd/system/multi-user.target.wants/taosd.service to /etc/systemd/system/taosd.service.
+
+To configure TDengine : edit /etc/taos/taos.cfg
+To start TDengine     : sudo systemctl start taosd
+To access TDengine    : taos -h centos7 to login into TDengine server
+
+
+TDengine is installed successfully!
 ```

 ### Uninstall rpm
@@ -73,8 +87,8 @@ Uninstall command is below:
 Uninstall command is following:

 ```
-    [root@bogon x86_64]# rpm -e tdengine
-    TDEngine is removed successfully!
+$ sudo rpm -e tdengine
+TDengine is removed successfully!
 ```

 ## Install and uninstall tar.gz
@@ -85,37 +99,47 @@ Uninstall command is following:
 - Go to the directory where the `TDengine-server-2.0.0.0-Linux-x64.tar.gz` installation package is located, unzip the file first, then enter the subdirectory and execute the install.sh installation script in it as follows

 ```
-    plum@ubuntu:~/git/tdengine/release$ sudo tar -xzvf TDengine-server-2.0.0.0-Linux-x64.tar.gz
-    plum@ubuntu:~/git/tdengine/release$ ll
-    total 3796
-    drwxr-xr-x  3 root root    4096 Aug  9 14:20 ./
-    drwxrwxr-x 11 plum plum    4096 Aug  8 11:03 ../
-    drwxr-xr-x  5 root root    4096 Aug  8 11:03 TDengine-server/
-    -rw-r--r--  1 root root 3871844 Aug  8 11:03 TDengine-server-2.0.0.0-Linux-x64.tar.gz
-    plum@ubuntu:~/git/tdengine/release$ cd TDengine-server/
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ ll
-    total 2640
-    drwxr-xr-x 5 root root    4096 Aug  8 11:03 ./
-    drwxr-xr-x 3 root root    4096 Aug  9 14:20 ../
-    drwxr-xr-x 5 root root    4096 Aug  8 11:03 connector/
-    drwxr-xr-x 2 root root    4096 Aug  8 11:03 driver/
-    drwxr-xr-x 8 root root    4096 Aug  8 11:03 examples/
-    -rwxr-xr-x 1 root root   13095 Aug  8 11:03 install.sh*
-    -rw-r--r-- 1 root root 2651954 Aug  8 11:03 taos.tar.gz
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ sudo ./install.sh
-    This is ubuntu system
-    verType=server interactiveFqdn=yes
-    Start to install TDengine...
-    Synchronizing state of taosd.service with SysV init with /lib/systemd/systemd-sysv-install...
-    Executing /lib/systemd/systemd-sysv-install enable taosd
-    insserv: warning: current start runlevel(s) (empty) of script `taosd' overrides LSB defaults (2 3 4 5).
-    insserv: warning: current stop runlevel(s) (0 1 2 3 4 5 6) of script `taosd' overrides LSB defaults (0 1 6).
-    Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join OR leave it blank to build one :hostname.taosdata.com:7030
-    To configure TDengine : edit /etc/taos/taos.cfg
-    To start TDengine     : sudo systemctl start taosd
-    To access TDengine    : use taos in shell
-    Please run: taos -h hostname.taosdata.com:7030  to login into cluster, then execute : create dnode 'newDnodeFQDN:port'; in TAOS shell to add this new node into the clsuter
-    TDengine is installed successfully!
+$ tar xvzf TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
+TDengine-enterprise-server-2.4.0.7/
+TDengine-enterprise-server-2.4.0.7/driver/
+TDengine-enterprise-server-2.4.0.7/driver/vercomp.txt
+TDengine-enterprise-server-2.4.0.7/driver/libtaos.so.2.4.0.7
+TDengine-enterprise-server-2.4.0.7/install.sh
+TDengine-enterprise-server-2.4.0.7/examples/
+...
+
+$ ll
+total 43816
+drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ./
+drwxr-xr-x 20 ubuntu ubuntu     4096 Feb 22 09:30 ../
+drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 TDengine-enterprise-server-2.4.0.7/
+-rw-rw-r--  1 ubuntu ubuntu 44852544 Feb 22 09:31 TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
+
+$ cd TDengine-enterprise-server-2.4.0.7/
+
+ $ ll
+total 40784
+drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 ./
+drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ../
+drwxrwxr-x  2 ubuntu ubuntu     4096 Feb 22 09:30 driver/
+drwxrwxr-x 10 ubuntu ubuntu     4096 Feb 22 09:30 examples/
+-rwxrwxr-x  1 ubuntu ubuntu    33294 Feb 22 09:30 install.sh*
+-rw-rw-r--  1 ubuntu ubuntu 41704288 Feb 22 09:30 taos.tar.gz
+
+$ sudo ./install.sh
+
+Start to update TDengine...
+Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
+Nginx for TDengine is updated successfully!
+
+To configure TDengine : edit /etc/taos/taos.cfg
+To configure Taos Adapter (if has) : edit /etc/taos/taosadapter.toml
+To start TDengine     : sudo systemctl start taosd
+To access TDengine    : use taos -h shuduo-1804 in shell OR from http://127.0.0.1:6060
+
+TDengine is updated successfully!
+Install taoskeeper as a standalone service
+taoskeeper is installed, enable it by `systemctl enable taoskeeper`
 ```

 Note: The install.sh install script asks for some configuration information through an interactive command line interface during execution. If you prefer a non-interactive installation, you can execute the install.sh script with the -e no parameter. Run . /install.sh -h command to see detailed information about all parameters.
@@ -125,8 +149,11 @@ Note: The install.sh install script asks for some configuration information thro
 Uninstall command is following:

 ```
-    plum@ubuntu:~/git/tdengine/release/TDengine-server$ rmtaos
-    TDEngine is removed successfully!
+$ rmtaos
+Nginx for TDengine is running, stopping it...
+TDengine is removed successfully!
+
+taosKeeper is removed successfully!
 ```

 ## Installation directory description
@@ -134,19 +161,19 @@ Uninstall command is following:
 After TDengine is successfully installed, the main installation directory is /usr/local/taos, and the directory contents are as follows:

 ```
-    plum@ubuntu:/usr/local/taos$ cd /usr/local/taos
-    plum@ubuntu:/usr/local/taos$ ll
-    total 36
-    drwxr-xr-x  9 root root 4096 7  30 19:20 ./
-    drwxr-xr-x 13 root root 4096 7  30 19:20 ../
-    drwxr-xr-x  2 root root 4096 7  30 19:20 bin/
-    drwxr-xr-x  2 root root 4096 7  30 19:20 cfg/
-    lrwxrwxrwx  1 root root   13 7  30 19:20 data -> /var/lib/taos/
-    drwxr-xr-x  2 root root 4096 7  30 19:20 driver/
-    drwxr-xr-x  8 root root 4096 7  30 19:20 examples/
-    drwxr-xr-x  2 root root 4096 7  30 19:20 include/
-    drwxr-xr-x  2 root root 4096 7  30 19:20 init.d/
-    lrwxrwxrwx  1 root root   13 7  30 19:20 log -> /var/log/taos/
+$ cd /usr/local/taos
+$ ll
+$ ll
+total 28
+drwxr-xr-x  7 root root 4096 Feb 22 09:34 ./
+drwxr-xr-x 12 root root 4096 Feb 22 09:34 ../
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 bin/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 cfg/
+lrwxrwxrwx  1 root root   13 Feb 22 09:34 data -> /var/lib/taos/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 driver/
+drwxr-xr-x 10 root root 4096 Feb 22 09:34 examples/
+drwxr-xr-x  2 root root 4096 Feb 22 09:34 include/
+lrwxrwxrwx  1 root root   13 Feb 22 09:34 log -> /var/log/taos/
 ```

 - Automatically generates the configuration file directory, database directory, and log directory.
@@ -171,7 +198,7 @@ file that comes with the installation package.
 - For deb package installation, if the installation directory is manually deleted by mistake, the uninstallation, or reinstallation cannot be successful. In this case, you need to clear the installation information of the tdengine package by executing the following command:

 ```
-    plum@ubuntu:~/git/tdengine/$ sudo rm -f /var/lib/dpkg/info/tdengine*
+$ sudo rm -f /var/lib/dpkg/info/tdengine*
 ```

 Then just reinstall it.
@@ -179,7 +206,7 @@ Then just reinstall it.
 - For the rpm package after installation, if the installation directory is manually deleted by mistake part of the uninstallation, or reinstallation can not be successful. In this case, you need to clear the installation information of the tdengine package by executing the following command:

 ```
-    [root@bogon x86_64]# rpm -e --noscripts tdengine
+$ sudo rpm -e --noscripts tdengine
 ```

 Then just reinstall it.
--- a/documentation20/en/02.getting-started/docs.md
+++ b/documentation20/en/02.getting-started/docs.md
@@ -2,7 +2,7 @@

 ## <a class="anchor" id="install"></a>Quick Install

-TDengine includes server, client, and ecological software and peripheral tools. Currently, version 2.0 of the server can only be installed and run on Linux and will support Windows, macOS, and other OSes in the future. The client can be installed and run on Windows or Linux. Applications on any operating system can use the RESTful interface to connect to the taosd server. After 2.4, TDengine includes taosAdapter to provide an easy-to-use and efficient way to ingest data including RESTful service. taosAdapter needs to be started manually as a stand-alone component. The early version uses an embedded HTTP component to provide the RESTful interface.
+TDengine includes server, client, and ecosystem software and peripheral tools. Currently, version 2.0 of the server can only be installed and run on Linux and will support Windows, macOS, and other OSes in the future. The client can be installed and run on Windows or Linux. Applications on any operating system can use the RESTful interface to connect to the taosd server. Starting with 2.4, TDengine includes taosAdapter to provide an easy-to-use and efficient way to ingest data and includes a RESTful service. taosAdapter needs to be started manually as a stand-alone component. The earlier version uses an embedded HTTP component to provide the RESTful interface.

 TDengine supports X64/ARM64/MIPS64/Alpha64 hardware platforms and will support ARM32, RISC-V, and other CPU architectures in the future.

@@ -14,11 +14,11 @@ docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengin

 Please refer to [Quickly Taste TDengine with Docker](https://www.taosdata.com/en/documentation/getting-started/docker) for the details.

-For the time being, using Docker to deploy the client or server of TDengine for production environments is not recommended. However it is a convenient way to deploy TDengine for development purposes. In particular, it is easy to try TDengine in Mac OS X and Windows environments with Docker.
+For the time being, we do not recommend using Docker to deploy the TDengine server or client in production environments. However it is a convenient way to deploy TDengine for development purposes. In particular, it is easy to try TDengine in Mac OS X and Windows environments with Docker.

 ### <a class="anchor" id="package-install"></a>Install from Package

-TDengine is very easy to install, from download to successful installation in just a few seconds. For ease of use, the standard server installation package includes the client application and sample code; if you only need the server application and C/C++ language support for the client connection, you can also download the lite version of the installation package only. The installation packages are available in `rpm` and `deb` formats, as well as `tar.gz` format for enterprise customers who need to facilitate use on specific operating systems. Releases include both stable and beta releases. We recommend the stable release for production use or testing. The beta release may contain more new features. You can choose to download from the following as needed:
+TDengine is very easy to run; download to successful installation takes just a few seconds. For ease of use, the standard server installation package includes the client application and sample code. But if you only need the server application and C/C++ language support for the client connection, you can also download only the lite version of the installation package. The installation packages are available in `rpm` and `deb` formats, as well as `tar.gz` format for enterprise customers who need to facilitate use on specific operating systems. Releases include both stable and beta releases. We recommend the stable release for production use or testing. The beta release may contain more new features. You can choose to download from the following as needed:

 <ul id="server-packageList" class="package-list"></ul>

@@ -59,13 +59,13 @@ After installation, you can start the TDengine service by the `systemctl` comman
 systemctl start taosd
 ```

-Then check if the service is working now.
+Then check if the service is working.

 ```bash
 systemctl status taosd
 ```

-If the service is running successfully, you can play around through TDengine shell `taos`.
+If the service is running successfully, you can play around through the TDengine shell, `taos`.

 **Note:**

@@ -120,7 +120,7 @@ ts     |  speed  |
 Query OK, 2 row(s) in set (0.001700s)
 ```

-Besides the SQL commands, the system administrator can check system status, add or delete accounts, and manage the servers.
+Besides executing SQL commands, the system administrator can check system status, add or delete accounts, and manage the servers.

 ### Shell Command Line Parameters


--- a/documentation20/en/03.architecture/docs.md
+++ b/documentation20/en/03.architecture/docs.md
@@ -157,7 +157,7 @@ Logical structure diagram of TDengine distributed architecture as following:
 ![TDengine architecture diagram](../images/architecture/structure.png)
 <center> Figure 1: TDengine architecture diagram </center>

-A complete TDengine system runs on one or more physical nodes. Logically, it includes data node (dnode), TDEngine application driver (TAOSC) and application (app). There are one or more data nodes in the system, which form a cluster. The application interacts with the TDengine cluster through TAOSC's API. The following is a brief introduction to each logical unit.
+A complete TDengine system runs on one or more physical nodes. Logically, it includes data node (dnode), TDengine application driver (TAOSC) and application (app). There are one or more data nodes in the system, which form a cluster. The application interacts with the TDengine cluster through TAOSC's API. The following is a brief introduction to each logical unit.

 **Physical node (pnode)**: A pnode is a computer that runs independently and has its own computing, storage and network capabilities. It can be a physical machine, virtual machine, or Docker container installed with OS. The physical node is identified by its configured FQDN (Fully Qualified Domain Name). TDengine relies entirely on FQDN for network communication. If you don't know about FQDN, please read the blog post "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".


--- a/documentation20/en/07.advanced-features/docs.md
+++ b/documentation20/en/07.advanced-features/docs.md
@@ -9,8 +9,8 @@ Continuous query of TDengine adopts time-driven mode, which can be defined direc
 The continuous query provided by TDengine differs from the time window calculation in ordinary stream computing in the following ways:

 - Unlike the real-time feedback calculated results of stream computing, continuous query only starts calculation after the time window is closed. For example, if the time period is 1 day, the results of that day will only be generated after 23:59:59.
- If a history record is written to the time interval that has been calculated, the continuous query will not re-calculate and will not push the new results to the user again. 
- TDengine server does not cache or save the client's status, nor does it provide Exactly-Once semantic guarantee. If the application crashes, the continuous query will be pull up again and starting time must be provided by the application. 
+- If a history record is written to the time interval that has been calculated, the continuous query will not re-calculate and will not push the new results to the user again.
+- TDengine server does not cache or save the client's status, nor does it provide Exactly-Once semantic guarantee. If the application crashes, the continuous query will be pull up again and starting time must be provided by the application.

 ### How to use continuous query

@@ -83,7 +83,7 @@ taos_consume
 taos_unsubscribe
 ```

-Please refer to the [C/C++ Connector](https://www.taosdata.com/cn/documentation/connector/) for the documentation of these APIs. The following is still a smart meter scenario as an example to introduce their specific usage (please refer to the previous section "Continuous Query" for the structure of STables and sub-tables). The complete sample code can be found [here](https://github.com/taosdata/TDengine/blob/master/tests/examples/c/subscribe.c).
+Please refer to the [C/C++ Connector](https://www.taosdata.com/cn/documentation/connector/) for the documentation of these APIs. The following is still a smart meter scenario as an example to introduce their specific usage (please refer to the previous section "Continuous Query" for the structure of STables and sub-tables). The complete sample code can be found [here](https://github.com/taosdata/TDengine/blob/master/examples/c/subscribe.c).

 If we want to be notified and do some process when the current of a smart meter exceeds a certain limit (e.g. 10A), there are two methods: one is to query each sub-table separately, record the timestamp of the last piece of data after each query, and then only query all data after this timestamp:

@@ -210,8 +210,8 @@ After introducing the code, let's take a look at the actual running effect. For
 You can compile and start the sample program by executing the following command in the directory where the sample code is located:

 ```shell
-$ make
-$ ./subscribe -sql='select * from meters where current > 10;'
+make
+./subscribe -sql='select * from meters where current > 10;'
 ```

 After the sample program starts, open another terminal window, and the shell that starts TDengine inserts a data with a current of 12A into **D1001**:
@@ -299,8 +299,8 @@ public class SubscribeDemo {
            try {
                if (null != subscribe)
                    subscribe.close(true); // Close the subscription
-                if (connection != null) 
-                    connection.close(); 
+                if (connection != null)
+                    connection.close();
            } catch (SQLException throwables) {
                throwables.printStackTrace();
            }
@@ -312,7 +312,7 @@ public class SubscribeDemo {
 Run the sample program. First, it consumes all the historical data that meets the query conditions:

 ```shell
-# java -jar subscribe.jar 
+# java -jar subscribe.jar

 ts: 1597464000000	current: 12.0	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid : 2
 ts: 1597464600000	current: 12.3	voltage: 220	phase: 2	location: Beijing.Chaoyang	groupid : 2
@@ -357,4 +357,4 @@ This SQL statement will obtain the last recorded voltage value of all smart mete

 In scenarios of TDengine, alarm monitoring is a common requirement. Conceptually, it requires the program to filter out data that meet certain conditions from the data of the latest period of time, and calculate a result according to a defined formula based on these data. When the result meets certain conditions and lasts for a certain period of time, it will notify the user in some form.

-In order to meet the needs of users for alarm monitoring, TDengine provides this function in the form of an independent module. For its installation and use, please refer to the blog [How to Use TDengine for Alarm Monitoring](https://www.taosdata.com/blog/2020/04/14/1438.html).
\ No newline at end of file
+In order to meet the needs of users for alarm monitoring, TDengine provides this function in the form of an independent module. For its installation and use, please refer to the blog [How to Use TDengine for Alarm Monitoring](https://www.taosdata.com/blog/2020/04/14/1438.html).
--- a/documentation20/en/08.connector/01.java/docs.md
+++ b/documentation20/en/08.connector/01.java/docs.md
@@ -54,25 +54,23 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(

 ## JDBC driver version and supported TDengine and JDK versions

-| taos-jdbcdriver | TDengine           | JDK    |
-| --------------- |--------------------|--------|
-| 2.0.36          | 2.4.0 and above    | 1.8.x  |
-| 2.0.35          | 2.3.0 and above    | 1.8.x  |
-| 2.0.33 - 2.0.34 | 2.0.3.0 and above  | 1.8.x  |
-| 2.0.31 - 2.0.32 | 2.1.3.0 and above  | 1.8.x  |
-| 2.0.22 - 2.0.30 | 2.0.18.0 - 2.1.2.x | 1.8.x  |
-| 2.0.12 - 2.0.21 | 2.0.8.0 - 2.0.17.x | 1.8.x  |
-| 2.0.4 - 2.0.11  | 2.0.0.0 - 2.0.7.x  | 1.8.x  |
-| 1.0.3           | 1.6.1.x and above  | 1.8.x  |
-| 1.0.2           | 1.6.1.x and above  | 1.8.x  |
-| 1.0.1           | 1.6.1.x and above  | 1.8.x  |
+| taos-jdbcdriver version | TDengine 2.0.x.x version | TDengine 2.2.x.x version | TDengine 2.4.x.x version | JDK version |
+|---------------------| ----------------------| ----------------------| ----------------------| -------- |
+| 2.0.37              |            X          |            X          | 2.4.0.6 以上           | 1.8.x    |
+| 2.0.36              |            X          | 2.2.2.11 以上          | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.35              |            X          | 2.2.2.11 以上          | 2.3.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.33 - 2.0.34     | 2.0.3.0 以上           | 2.2.0.0 以上           | 2.4.0.0 - 2.4.0.5     | 1.8.x    |
+| 2.0.31 - 2.0.32     | 2.1.3.0 - 2.1.7.7     |            X          |            X          | 1.8.x    |
+| 2.0.22 - 2.0.30     | 2.0.18.0 - 2.1.2.1    |            X          |            X          | 1.8.x    |
+| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.4    |            X          |            X          | 1.8.x    |
+| 2.0.4 - 2.0.11      | 2.0.0.0 - 2.0.7.3     |            X          |            X          | 1.8.x    |

 ## DataType in TDengine and Java connector

 The TDengine supports the following data types and Java data types:

 | TDengine DataType | JDBCType (driver version < 2.0.24) | JDBCType (driver version >= 2.0.24) |
-|-------------------|------------------------------------| ----------------------------------- |
+| ----------------- | ---------------------------------- | ----------------------------------- |
 | TIMESTAMP         | java.lang.Long                     | java.sql.Timestamp                  |
 | INT               | java.lang.Integer                  | java.lang.Integer                   |
 | BIGINT            | java.lang.Long                     | java.lang.Long                      |
@@ -314,7 +312,8 @@ The Java connector may report three types of error codes: JDBC Driver (error cod

 ### Write data through parameter binding
 Starting with version 2.1.2.0, TDengine's JDBC-JNI implementation significantly improves support for data write (INSERT) scenarios with Parameter-Binding. When writing data in this way, you can avoid the resource consumption of SQL parsing, which can significantly improve write performance in many cases.
-Note:
+
+**Note**:
 * Jdbc-restful implementations do not provide Parameter-Binding
 * The following sample code is based on taos-jdbcdriver-2.0.36
 * use setString to bind BINARY data, and use setNString to bind NCHAR data
@@ -322,6 +321,7 @@ Note:


 Sample Code:
+
 ```java
 public class ParameterBindingDemo {
 
@@ -578,15 +578,57 @@ public void setShort(int columnIndex, ArrayList<Short> list) throws SQLException
 public void setString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 public void setNString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 ```
+
+### Data Writing via Schemaless
+
+Starting with version 2.2.0.0, TDengine supports schemaless function. schemaless writing protocol is compatible with InfluxDB's Line Protocol, OpenTSDB's telnet and JSON format protocols, Please see [Schemaless Writing](https://www.taosdata.com/docs/en/v2.0/insert#schemaless)
+
+**Note**:
+* Jdbc-restful implementations do not provide Schemaless-Writing
+* The following sample code is based on taos-jdbcdriver-2.0.36
+
+Sample Code:
+
+```java
+public class SchemalessInsertTest {
+    private static final String host = "127.0.0.1";
+    private static final String lineDemo = "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000";
+    private static final String telnetDemo = "stb0_0 1626006833 4 host=host0 interface=eth0";
+    private static final String jsonDemo = "{\"metric\": \"meter_current\",\"timestamp\": 1346846400,\"value\": 10.3, \"tags\": {\"groupid\": 2, \"location\": \"Beijing\", \"id\": \"d1001\"}}";
+
+    public static void main(String[] args) throws SQLException {
+        final String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+        try (Connection connection = DriverManager.getConnection(url)) {
+            init(connection);
+
+            SchemalessWriter writer = new SchemalessWriter(connection);
+            writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
+            writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
+            writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.NOT_CONFIGURED);
+        }
+    }
+
+    private static void init(Connection connection) throws SQLException {
+        try (Statement stmt = connection.createStatement()) {
+            stmt.executeUpdate("drop database if exists test_schemaless");
+            stmt.executeUpdate("create database if not exists test_schemaless");
+            stmt.executeUpdate("use test_schemaless");
+        }
+    }
+}
+```
+
 ### Set client configuration in JDBC
-Starting with TDEngine-2.3.5.0, JDBC Driver supports setting TDengine client parameters on the first connection of a Java application. The Driver supports jdbcUrl and Properties to set client parameters in JDBC-JNI mode.

-Note:
+Starting with TDengine-2.3.5.0, JDBC Driver supports setting TDengine client parameters on the first connection of a Java application. The Driver supports jdbcUrl and Properties to set client parameters in JDBC-JNI mode.
+
+**Note**:
 * JDBC-RESTful does not support setting client parameters.
 * The client parameters set in the java application are process-level. To update the client parameters, the application needs to be restarted. This is because these client parameters are global that take effect the first time the application is set up.
 * The following sample code is based on taos-jdbcdriver-2.0.36.

 Sample Code:
+
 ```java
 public class ClientParameterSetting {
    private static final String host = "127.0.0.1";

--- a/documentation20/en/08.connector/docs.md
+++ b/documentation20/en/08.connector/docs.md
--- a/documentation20/en/09.connections/docs.md
+++ b/documentation20/en/09.connections/docs.md
@@ -137,7 +137,7 @@ sql1 = [‘insert into tb values (now, 1)’]
 exec(conn, sql1)
 ```

-For more detailed examples, please refer to the examples\Matlab\TDEngineDemo.m file in the package.
+For more detailed examples, please refer to the examples\matlab\TDengineDemo.m file in the package.

 ## <a class="anchor" id="r"></a> R 


--- a/documentation20/en/13.faq/docs.md
+++ b/documentation20/en/13.faq/docs.md
@@ -52,19 +52,19 @@ When the client encountered a connection failure, please follow the following st
   - Local virtual machine: Check whether the network can be pinged, and try to avoid using localhost as hostname
   - Corporate server: If you are in a NAT network environment, be sure to check whether the server can return messages to the client

-2. Make sure that the client and server version numbers are exactly the same, and the open source Community Edition and Enterprise Edition cannot be mixed.
-3. On the server, execute systemctl status taosd to check the running status of *taosd*. If not running, start *taosd*.
-4. Verify that the correct server FQDN (Fully Qualified Domain Name, which is available by executing the Linux command hostname-f on the server) is specified when the client connects. FQDN configuration reference: "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
-5. Ping the server FQDN. If there is no response, please check your network, DNS settings, or the system hosts file of the computer where the client is located.
-6. Check the firewall settings (Ubuntu uses ufw status, CentOS uses firewall-cmd-list-port) to confirm that TCP/UDP ports 6030-6042 are open.
-7. For JDBC (ODBC, Python, Go and other interfaces are similar) connections on Linux, make sure that libtaos.so is in the directory /usr/local/taos/driver, and /usr/local/taos/driver is in the system library function search path LD_LIBRARY_PATH.
-8. For JDBC, ODBC, Python, Go, etc. connections on Windows, make sure that C:\ TDengine\ driver\ taos.dll is in your system library function search directory (it is recommended that taos.dll be placed in the directory C:\ Windows\ System32)
-9. If the connection issue still exist
-
-1. - On Linux system, please use the command line tool nc to determine whether the TCP and UDP connections on the specified ports are unobstructed. Check whether the UDP port connection works: nc -vuz {hostIP} {port} Check whether the server-side TCP port connection works: nc -l {port}Check whether the client-side TCP port connection works: nc {hostIP} {port}
-   - Windows systems use the PowerShell command Net-TestConnection-ComputerName {fqdn} Port {port} to detect whether the service-segment port is accessed
-
-10. You can also use the built-in network connectivity detection function of taos program to verify whether the specified port connection between the server and the client is unobstructed (including TCP and UDP): [TDengine's Built-in Network Detection Tool Use Guide](https://www.taosdata.com/blog/2020/09/08/1816.html).
+3. Make sure that the client and server version numbers are exactly the same, and the open source Community Edition and Enterprise Edition cannot be mixed.
+4. On the server, execute systemctl status taosd to check the running status of *taosd*. If not running, start *taosd*.
+5. Verify that the correct server FQDN (Fully Qualified Domain Name, which is available by executing the Linux command hostname-f on the server) is specified when the client connects. FQDN configuration reference: "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
+6. Ping the server FQDN. If there is no response, please check your network, DNS settings, or the system hosts file of the computer where the client is located.
+7. Check the firewall settings (Ubuntu uses ufw status, CentOS uses firewall-cmd-list-port) to confirm that TCP/UDP ports 6030-6042 are open.
+8. For JDBC (ODBC, Python, Go and other interfaces are similar) connections on Linux, make sure that libtaos.so is in the directory /usr/local/taos/driver, and /usr/local/taos/driver is in the system library function search path LD_LIBRARY_PATH.
+9. For JDBC, ODBC, Python, Go, etc. connections on Windows, make sure that C:\ TDengine\ driver\ taos.dll is in your system library function search directory (it is recommended that taos.dll be placed in the directory C:\ Windows\ System32)
+10. If the connection issue still exist
+
+  - On Linux system, please use the command line tool nc to determine whether the TCP and UDP connections on the specified ports are unobstructed. Check whether the UDP port connection works: nc -vuz {hostIP} {port} Check whether the server-side TCP port connection works: nc -l {port}Check whether the client-side TCP port connection works: nc {hostIP} {port}
+  - Windows systems use the PowerShell command Net-TestConnection-ComputerName {fqdn} Port {port} to detect whether the service-segment port is accessed
+
+11. You can also use the built-in network connectivity detection function of taos program to verify whether the specified port connection between the server and the client is unobstructed (including TCP and UDP): [TDengine's Built-in Network Detection Tool Use Guide](https://www.taosdata.com/blog/2020/09/08/1816.html).




--- a/importSampleData/.gitignore
+++ b/importSampleData/.gitignore
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-.idea/
-.vscode/
\ No newline at end of file
--- a/importSampleData/LICENSE
+++ b/importSampleData/LICENSE
--- a/importSampleData/README.md
+++ b/importSampleData/README.md
--- a/importSampleData/app/main.go
+++ b/importSampleData/app/main.go
--- a/importSampleData/config/cfg.toml
+++ b/importSampleData/config/cfg.toml
--- a/importSampleData/dashboard/sensor_info.json
+++ b/importSampleData/dashboard/sensor_info.json
--- a/importSampleData/data/camera_detection.json
+++ b/importSampleData/data/camera_detection.json
--- a/importSampleData/data/sensor_info.csv
+++ b/importSampleData/data/sensor_info.csv
--- a/importSampleData/go.mod
+++ b/importSampleData/go.mod
-module github.com/taosdata/TDengine/importSampleData
-
-go 1.13
-
-require (
-	github.com/pelletier/go-toml v1.9.0
-	github.com/taosdata/driver-go v0.0.0-20210415143420-d99751356e28
-)
--- a/importSampleData/import/import_config.go
+++ b/importSampleData/import/import_config.go
--- a/packaging/cfg/jh_taos.cfg
+++ b/packaging/cfg/jh_taos.cfg
--- a/packaging/cfg/jh_taosd.service
+++ b/packaging/cfg/jh_taosd.service
--- a/packaging/cfg/khserver.service
+++ b/packaging/cfg/khserver.service
--- a/packaging/cfg/kinghistorian.cfg
+++ b/packaging/cfg/kinghistorian.cfg
--- a/packaging/cfg/power.cfg
+++ b/packaging/cfg/power.cfg
--- a/packaging/cfg/powerd.service
+++ b/packaging/cfg/powerd.service
--- a/packaging/cfg/prodb.cfg
+++ b/packaging/cfg/prodb.cfg
--- a/packaging/cfg/prodbs.service
+++ b/packaging/cfg/prodbs.service
--- a/packaging/cfg/tq.cfg
+++ b/packaging/cfg/tq.cfg
--- a/packaging/cfg/tqd.service
+++ b/packaging/cfg/tqd.service
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
--- a/packaging/release.sh
+++ b/packaging/release.sh
--- a/packaging/sed_jh.bat
+++ b/packaging/sed_jh.bat
--- a/packaging/sed_jh.sh
+++ b/packaging/sed_jh.sh
--- a/packaging/sed_kh.bat
+++ b/packaging/sed_kh.bat
--- a/packaging/sed_kh.sh
+++ b/packaging/sed_kh.sh
--- a/packaging/sed_power.bat
+++ b/packaging/sed_power.bat
--- a/packaging/sed_power.sh
+++ b/packaging/sed_power.sh
--- a/packaging/sed_pro.bat
+++ b/packaging/sed_pro.bat
--- a/packaging/sed_pro.sh
+++ b/packaging/sed_pro.sh
--- a/packaging/sed_tq.bat
+++ b/packaging/sed_tq.bat
--- a/packaging/sed_tq.sh
+++ b/packaging/sed_tq.sh
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -201,6 +201,7 @@ function install_bin() {
  [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
  [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosdemo || :
+  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosBenchmark || :
  [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
  [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
  [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :

--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
 #!/bin/bash
 #
-# Script to stop the service and uninstall TDengine, but retain the config, data and log files.
+# Script to stop and uninstall the service, but retain the config, data and log files.

 set -e
 #set -x

--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
--- a/src/client/src/tscGlobalmerge.c
+++ b/src/client/src/tscGlobalmerge.c
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/AbstractWSResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/AbstractWSResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/BlockResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/BlockResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSClient.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSClient.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSConnection.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSPreparedStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ws/WSStatement.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaDataTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSConnectionTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSConnectionTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSQueryTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSQueryTest.java
--- a/src/connector/nodejs/examples/stmtBindParamBatchSample.js
+++ b/src/connector/nodejs/examples/stmtBindParamBatchSample.js
--- a/src/connector/nodejs/examples/stmtBindParamSample.js
+++ b/src/connector/nodejs/examples/stmtBindParamSample.js
--- a/src/connector/nodejs/examples/stmtBindSingleParamBatchSample.js
+++ b/src/connector/nodejs/examples/stmtBindSingleParamBatchSample.js
--- a/src/connector/nodejs/examples/stmtUseResultSample.js
+++ b/src/connector/nodejs/examples/stmtUseResultSample.js
--- a/src/connector/nodejs/examples/taosBindParamSample.js
+++ b/src/connector/nodejs/examples/taosBindParamSample.js
--- a/src/connector/nodejs/nodetaos/taosMultiBind.js
+++ b/src/connector/nodejs/nodetaos/taosMultiBind.js
--- a/src/connector/nodejs/readme.md
+++ b/src/connector/nodejs/readme.md
--- a/src/connector/nodejs/test/cases/test.cases.js
+++ b/src/connector/nodejs/test/cases/test.cases.js
--- a/src/connector/nodejs/test/cases/test.stmt.js
+++ b/src/connector/nodejs/test/cases/test.stmt.js
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
--- a/taos-tools @ 470ac848
+++ b/taos-tools @ 470ac848
--- a/src/mnode/inc/mnodeDnode.h
+++ b/src/mnode/inc/mnodeDnode.h
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
--- a/src/mnode/src/mnodeUser.c
+++ b/src/mnode/src/mnodeUser.c
--- a/src/query/inc/qAggMain.h
+++ b/src/query/inc/qAggMain.h
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
--- a/src/query/inc/qResultbuf.h
+++ b/src/query/inc/qResultbuf.h
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
--- a/src/query/tests/apercentileTest.cpp
+++ b/src/query/tests/apercentileTest.cpp
--- a/src/util/inc/hash.h
+++ b/src/util/inc/hash.h
--- a/src/util/inc/hashfunc.h
+++ b/src/util/inc/hashfunc.h
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
--- a/tests @ 1bec55ca
+++ b/tests @ 1bec55ca