[TD-12899]<fix>(taosAdapter): make taosd/taosAdapter service decouple (#9760)

* [TD-12899]<fix>(taosAdapter): make taosd/taosAdapter service decouple

* [TD-12899]<fix>(taosAdapter): document refine

* [TD-12899]<fix>(taosAdapter): change run_taosd.sh to run_taosd_and_taosadapter.sh

* [TD-12899]<fix>(taosAdapter): check platform

* [TD-12899]<fix>(taosAdapter): check platform

change to _branch for taosAdapter version

* [TD-12899]<fix>(taosAdapter): taosd and taosAdapter decouple

use taosBenchmark rather than taosdemo

* [TD-12899]<fix>(taosAdapter): taosd and taosAdapter decouple

use 2.4.0.4 docker image in example

* [TD-12899]<fix>(taosAdapter): taosd and taosAdapter decouple

update taosadapter.service

cmake/platform.inc

@@ -96,10 +96,12 @@ IF ("${CPUTYPE}" STREQUAL "")
     MESSAGE(STATUS "The current platform is amd64")
     MESSAGE(STATUS "Set CPUTYPE to x64")
     SET(CPUTYPE "x64")
+    SET(PLATFORM_ARCH_STR "amd64")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)")
     MESSAGE(STATUS "The current platform is x86")
     MESSAGE(STATUS "Set CPUTYPE to x86")
     SET(CPUTYPE "x32")
+    SET(PLATFORM_ARCH_STR "i386")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l")
     MESSAGE(STATUS "Set CPUTYPE to aarch32")
     SET(CPUTYPE "aarch32")
@@ -107,12 +109,14 @@ IF ("${CPUTYPE}" STREQUAL "")
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_32 FALSE)
     SET(TD_ARM_32 TRUE)
+    SET(PLATFORM_ARCH_STR "arm")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
     SET(CPUTYPE "aarch64")
     MESSAGE(STATUS "Set CPUTYPE to aarch64")
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_64 FALSE)
     SET(TD_ARM_64 TRUE)
+    SET(PLATFORM_ARCH_STR "arm64")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
     SET(CPUTYPE "mips64")
     MESSAGE(STATUS "Set CPUTYPE to mips64")
@@ -124,7 +128,6 @@ IF ("${CPUTYPE}" STREQUAL "")
     MESSAGE(STATUS "Set CPUTYPE to apple silicon m1")
     SET(TD_ARM_64 TRUE)
   ENDIF ()
-
 ELSE ()
   # if generate ARM version:
   #   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
@@ -132,27 +135,33 @@ ELSE ()
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_32 FALSE)
     SET(TD_ARM_32 TRUE)
+    SET(PLATFORM_ARCH_STR "arm")
     MESSAGE(STATUS "input cpuType: aarch32")
   ELSEIF (${CPUTYPE} MATCHES "aarch64")
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_64 FALSE)
     SET(TD_ARM_64 TRUE)
+    SET(PLATFORM_ARCH_STR "arm64")
     MESSAGE(STATUS "input cpuType: aarch64")
   ELSEIF (${CPUTYPE} MATCHES "mips64")
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_64 FALSE)
     SET(TD_MIPS_64 TRUE)
+    SET(PLATFORM_ARCH_STR "mips")
     MESSAGE(STATUS "input cpuType: mips64")
   ELSEIF (${CPUTYPE} MATCHES "x64")
+    SET(PLATFORM_ARCH_STR "amd64")
     MESSAGE(STATUS "input cpuType: x64")
   ELSEIF (${CPUTYPE} MATCHES "x86")
+    SET(PLATFORM_ARCH_STR "i386")
     MESSAGE(STATUS "input cpuType: x86")
   ELSE ()
     MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE})
   ENDIF ()
-  
 ENDIF ()
 
+MESSAGE(STATUS "platform arch:" ${PLATFORM_ARCH_STR})
+
 #   cmake -DOSTYPE=Ningsi
 IF (${OSTYPE} MATCHES "Ningsi60")
   SET(TD_NINGSI TRUE)

documentation20/cn/02.getting-started/01.docker/docs.md

@@ -61,7 +61,7 @@ c452519b0f9b   tdengine/tdengine   "taosd"   14 minutes ago   Up 14 minutes   ·
 
 ```bash
 $ docker exec -it tdengine /bin/bash
-root@tdengine-server:~/TDengine-server-2.0.20.13# 
+root@tdengine-server:~/TDengine-server-2.4.0.4#
 ```
 
 - **docker exec**：通过 docker exec 命令进入容器，如果退出，容器不会停止。
@@ -73,12 +73,12 @@ root@tdengine-server:~/TDengine-server-2.0.20.13#
 进入容器后，执行 taos shell 客户端程序。
 
 ```bash
-root@tdengine-server:~/TDengine-server-2.0.20.13# taos
+root@tdengine-server:~/TDengine-server-2.4.0.4# taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
-taos> 
+taos>
 ```
 
 TDengine 终端成功连接服务端，打印出了欢迎消息和版本信息。如果失败，会有错误信息打印出来。
@@ -93,7 +93,7 @@ TDengine 终端成功连接服务端，打印出了欢迎消息和版本信息
 ```
 $ taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.22.3
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
 taos>
@@ -113,16 +113,29 @@ TDengine RESTful 接口详情请参考[官方文档](https://www.taosdata.com/cn
 
 ### 使用 Docker 容器运行 TDengine server 和 taosAdapter
 
-在 TDegnine 2.4.0.0 之后版本的 Docker 容器，开始一个组件 taosAdapter，taosAdapter 支持通过 RESTful 接口对 TDengine server 的数据写入和查询能力，并提供和 InfluxDB/OpenTSDB 兼容的数据摄取接口，允许 InfluxDB/OpenTSDB 应用程序无缝移植到 TDengine。
+在 TDegnine 2.4.0.0 之后版本的 Docker 容器，开始提供一个独立运行的组件 taosAdapter，代替之前版本 TDengine 中 taosd 进程中内置的 http server。taosAdapter 支持通过 RESTful 接口对 TDengine server 的数据写入和查询能力，并提供和 InfluxDB/OpenTSDB 兼容的数据摄取接口，允许 InfluxDB/OpenTSDB 应用程序无缝移植到 TDengine。在新版本 Docker 镜像中，默认运行 taosd，而 taosAdapter 没有运行；也可以使用 docker run 命令中指定 taosadapter 的方式来运行 taosadapter，而 taosd 不会运行；或者在 docker run 命令中指定运行 run_taosd_and_taosadapter.sh 来同时运行 taosd 和 taosAdapter。
 
 注意：如果容器中运行 taosAdapter，需要根据需要增加映射其他端口，具体端口默认配置和修改方法请参考[taosAdapter文档](https://github.com/taosdata/taosadapter/blob/develop/README-CN.md)。
 
-使用 docker 运行 TDengine 2.4.0.0 版本镜像：
+使用 docker 运行 TDengine 2.4.0.4 版本镜像（仅 taosd）：
+
+```
+$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.4
+```
+
+使用 docker 运行 TDengine 2.4.0.4 版本镜像（仅 taosAdapter）：
+
+```
+$ docker run -d --name tdengine-taosa -p 6041-6049:6041-6049 -p 6041-6049:6041-6049/udp tdengine/tdengine:2.4.0.4 taosadapter
+```
+
+使用 docker 运行 TDengine 2.4.0.4 版本镜像（同时运行 taosd 和 taosAdapter）：
 
 ```
-$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.0
+$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.4 run_taosd_and_taosadapter.sh
 ```
 
+
 使用 curl 命令验证 RESTful 接口可以正常工作：
 ```
 $ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'show databases;' 127.0.0.1:6041/rest/sql
@@ -165,19 +178,139 @@ taos>
 可以看到模拟数据已经被写入到 TDengine 中。
 
 
-### 应用示例：在宿主机使用 taosdemo 写入数据到 Docker 容器中的 TDengine server
+### 应用示例：在宿主机使用 taosBenchmark 写入数据到 Docker 容器中的 TDengine server
 
-1，在宿主机命令行界面执行 taosdemo 写入数据到 Docker 容器中的 TDengine server
+1，在宿主机命令行界面执行 taosBenchmark （曾命名为 taosdemo）写入数据到 Docker 容器中的 TDengine server
 
 ```bash
-$ taosdemo
+$ taosBenchmark
 
-taosdemo is simulating data generated by power equipments monitoring...
+taosBenchmark is simulating data generated by power equipments monitoring...
 
 host:                       127.0.0.1:6030
 user:                       root
 password:                   taosdata
-configDir:                  
+configDir:
+resultFile:                 ./output.txt
+thread num of insert data:  10
+thread num of create table: 10
+top insert interval:        0
+
+使用 curl 命令验证 RESTful 接口可以正常工作：
+```
+$ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'show databases;' 127.0.0.1:6041/rest/sql
+
+{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[["log","2021-12-28 09:18:55.765",10,1,1,1,10,"30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":1}
+```
+
+taosAdapter 支持多个数据收集代理软件（如 Telegraf、StatsD、collectd 等），这里仅模拟 StasD 写入数据，在宿主机执行命令如下：
+```
+$ echo "foo:1|c" | nc -u -w0 127.0.0.1 6044
+```
+
+然后可以使用 taos shell 查询 taosAdapter 自动创建的数据库 statsd 和 超级表 foo 中的内容：
+```
+taos> show databases;
+              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
+====================================================================================================================================================================================================================================================================================
+ log                            | 2021-12-28 09:18:55.765 |          12 |           1 |       1 |      1 |     10 | 30                       |           1 |           3 |         100 |        4096 |        1 |        3000 |    2 |         0 | us        |      0 | ready      |
+ statsd                         | 2021-12-28 09:21:48.841 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
+Query OK, 2 row(s) in set (0.002112s)
+
+taos> use statsd;
+Database changed.
+
+taos> show stables;
+              name              |      created_time       | columns |  tags  |   tables    |
+============================================================================================
+ foo                            | 2021-12-28 09:21:48.894 |       2 |      1 |           1 |
+Query OK, 1 row(s) in set (0.001160s)
+
+taos> select * from foo;
+              ts               |         value         |         metric_type          |
+=======================================================================================
+ 2021-12-28 09:21:48.840820836 |                     1 | counter                      |
+Query OK, 1 row(s) in set (0.001639s)
+
+taos>
+```
+
+可以看到模拟数据已经被写入到 TDengine 中。
+
+
+### 应用示例：在宿主机使用 taosBenchmark 写入数据到 Docker 容器中的 TDengine server
+
+1，在宿主机命令行界面执行 taosBenchmark 写入数据到 Docker 容器中的 TDengine server
+
+```bash
+$ taosBenchmark
+
+taosBenchmark is simulating data generated by power equipments monitoring...
+
+host:                       127.0.0.1:6030
+user:                       root
+password:                   taosdata
+configDir:
+resultFile:                 ./output.txt
+thread num of insert data:  10
+thread num of create table: 10
+top insert interval:        0
+
+使用 curl 命令验证 RESTful 接口可以正常工作：
+```
+$ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'show databases;' 127.0.0.1:6041/rest/sql
+
+{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[["log","2021-12-28 09:18:55.765",10,1,1,1,10,"30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":1}
+```
+
+taosAdapter 支持多个数据收集代理软件（如 Telegraf、StatsD、collectd 等），这里仅模拟 StasD 写入数据，在宿主机执行命令如下：
+```
+$ echo "foo:1|c" | nc -u -w0 127.0.0.1 6044
+```
+
+然后可以使用 taos shell 查询 taosAdapter 自动创建的数据库 statsd 和 超级表 foo 中的内容：
+```
+taos> show databases;
+              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
+====================================================================================================================================================================================================================================================================================
+ log                            | 2021-12-28 09:18:55.765 |          12 |           1 |       1 |      1 |     10 | 30                       |           1 |           3 |         100 |        4096 |        1 |        3000 |    2 |         0 | us        |      0 | ready      |
+ statsd                         | 2021-12-28 09:21:48.841 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
+Query OK, 2 row(s) in set (0.002112s)
+
+taos> use statsd;
+Database changed.
+
+taos> show stables;
+              name              |      created_time       | columns |  tags  |   tables    |
+============================================================================================
+ foo                            | 2021-12-28 09:21:48.894 |       2 |      1 |           1 |
+Query OK, 1 row(s) in set (0.001160s)
+
+taos> select * from foo;
+              ts               |         value         |         metric_type          |
+=======================================================================================
+ 2021-12-28 09:21:48.840820836 |                     1 | counter                      |
+Query OK, 1 row(s) in set (0.001639s)
+
+taos>
+```
+
+可以看到模拟数据已经被写入到 TDengine 中。
+
+
+### 应用示例：在宿主机使用 taosBenchmark 写入数据到 Docker 容器中的 TDengine server
+
+1，在宿主机命令行界面执行 taosBenchmark 写入数据到 Docker 容器中的 TDengine server
+
+```bash
+$ taosBenchmark
+
+taosBenchmark is simulating data generated by power equipments monitoring...
+
+host:                       127.0.0.1:6030
+user:                       root
+password:                   taosdata
+configDir:
 resultFile:                 ./output.txt
 thread num of insert data:  10
 thread num of create table: 10
@@ -206,13 +339,13 @@ database[0]:
       maxSqlLen:         1048576
       timeStampStep:     1
       startTimestamp:    2017-07-14 10:40:00.000
-      sampleFormat:      
-      sampleFile:        
-      tagsFile:          
+      sampleFormat:
+      sampleFile:
+      tagsFile:
       columnCount:       3
-column[0]:FLOAT column[1]:INT column[2]:FLOAT 
+column[0]:FLOAT column[1]:INT column[2]:FLOAT
       tagCount:            2
-        tag[0]:INT tag[1]:BINARY(16) 
+        tag[0]:INT tag[1]:BINARY(16)
 
          Press enter key to continue or Ctrl-C to stop
 ```
@@ -221,17 +354,17 @@ column[0]:FLOAT column[1]:INT column[2]:FLOAT
 
 最后共插入 1 亿条记录。
 
-2，进入 TDengine 终端，查看 taosdemo 生成的数据。
+2，进入 TDengine 终端，查看 taosBenchmark 生成的数据。
 
 - **进入命令行。**
 
 ```bash
-$ root@c452519b0f9b:~/TDengine-server-2.0.20.13# taos
+$ root@c452519b0f9b:~/TDengine-server-2.4.0.4# taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
-taos> 
+taos>
 ```
 
 - **查看数据库。**

documentation20/cn/02.getting-started/docs.md

@@ -2,7 +2,7 @@
 
 ## <a class="anchor" id="install"></a>快捷安装
 
-TDengine 软件分为服务器、客户端和报警模块三部分，目前 2.0 版服务器仅能在 Linux 系统上安装和运行，后续会支持 Windows、Mac OS 等系统。客户端可以在 Windows 或 Linux 上安装和运行。任何 OS 的应用也可以选择 RESTful 接口连接服务器 taosd。CPU 支持 X64/ARM64/MIPS64/Alpha64，后续会支持 ARM32、RISC-V 等 CPU 架构。用户可根据需求选择通过 [源码](https://www.taosdata.com/cn/getting-started/#通过源码安装) 或者 [安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装) 来安装。
+TDengine 软件分为服务器、客户端和报警模块三部分，目前 2.0 版服务器仅能在 Linux 系统上安装和运行，后续会支持 Windows、Mac OS 等系统。客户端可以在 Windows 或 Linux 上安装和运行。任何 OS 的应用也可以选择 RESTful 接口连接服务器 taosd，其中 2.4 之后版本默认使用单独运行的独立组件 taosAdapter 提供 http 服务，之前版本使用内置 http 服务。CPU 支持 X64/ARM64/MIPS64/Alpha64，后续会支持 ARM32、RISC-V 等 CPU 架构。用户可根据需求选择通过 [源码](https://www.taosdata.com/cn/getting-started/#通过源码安装) 或者 [安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装) 来安装。
 
 ### <a class="anchor" id="source-install"></a>通过源码安装
 
@@ -134,10 +134,10 @@ taos> source <filename>;
 
 ## <a class="anchor" id="demo"></a>TDengine 极速体验
 
-启动 TDengine 的服务，在 Linux 终端执行 taosdemo
+启动 TDengine 的服务，在 Linux 终端执行 taosBenchmark （曾命名为 taosdemo）：
 
 ```bash
-$ taosdemo
+$ taosBenchmark
 ```
 
 该命令将在数据库 test 下面自动创建一张超级表 meters，该超级表下有 1 万张表，表名为 "d0" 到 "d9999"，每张表有 1 万条记录，每条记录有 (ts, current, voltage, phase) 四个字段，时间戳从 "2017-07-14 10:40:00 000" 到 "2017-07-14 10:40:09 999"，每张表带有标签 location 和 groupId，groupId 被设置为 1 到 10， location 被设置为 "beijing" 或者 "shanghai"。
@@ -175,10 +175,10 @@ taos> select avg(current), max(voltage), min(phase) from test.meters where group
 ```mysql
 taos> select avg(current), max(voltage), min(phase) from test.d10 interval(10s);
 ```
-## <a class="anchor" id="taosdemo"></a> taosdemo 详细功能列表
+## <a class="anchor" id="taosBenchmark"></a> taosBenchmark 详细功能列表
 
-taosdemo 命令本身带有很多选项，配置表的数目、记录条数等等，请执行 `taosdemo --help` 详细列出。您可以设置不同参数进行体验。
-taosdemo 详细使用方法请参照 [如何使用taosdemo对TDengine进行性能测试](https://www.taosdata.com/cn/documentation/getting-started/taosdemo )。
+taosBenchmark 命令本身带有很多选项，配置表的数目、记录条数等等，请执行 `taosBenchmark --help` 详细列出。您可以设置不同参数进行体验。
+taosBenchmark 详细使用方法请参照 [如何使用taosBenchmark对TDengine进行性能测试](https://www.taosdata.com/cn/documentation/getting-started/taosBenchmark )。
 
 ## 客户端和报警模块
 

documentation20/cn/09.connections/docs.md

@@ -64,7 +64,7 @@ GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=tdengine-datasource
 
 ![img](../images/connections/add_datasource3.jpg)
 
-* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6041)，默认 http://localhost:6041 。
+* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6041)，默认 http://localhost:6041。注意：从 2.4 版本开始 RESTful 服务默认使用独立组件 taosAdapter 提供，请参考相关文档配置部署。
 * User：TDengine 用户名。
 * Password：TDengine 用户密码。
 

documentation20/cn/11.administrator/docs.md

@@ -119,7 +119,7 @@ taosd -C
 | 1     | firstEP                 |          | **SC**   |          | taosd启动时，主动连接的集群中首个dnode的end point           |                                                              | localhost:6030                                            |                                                              |
 | 2     | secondEP                | YES      | **SC**   |          | taosd启动时，如果firstEp连接不上，尝试连接集群中第二个dnode的end point |                                                              | 无                                                           |                                                              |
 | 3     | fqdn                    |          | **SC**   |          | 数据节点的FQDN。如果习惯IP地址访问，可设置为该节点的IP地址。   |                                                              | 缺省为操作系统配置的第一个hostname。                             | 这个参数值的长度需要控制在 96 个字符以内。                         |
-| 4     | serverPort              |          | **SC**   |          | taosd启动后，对外服务的端口号                              |                                                              | 6030                                                         | RESTful服务使用的端口号是在此基础上+11，即默认值为6041。            |
+| 4     | serverPort              |          | **SC**   |          | taosd启动后，对外服务的端口号                              |                                                              | 6030                                                         | RESTful服务使用的端口号是在此基础上+11，即默认值为6041（注意2.4及后续版本使用 taosAdapter 提供 RESTful 接口）。            |
 | 5     | logDir                  |          | **SC**   |          | 日志文件目录，客户端和服务器的运行日志将写入该目录           |                                                              | /var/log/taos                                                |                                                              |
 | 6     | scriptDir               | YES      | **S**    |          |                                                              |                                                              |                                                              |                                                              |
 | 7     | dataDir                 |          | **S**    |          | 数据文件目录，所有的数据文件都将写入该目录                   |                                                              | /var/lib/taos                                                |                                                              |
@@ -180,10 +180,10 @@ taosd -C
 | 62    | http                    |          | **S**    |          | 服务器内部的http服务开关。                                   | 0：关闭http服务， 1：激活http服务。                          | 1                                                            |                                                              |
 | 63    | mqtt                    | YES      | **S**    |          | 服务器内部的mqtt服务开关。                                   | 0：关闭mqtt服务， 1：激活mqtt服务。                          | 0                                                            |                                                              |
 | 64    | monitor                 |          | **S**    |          | 服务器内部的系统监控开关。监控主要负责收集物理节点的负载状况，包括CPU、内存、硬盘、网络带宽、HTTP请求量的监控记录，记录信息存储在`LOG`库中。 | 0：关闭监控服务， 1：激活监控服务。                          | 0                                                            |                                                              |
-| 65    | httpEnableRecordSql     |          | **S**    |          | 内部使用，记录通过RESTFul接口，产生的SQL调用                 |                                                              | 0                                                            | 生成的文件（httpnote.0/httpnote.1），与服务端日志所在目录相同。 |
-| 66    | httpMaxThreads          |          | **S**    |          | RESTFul接口的线程数                                          |                                                              | 2                                                            |                                                              |
+| 65    | httpEnableRecordSql     |          | **S**    |          | 内部使用，记录通过RESTFul接口，产生的SQL调用。taosAdapter 配置或有不同，请参考相应[文档](https://www.taosdata.com/cn/documentation/tools/adapter)。                 |                                                              | 0                                                            | 生成的文件（httpnote.0/httpnote.1），与服务端日志所在目录相同。 |
+| 66    | httpMaxThreads          |          | **S**    |          | RESTFul接口的线程数。taosAdapter 配置或有不同，请参考相应[文档](https://www.taosdata.com/cn/documentation/tools/adapter)。                                         |                                                              | 2                                                            |                                                              |
 | 67    | telegrafUseFieldNum     | YES      |          |          |                                                              |                                                              |                                                              |                                                              |
-| 68    | restfulRowLimit         |          | **S**    |          | RESTFul接口单次返回的记录条数                                |                                                              | 10240                                                        | 最大10,000,000                                               |
+| 68    | restfulRowLimit         |          | **S**    |          | RESTFul接口单次返回的记录条数。taosAdapter 配置或有不同，请参考相应[文档](https://www.taosdata.com/cn/documentation/tools/adapter)。                                |                                                              | 10240                                                        | 最大10,000,000                                               |
 | 69    | numOfLogLines           |          | **SC**   |          | 单个日志文件允许的最大行数。                                 |                                                              | 10,000,000                                                   |                                                              |
 | 70    | asyncLog                |          | **SC**   |          | 日志写入模式                                                 | 0：同步、1：异步                                             | 1                                                            |                                                              |
 | 71    | logKeepDays             |          | **SC**   | 天       | 日志文件的最长保存时间                                         |                                                              | 0                                                            | 大于0时，日志文件会被重命名为taosdlog.xxx，其中xxx为日志文件最后修改的时间戳。       |
@@ -641,9 +641,11 @@ TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下
 - *taosd*：TDengine服务端可执行文件
 - *taos*：TDengine Shell可执行文件
 - *taosdump*：数据导入导出工具
-- *taosdemo*：TDengine测试工具
+- *taosBenchmark*：TDengine测试工具
 - remove.sh：卸载TDengine的脚本，请谨慎执行，链接到/usr/bin目录下的**rmtaos**命令。会删除TDengine的安装目录/usr/local/taos，但会保留/etc/taos、/var/lib/taos、/var/log/taos。
 
+注意：2.4.0.0 版本之后的 taosBenchmark 和 taosdump 需要安装独立安装包 taosTools。
+
 您可以通过修改系统配置文件taos.cfg来配置不同的数据目录和日志目录。
 
 ## TDengine 的启动、停止、卸载

documentation20/cn/13.faq/docs.md

@@ -188,7 +188,7 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 | TCP | 6030      | 客户端与服务端之间通讯。            | 由配置文件设置 serverPort 决定。 |
 | TCP | 6035      | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
 | TCP | 6040      | 多节点集群的节点间数据同步。        | 随 serverPort 端口变化。         |
-| TCP | 6041      | 客户端与服务端之间的 RESTful 通讯。 | 随 serverPort 端口变化。        |
+| TCP | 6041      | 客户端与服务端之间的 RESTful 通讯。 | 随 serverPort 端口变化。注意 taosAdapter 配置或有不同，请参考相应[文档](https://www.taosdata.com/cn/documentation/tools/adapter)。        |
 | TCP | 6042      | Arbitrator 的服务端口。           | 随 Arbitrator 启动参数设置变化。 |
 | TCP | 6043      | TaosKeeper 监控服务端口。         | 随 TaosKeeper 启动参数设置变化。 |
 | TCP | 6044      | 支持 StatsD 的数据接入端口。       | 随 taosAdapter 启动参数设置变化（2.3.0.1+以上版本）。 |
@@ -199,7 +199,7 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 
 **20. go 语言编写组件编译失败怎样解决？**
 
-新版本 TDengine 2.3.0.0 包含一个使用 go 语言开发的 taosAdapter 组件，取代之前内置的 httpd ，提供包含原  httpd 功能以及支持多种其他软件（Prometheus、Telegraf、collectd、StatsD等）的数据接入功能。
+新版本 TDengine 2.3.0.0 包含一个使用 go 语言开发的 taosAdapter 独立组件，需要单独运行，取代之前 taosd 内置的 httpd ，提供包含原  httpd 功能以及支持多种其他软件（Prometheus、Telegraf、collectd、StatsD等）的数据接入功能。
 使用最新 develop 分支代码编译需要先 `git submodule update --init --recursive` 下载 taosAdapter 仓库代码后再编译。
 
 目前编译方式默认自动编译 taosAdapter。go 语言版本要求 1.14 以上，如果发生 go 编译错误，往往是国内访问 go mod 问题，可以通过设置 go 环境变量来解决：

documentation20/en/02.getting-started/01.docker/docs.md

@@ -61,7 +61,7 @@ c452519b0f9b   tdengine/tdengine   "taosd"   14 minutes ago   Up 14 minutes   ·
 
 ```bash
 $ docker exec -it tdengine /bin/bash
-root@tdengine-server:~/TDengine-server-2.0.20.13# 
+root@tdengine-server:~/TDengine-server-2.4.0.4# 
 ```
 
 - **docker exec**: Enter the container by `docker exec` command, if exited, the container will not stop.
@@ -73,9 +73,9 @@ root@tdengine-server:~/TDengine-server-2.0.20.13#
 After entering the container, execute the taos shell client program.
 
 ```bash
-root@tdengine-server:~/TDengine-server-2.0.20.13# taos
+root@tdengine-server:~/TDengine-server-2.4.0.4# taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
 taos> 
@@ -92,7 +92,7 @@ After starting the TDengine Docker container with the correct port mapped with t
 ```
 $ taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.22.3
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
 taos>
@@ -116,10 +116,10 @@ Docker containers of TDegnine version 2.4.0.0 and later include a component name
 
 Note: If taosAdapter is running inside the container, you need to add mapping to other additional ports as needed, please refer to [taosAdapter documentation](https://github.com/taosdata/taosadapter/blob/develop/README.md) for the default port number and modification methods for the specific purpose.
 
-Running TDengine version 2.4.0.0 image with docker.
+Running TDengine version 2.4.0.4 image with docker.
 
 ```
-$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.0
+$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.4
 ```
 
 Verify that the RESTful interface taosAdapter provides working using the `curl` command.
@@ -164,13 +164,13 @@ taos>
 You can see that the simulation data has been written to TDengine.
 
 
-### Application example: write data to TDengine server in Docker container using taosdemo on the host
+### Application example: write data to TDengine server in Docker container using taosBenchmark on the host
 
-1, execute taosdemo in the host command line interface to write data to the TDengine server in the Docker container
+1, execute `taosBenchmark` (was named taosdemo) in the host command line interface to write data to the TDengine server in the Docker container
 ```bash
-$ taosdemo
+$ taosBenchmark
 
-taosdemo is simulating data generated by power equipments monitoring...
+taosBenchmark is simulating data generated by power equipments monitoring...
 
 host:                       127.0.0.1:6030
 user:                       root
@@ -219,14 +219,14 @@ After enter, this command will automatically create a super table `meters` under
 
 It takes about a few minutes to execute this command and ends up inserting a total of 100 million records.
 
-3, Go to the TDengine terminal and view the data generated by taosdemo.
+3, Go to the TDengine terminal and view the data generated by taosBenchmark.
 
 - **Go to the terminal interface.**
 
 ```bash
-$ root@c452519b0f9b:~/TDengine-server-2.0.20.13# taos
+$ root@c452519b0f9b:~/TDengine-server-2.4.0.4# taos
 
-Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.4
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 
 taos> 

documentation20/en/02.getting-started/02.taosdemo/docs.md

-Since TDengine was open sourced in July 2019, it has gained a lot of popularity among time-series database developers with its innovative data modeling design, simple installation method, easy programming interface, and powerful data insertion and query performance. The insertion and querying performance is often astonishing to users who are new to TDengine. In order to help users to experience the high performance and functions of TDengine in the shortest time, we developed an application called taosdemo for insertion and querying performance testing of TDengine. Then user can easily simulate the scenario of a large number of devices generating a very large amount of data. User can easily  manipulate the number of columns, data types, disorder ratio, and number of concurrent threads with taosdemo customized parameters.
+Since TDengine was open sourced in July 2019, it has gained a lot of popularity among time-series database developers with its innovative data modeling design, simple installation method, easy programming interface, and powerful data insertion and query performance. The insertion and querying performance is often astonishing to users who are new to TDengine. In order to help users to experience the high performance and functions of TDengine in the shortest time, we developed an application called `taosBenchmark` (was named `taosdemo`) for insertion and querying performance testing of TDengine. Then user can easily simulate the scenario of a large number of devices generating a very large amount of data. User can easily  manipulate the number of columns, data types, disorder ratio, and number of concurrent threads with taosBenchmark customized parameters.
 
 
-Running taosdemo is very simple. Just download the TDengine installation package (https://www.taosdata.com/cn/all-downloads/) or compiling the TDengine code yourself (https://github.com/taosdata/TDengine). It can be found and run in the installation directory or in the compiled results directory.
+Running taosBenchmark is very simple. Just download the TDengine installation package (https://www.taosdata.com/cn/all-downloads/) or compiling the TDengine code yourself (https://github.com/taosdata/TDengine). It can be found and run in the installation directory or in the compiled results directory.
 
-To run an insertion test with taosdemo
+To run an insertion test with taosBenchmark
 --
-Executing taosdemo without any parameters results in the following output.
+Executing taosBenchmark without any parameters results in the following output.
 ```
-$ taosdemo
+$ taosBenchmark
 
-taosdemo is simulating data generated by power equipment monitoring...
+taosBenchmark is simulating data generated by power equipment monitoring...
 
 host:                       127.0.0.1:6030
 user:                       root
@@ -54,7 +54,7 @@ column[0]:FLOAT column[1]:INT column[2]:FLOAT
          Press enter key to continue or Ctrl-C to stop
 ```
 
-The parameters here shows for what taosdemo will use for data insertion. By default, taosdemo  without entering any command line arguments will simulate a city power grid system's meter data collection scenario as a typical application in the power industry. That is, a database named test will be created, and a super table named meters will be created, where the super table schema is following:
+The parameters here shows for what taosBenchmark will use for data insertion. By default, taosBenchmark  without entering any command line arguments will simulate a city power grid system's meter data collection scenario as a typical application in the power industry. That is, a database named test will be created, and a super table named meters will be created, where the super table schema is following:
 
 ```
 taos> describe test.meters;
@@ -69,7 +69,7 @@ taos> describe test.meters;
 Query OK, 6 row(s) in set (0.002972s)
 ```
 
-After pressing any key taosdemo will create the database test and super table meters and generate 10,000 sub-tables representing 10,000 individule meter devices that report data. That means they independently using the super table meters as a template according to TDengine data modeling best practices.
+After pressing any key taosBenchmark will create the database test and super table meters and generate 10,000 sub-tables representing 10,000 individule meter devices that report data. That means they independently using the super table meters as a template according to TDengine data modeling best practices.
 ```
 taos> use test;
 Database changed.
@@ -91,7 +91,7 @@ taos> show stables;
  meters                         | 2021-08-27 11:21:01.209 |       4 |      2 |       10000 |
 Query OK, 1 row(s) in set (0.001740s)
 ```
-Then taosdemo generates 10,000 records for each meter device.
+Then taosBenchmark generates 10,000 records for each meter device.
 ```
 ...
 ====thread[3] completed total inserted rows: 6250000, total affected rows: 6250000. 347626.22 records/second====
@@ -108,9 +108,9 @@ Spent 18.0863 seconds to insert rows: 100000000, affected rows: 100000000 with 1
 
 insert delay, avg:      28.64ms, max:     112.92ms, min:       9.35ms
 ```
-The above information is the result of a real test on a normal PC server with 8 CPUs and 64G RAM. It shows that taosdemo inserted 100,000,000 (no need to count, 100 million) records in 18 seconds, or an average of 552,909,049 records per second.
+The above information is the result of a real test on a normal PC server with 8 CPUs and 64G RAM. It shows that taosBenchmark inserted 100,000,000 (no need to count, 100 million) records in 18 seconds, or an average of 552,909,049 records per second.
 
-TDengine also offers a parameter-bind interface for better performance, and using the parameter-bind interface (taosdemo -I stmt) on the same hardware for the same amount of data writes, the results are as follows.
+TDengine also offers a parameter-bind interface for better performance, and using the parameter-bind interface (taosBenchmark -I stmt) on the same hardware for the same amount of data writes, the results are as follows.
 ```
 ...
 
@@ -145,14 +145,14 @@ Spent 6.0257 seconds to insert rows: 100000000, affected rows: 100000000 with 16
 
 insert delay, avg:       8.31ms, max:     860.12ms, min:       2.00ms
 ```
-It shows that taosdemo inserted 100 million records in 6 seconds, with a much more higher insertion performance, 1,659,590 records wer inserted per second.
+It shows that taosBenchmark inserted 100 million records in 6 seconds, with a much more higher insertion performance, 1,659,590 records wer inserted per second.
 
 
-Because taosdemo is so easy to use, so we have extended it with more features to support more complex parameter settings for sample data preparation and validation for rapid prototyping.
+Because taosBenchmark is so easy to use, so we have extended it with more features to support more complex parameter settings for sample data preparation and validation for rapid prototyping.
 
-The complete list of taosdemo command-line arguments can be displayed via taosdemo --help as follows.
+The complete list of taosBenchmark command-line arguments can be displayed via taosBenchmark --help as follows.
 ```
-$ taosdemo --help
+$ taosBenchmark --help
 
 -f, --file=FILE The meta file to the execution procedure. Currently, we support standard UTF-8 (without BOM) encoded files only.
 -u, --user=USER The user name to use when connecting to the server.
@@ -160,7 +160,7 @@ $ taosdemo --help
 -c, --config-dir=CONFIG_DIR Configuration directory.
 -h, --host=HOST TDengine server FQDN to connect. The default host is localhost.
 -P, --port=PORT The TCP/IP port number to use for the connection.
--I, --interface=INTERFACE The interface (taosc, rest, and stmt) taosdemo uses. By default use 'taosc'.
+-I, --interface=INTERFACE The interface (taosc, rest, and stmt) taosBenchmark uses. By default use 'taosc'.
 -d, --database=DATABASE Destination database. By default is 'test'.
 -a, --replica=REPLICA Set the replica parameters of the database, By default use 1, min: 1, max: 3.
 -m, --table-prefix=TABLEPREFIX Table prefix name. By default use 'd'.
@@ -196,16 +196,16 @@ for any corresponding short options.
 Report bugs to <support@taosdata.com>.
 ```
 
-taosdemo's parameters are designed to meet the needs of data simulation. A few commonly used parameters are described below.
+taosBenchmark's parameters are designed to meet the needs of data simulation. A few commonly used parameters are described below.
 ```
--I, --interface=INTERFACE     The interface (taosc, rest, and stmt) taosdemo uses. Default is 'taosc'.
+-I, --interface=INTERFACE     The interface (taosc, rest, and stmt) taosBenchmark uses. Default is 'taosc'.
 ```
-The performance difference between different interfaces of taosdemo has been mentioned earlier, the -I parameter is used to select different interfaces, currently taosc, stmt and rest are supported. The -I parameter is used to select different interfaces, currently taosc, stmt and rest are supported. taosc uses SQL statements to write data, stmt uses parameter binding interface to write data, and rest uses RESTful protocol to write data.
+The performance difference between different interfaces of taosBenchmark has been mentioned earlier, the -I parameter is used to select different interfaces, currently taosc, stmt and rest are supported. The -I parameter is used to select different interfaces, currently taosc, stmt and rest are supported. taosc uses SQL statements to write data, stmt uses parameter binding interface to write data, and rest uses RESTful protocol to write data.
 
 ```
 -T, --threads=NUMBER          The number of threads. Default is 8.
 ```
-The -T parameter sets how many threads taosdemo uses to synchronize data writes, so that multiple threads can squeeze as much processing power out of the hardware as possible.
+The -T parameter sets how many threads taosBenchmark uses to synchronize data writes, so that multiple threads can squeeze as much processing power out of the hardware as possible.
 ```
 -b, --data-type=DATATYPE      The data_type of columns, default: FLOAT, INT, FLOAT.
 
@@ -223,11 +223,11 @@ To reach TDengine performance limits, data insertion can be executed by using mu
 -n, --records=NUMBER          The number of records per table. Default is 10000.
 -M, --random                  The value of records generated are totally random. The default is to simulate power equipment scenario.
 ```
-As mentioned earlier, taosdemo creates 10,000 tables by default, and each table writes 10,000 records. taosdemo can set the number of tables and the number of records in each table by -t and -n. The data generated by default without parameters are simulated real scenarios, and the simulated data are current and voltage phase values with certain jitter, which can more realistically show TDengine's efficient data compression ability. If you need to simulate the generation of completely random data, you can pass the -M parameter.
+As mentioned earlier, taosBenchmark creates 10,000 tables by default, and each table writes 10,000 records. taosBenchmark can set the number of tables and the number of records in each table by -t and -n. The data generated by default without parameters are simulated real scenarios, and the simulated data are current and voltage phase values with certain jitter, which can more realistically show TDengine's efficient data compression ability. If you need to simulate the generation of completely random data, you can pass the -M parameter.
 ```
 -y, --answer-yes              Default input yes for prompt.
 ```
-As we can see above, taosdemo outputs a list of parameters for the upcoming operation by default before creating a database or inserting data, so that the user can know what data is about to be written before inserting. To facilitate automatic testing, the -y parameter allows taosdemo to write data immediately after outputting the parameters.
+As we can see above, taosBenchmark outputs a list of parameters for the upcoming operation by default before creating a database or inserting data, so that the user can know what data is about to be written before inserting. To facilitate automatic testing, the -y parameter allows taosBenchmark to write data immediately after outputting the parameters.
 ```
 -O, --disorder=NUMBER         Insert order mode--0: In order, 1 ~ 50: disorder ratio. Default is in order.
 -R, --disorder-range=NUMBER   Out of order data's range, ms, default is 1000.
@@ -236,7 +236,7 @@ In some scenarios, the received data does not arrive in exact order, but contain
 ```
  -g, --debug                   Print debug info.
 ```
-If you are interested in the taosdemo insertion process or if the data insertion result is not as expected, you can use the -g parameter to make taosdemo print the debugging information in the process of the execution to the screen or import it to another file with the Linux redirect command to easily find the cause of the problem. In addition, taosdemo will also output the corresponding executed statements and debugging reasons to the screen after the execution fails. You can search the word "reason" to find the error reason information returned by the TDengine server.
+If you are interested in the taosBenchmark insertion process or if the data insertion result is not as expected, you can use the -g parameter to make taosBenchmark print the debugging information in the process of the execution to the screen or import it to another file with the Linux redirect command to easily find the cause of the problem. In addition, taosBenchmark will also output the corresponding executed statements and debugging reasons to the screen after the execution fails. You can search the word "reason" to find the error reason information returned by the TDengine server.
 ```
 -x, --aggr-func               Test aggregation funtions after insertion.
 ```
@@ -244,7 +244,7 @@ TDengine is not only very powerful in insertion performance, but also in query p
 
 You can see that the select * fetch 100 million rows (not output to the screen) operation consumes only 1.26 seconds. The most of normal aggregation function for 100 million records usually takes only about 20 milliseconds, and even the longest count function takes less than 40 milliseconds.
 ```
-taosdemo -I stmt -T 48 -y -x
+taosBenchmark -I stmt -T 48 -y -x
 ...
 ...
 select          * took 1.266835 second(s)
@@ -264,7 +264,7 @@ select min(current) took 0.025812 second(s)
 select first(current) took 0.024105 second(s)
 ...
 ```
-In addition to the command line approach, taosdemo also supports take a JSON file as an incoming parameter to provide a richer set of settings. A typical JSON file would look like this.
+In addition to the command line approach, taosBenchmark also supports take a JSON file as an incoming parameter to provide a richer set of settings. A typical JSON file would look like this.
 ```
 {
     "filetype": "insert",
@@ -327,11 +327,11 @@ In addition to the command line approach, taosdemo also supports take a JSON fil
     }]
 }
 ```
-For example, we can specify different number of threads for table creation and data insertion with "thread_count" and "thread_count_create_tbl". You can use a combination of "child_table_exists", "childtable_limit" and "childtable_offset" to use multiple taosdemo processes (even on different computers) to write to different ranges of child tables of the same super table at the same time. You can also import existing data by specifying the data source as a csv file with "data_source" and "sample_file".
+For example, we can specify different number of threads for table creation and data insertion with "thread_count" and "thread_count_create_tbl". You can use a combination of "child_table_exists", "childtable_limit" and "childtable_offset" to use multiple taosBenchmark processes (even on different computers) to write to different ranges of child tables of the same super table at the same time. You can also import existing data by specifying the data source as a csv file with "data_source" and "sample_file".
 
-Use taosdemo for query and subscription testing
+Use taosBenchmark for query and subscription testing
 --
-taosdemo can not only write data, but also perform query and subscription functions. However, a taosdemo instance can only support one of these functions, not all three, and the configuration file is used to specify which function to test.
+taosBenchmark can not only write data, but also perform query and subscription functions. However, a taosBenchmark instance can only support one of these functions, not all three, and the configuration file is used to specify which function to test.
 
 The following is the content of a typical query JSON example file.
 ```
@@ -443,7 +443,7 @@ Conclusion
 --
 TDengine is a big data platform designed and optimized for IoT, Telematics, Industrial Internet, DevOps, etc. TDengine shows a high performance that far exceeds similar products due to the innovative data storage and query engine design in the database kernel. And withSQL syntax support and connectors for multiple programming languages (currently Java, Python, Go, C#, NodeJS, Rust, etc. are supported), it is extremely easy to use and has zero learning cost. To facilitate the operation and maintenance needs, we also provide data migration and monitoring functions and other related ecological tools and software.
 
-For users who are new to TDengine, we have developed rich features for taosdemo to facilitate technical evaluation and stress testing. This article is a brief introduction to taosdemo, which will continue to evolve and improve as new features are added to TDengine. 
+For users who are new to TDengine, we have developed rich features for taosBenchmark to facilitate technical evaluation and stress testing. This article is a brief introduction to taosBenchmark, which will continue to evolve and improve as new features are added to TDengine. 
 
- As part of TDengine, taosdemo's source code is fully open on the GitHub. Suggestions or advices about the use or implementation of taosdemo or TDengine are welcomed on GitHub or in the Taos Data user group.
+ As part of TDengine, taosBenchmark's source code is fully open on the GitHub. Suggestions or advices about the use or implementation of taosBenchmark or TDengine are welcomed on GitHub or in the Taos Data user group.
 

documentation20/en/02.getting-started/docs.md

@@ -2,7 +2,7 @@
 
 ## <a class="anchor" id="install"></a>Quick Install
 
-TDengine software consists of 3 parts: server, client, and alarm module. At the moment, TDengine server only runs on Linux (Windows, mac OS and more OS supports will come soon), but client can run on either Windows or Linux. TDengine client can be installed and run on Windows or Linux. Applications based-on any OSes can all connect to server taosd via a RESTful interface. About CPU, TDengine supports X64/ARM64/MIPS64/Alpha64, and ARM32、RISC-V, other more CPU architectures will be supported soon. You can set up and install TDengine server either from the [source code](https://www.taosdata.com/en/getting-started/#Install-from-Source) or the [packages](https://www.taosdata.com/en/getting-started/#Install-from-Package).
+TDengine software consists of 3 parts: server, client, and alarm module. At the moment, TDengine server only runs on Linux (Windows, mac OS and more OS supports will come soon), but client can run on either Windows or Linux. TDengine client can be installed and run on Windows or Linux. Applications based-on any OSes can all connect to server taosd via a RESTful interface. From 2.4 and later version, TDengine use a stand-alone software, taosAdapteer to provide http service. The early version uses the http server embedded in the taosd. About CPU, TDengine supports X64/ARM64/MIPS64/Alpha64, and ARM32、RISC-V, other more CPU architectures will be supported soon. You can set up and install TDengine server either from the [source code](https://www.taosdata.com/en/getting-started/#Install-from-Source) or the [packages](https://www.taosdata.com/en/getting-started/#Install-from-Package).
 
 ### <a class="anchor" id="source-install"></a>Install from Source
 
@@ -138,10 +138,10 @@ taos> source <filename>;
 
 ## <a class="anchor" id="demo"></a>Experience TDengine’s Lightning Speed
 
-After starting the TDengine server, you can execute the command `taosdemo` in the Linux terminal.
+After starting the TDengine server, you can execute the command `taosBenchmark` (was named `taosdemo`) in the Linux terminal.
 
 ```bash 
-$ taosdemo
+$ taosBenchmark
 ```
 
 Using this command, a STable named `meters` will be created in the database `test`. There are 10k tables under this STable, named from `t0` to `t9999`. In each table there are 100k rows of records, each row with columns （`f1`, `f2` and `f3`. The timestamp is from "2017-07-14 10:40:00 000" to "2017-07-14 10:41:39 999". Each table also has tags `areaid` and `loc`: `areaid` is set from 1 to 10, `loc` is set to "beijing" or "shanghai".
@@ -180,10 +180,10 @@ taos> select avg(f1), max(f2), min(f3) from test.meters where areaid=10;
 taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 ```
 
-## <a class="anchor" id="taosdemo"></a> Using taosdemo in detail
+## <a class="anchor" id="taosBenchmark"></a> Using taosBenchmark in detail
 
-you can run command `taosdemo` with many options, like number of tables, rows of records and so on. To know more about these options, you can execute `taosdemo --help` and then take a try using different options.
-Please refer to [How to use taosdemo to test the performance of TDengine](https://www.taosdata.com/en/documentation/getting-started/taosdemo) for detail.
+you can run command `taosBenchmark` with many options, like number of tables, rows of records and so on. To know more about these options, you can execute `taosBenchmark --help` and then take a try using different options.
+Please refer to [How to use taosBenchmark to test the performance of TDengine](https://www.taosdata.com/en/documentation/getting-started/taosBenchmark) for detail.
 
 ## Client and Alarm Module
 

documentation20/en/09.connections/docs.md

@@ -63,7 +63,7 @@ Enter the data source configuration page and modify the corresponding configurat
 
 ![img](../images/connections/add_datasource3.jpg)
 
-- Host: IP address of any server in TDengine cluster and port number of TDengine RESTful interface (6041), default  [http://localhost:6041](http://localhost:6041/)
+- Host: IP address of any server in TDengine cluster and port number of TDengine RESTful interface (6041), use [http://localhost:6041](http://localhost:6041/) to access the interface by default. Note the 2.4 and later version of TDengine use a stand-alone software, taosAdapter to provide RESTful interface. Please refer to its document for configuration and deployment. 
 - User: TDengine username.
 - Password: TDengine user password.
 
@@ -173,4 +173,4 @@ Please replace the IP address in the command above to the correct one. If no err
 The functions below are not supported currently:
 
 - `dbExistsTable(conn, "test")`: if table test exists
-- `dbListTables(conn)`: list all tables in the connection
\ No newline at end of file
+- `dbListTables(conn)`: list all tables in the connection

documentation20/en/11.administrator/docs.md

@@ -91,7 +91,7 @@ Only some important configuration parameters are listed below. For more paramete
 - firstEp: end point of the first dnode which will be connected in the cluster when taosd starts, the default value is localhost: 6030.
 - fqdn: FQDN of the data node, which defaults to the first hostname configured by the operating system. If you want to access via IP address directly, you can set it to the IP address of the node.
 - serverPort: the port number of the external service after taosd started, the default value is 6030.
-- httpPort: the port number used by the RESTful service to which all HTTP requests (TCP) require a query/write request. The default value is 6041.
+- httpPort: the port number used by the RESTful service to which all HTTP requests (TCP) require a query/write request. The default value is 6041. Note 2.4 and later version use a stand-alone software, taosAdapter to provide RESTFul interface.
 - dataDir: the data file directory to which all data files will be written. [Default:/var/lib/taos](http://default/var/lib/taos).
 - logDir: the log file directory to which the running log files of the client and server will be written. [Default:/var/log/taos](http://default/var/log/taos).
 - arbitrator: the end point of the arbitrator in the system; the default value is null.
@@ -538,4 +538,4 @@ At the moment, TDengine has nearly 200 internal reserved keywords, which cannot
 | CONCAT               | GLOB        | METRICS      | SET        | VIEW      |
 | CONFIGS              | GRANTS      | MIN          | SHOW       | WAVG      |
 | CONFLICT             | GROUP       | MINUS        | SLASH      | WHERE     |
-| CONNECTION           |             |              |            |           |
\ No newline at end of file
+| CONNECTION           |             |              |            |           |

packaging/cfg/taosd.service

 [Unit]
 Description=TDengine server service
-After=network-online.target taosadapter.service
-Wants=network-online.target taosadapter.service
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple

packaging/docker/Dockerfile

@@ -18,5 +18,5 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
     LC_ALL=en_US.UTF-8
 
 EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-CMD ["run_taosd.sh"]
+CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]

packaging/tools/install.sh

@@ -191,7 +191,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmtaos   || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo}rm -f ${bin_link_dir}/set_core     || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -203,7 +203,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump          || :
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos          || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core    || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_jh.sh

@@ -172,7 +172,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmjh        || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo}rm -f ${bin_link_dir}/set_core    || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -182,7 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/jhdemo ] && ${csudo}ln -s ${install_main_dir}/bin/jhdemo ${bin_link_dir}/jhdemo            || :
     [ -x ${install_main_dir}/bin/remove_jh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_jh.sh ${bin_link_dir}/rmjh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_kh.sh

@@ -172,7 +172,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmkh        || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo}rm -f ${bin_link_dir}/set_core    || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -182,7 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/khdemo ] && ${csudo}ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo            || :
     [ -x ${install_main_dir}/bin/remove_kh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_kh.sh ${bin_link_dir}/rmkh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_power.sh

@@ -177,7 +177,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmpower   || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo}rm -f ${bin_link_dir}/set_core   || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -187,7 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo}ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo            || :
     [ -x ${install_main_dir}/bin/remove_power.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_power.sh ${bin_link_dir}/rmpower  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_pro.sh

@@ -172,7 +172,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmprodb   || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo}rm -f ${bin_link_dir}/set_core   || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -182,7 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/prodemo ] && ${csudo}ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo            || :
     [ -x ${install_main_dir}/bin/remove_pro.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_pro.sh ${bin_link_dir}/rmprodb  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_tq.sh

@@ -177,7 +177,7 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmtq   || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo}rm -f ${bin_link_dir}/set_core   || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
@@ -187,7 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/tqdemo ] && ${csudo}ln -s ${install_main_dir}/bin/tqdemo ${bin_link_dir}/tqdemo            || :
     [ -x ${install_main_dir}/bin/remove_tq.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_tq.sh ${bin_link_dir}/rmtq  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
-    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
+    [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/make_install.sh

@@ -165,7 +165,7 @@ function install_bin() {
     if [ "$osType" != "Darwin" ]; then
         ${csudo}rm -f ${bin_link_dir}/perfMonitor || :
         ${csudo}rm -f ${bin_link_dir}/set_core || :
-        ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+        ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
         ${csudo}rm -f ${bin_link_dir}/rmtaos   || :
 
         ${csudo}cp -r ${binary_dir}/build/bin/taos ${install_main_dir}/bin || :
@@ -179,7 +179,7 @@ function install_bin() {
         ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
-        ${csudo}cp -r ${script_dir}/run_taosd.sh   ${install_main_dir}/bin
+        ${csudo}cp -r ${script_dir}/run_taosd_and_taosadapter.sh   ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/startPre.sh   ${install_main_dir}/bin
 
         ${csudo}chmod 0555 ${install_main_dir}/bin/*
@@ -191,7 +191,7 @@ function install_bin() {
         [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
         [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo}ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
         [ -x ${install_main_dir}/set_core.sh ]  && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-        [ -x ${install_main_dir}/run_taosd.sh ]  && ${csudo}ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh || :
+        [ -x ${install_main_dir}/run_taosd_and_taosadapter.sh ]  && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
         [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
    else
 

packaging/tools/makepkg.sh

@@ -57,7 +57,7 @@ else
       ${build_dir}/bin/tarbitrator\
       ${script_dir}/remove.sh \
       ${script_dir}/set_core.sh \
-      ${script_dir}/run_taosd.sh \
+      ${script_dir}/run_taosd_and_taosadapter.sh \
       ${script_dir}/startPre.sh \
       ${script_dir}/taosd-dump-cfg.gdb"
 

packaging/tools/makepkg_jh.sh

@@ -56,7 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/jh_taosdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
-  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd_and_taosadapter.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_kh.sh

@@ -56,7 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/khdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
-  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd_and_taosadapter.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_power.sh

@@ -70,7 +70,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/powerdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
-  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
+  cp ${script_dir}/run_taosd_and_taosadapter.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_pro.sh

@@ -56,7 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/prodump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
-  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
+  cp ${script_dir}/run_taosd_and_taosadapter.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_tq.sh

@@ -61,7 +61,7 @@ else
   cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/tqdemo
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
-  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd_and_taosadapter.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/remove.sh

@@ -85,7 +85,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmtaos      || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo}rm -f ${bin_link_dir}/set_core    || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_jh.sh

@@ -74,7 +74,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmjh          || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo}rm -f ${bin_link_dir}/set_core      || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh  || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh  || :
 }
 
 function clean_lib() {

packaging/tools/remove_kh.sh

@@ -74,7 +74,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmkh          || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo}rm -f ${bin_link_dir}/set_core      || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh     || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh     || :
 }
 
 function clean_lib() {

packaging/tools/remove_power.sh

@@ -76,7 +76,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmpower      || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo}rm -f ${bin_link_dir}/set_core     || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_pro.sh

@@ -74,7 +74,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmprodb      || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo}rm -f ${bin_link_dir}/set_core     || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_tq.sh

@@ -38,11 +38,11 @@ initd_mod=0
 service_mod=2
 if pidof systemd &> /dev/null; then
     service_mod=0
-elif $(which service &> /dev/null); then    
+elif $(which service &> /dev/null); then
     service_mod=1
-    service_config_dir="/etc/init.d" 
+    service_config_dir="/etc/init.d"
     if $(which chkconfig &> /dev/null); then
-         initd_mod=1 
+         initd_mod=1
     elif $(which insserv &> /dev/null); then
         initd_mod=2
     elif $(which update-rc.d &> /dev/null); then
@@ -50,7 +50,7 @@ elif $(which service &> /dev/null); then
     else
         service_mod=2
     fi
-else 
+else
     service_mod=2
 fi
 
@@ -76,7 +76,7 @@ function clean_bin() {
     ${csudo}rm -f ${bin_link_dir}/rmtq      || :
     ${csudo}rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo}rm -f ${bin_link_dir}/set_core     || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+    ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
 }
 
 function clean_lib() {
@@ -119,61 +119,61 @@ function clean_service_on_systemd() {
     fi
     ${csudo}systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
     ${csudo}rm -f ${tarbitratord_service_config}
-    
+
     if [ "$verMode" == "cluster" ]; then
-		  nginx_service_config="${service_config_dir}/${nginx_service_name}.service"	
-   	 	if [ -d ${bin_dir}/web ]; then
-   	    if systemctl is-active --quiet ${nginx_service_name}; then
-   	        echo "Nginx for TQ is running, stopping it..."
-   	        ${csudo}systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
-   	    fi
-   	    ${csudo}systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
-      
-   	    ${csudo}rm -f ${nginx_service_config}
-   	  fi
-    fi 
+        nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
+        if [ -d ${bin_dir}/web ]; then
+            if systemctl is-active --quiet ${nginx_service_name}; then
+                echo "Nginx for TQ is running, stopping it..."
+                ${csudo}systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
+            fi
+            ${csudo}systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
+
+            ${csudo}rm -f ${nginx_service_config}
+        fi
+    fi
 }
 
 function clean_service_on_sysvinit() {
     #restart_config_str="tq:2345:respawn:${service_config_dir}/tqd start"
-    #${csudo}sed -i "\|${restart_config_str}|d" /etc/inittab || :    
-    
+    #${csudo}sed -i "\|${restart_config_str}|d" /etc/inittab || :
+
     if pidof tqd &> /dev/null; then
         echo "TQ tqd is running, stopping it..."
         ${csudo}service tqd stop || :
     fi
-    
+
     if pidof tarbitrator &> /dev/null; then
         echo "TQ tarbitrator is running, stopping it..."
         ${csudo}service tarbitratord stop || :
     fi
-    
-    if ((${initd_mod}==1)); then    
+
+    if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tqd ]; then
         ${csudo}chkconfig --del tqd || :
       fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then 
+      if [ -e ${service_config_dir}/tarbitratord ]; then
         ${csudo}chkconfig --del tarbitratord || :
       fi
-    elif ((${initd_mod}==2)); then   
+    elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tqd ]; then
         ${csudo}insserv -r tqd || :
       fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then 
+      if [ -e ${service_config_dir}/tarbitratord ]; then
         ${csudo}insserv -r tarbitratord || :
       fi
-    elif ((${initd_mod}==3)); then  
+    elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tqd ]; then
         ${csudo}update-rc.d -f tqd remove || :
       fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then 
+      if [ -e ${service_config_dir}/tarbitratord ]; then
         ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi
-    
+
     ${csudo}rm -f ${service_config_dir}/tqd || :
     ${csudo}rm -f ${service_config_dir}/tarbitratord || :
-   
+
     if $(which init &> /dev/null); then
         ${csudo}init q || :
     fi
@@ -203,7 +203,7 @@ clean_log
 # Remove link configuration file
 clean_config
 # Remove data link directory
-${csudo}rm -rf ${data_link_dir}    || : 
+csudo}rm -rf ${data_link_dir}    || :
 
 ${csudo}rm -rf ${install_main_dir}
 ${csudo}rm -rf ${install_nginxd_dir}
@@ -214,4 +214,4 @@ else
 fi
 
 echo -e "${GREEN}TQ is removed successfully!${NC}"
-echo 
+echo

src/plugins/CMakeLists.txt

@@ -12,7 +12,7 @@ ELSEIF(TD_BUILD_TAOSA_INTERNAL)
   MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
 ELSE ()
   MESSAGE("")
-  MESSAGE("${Green} use taosadapter as httpd ${ColourReset}")
+  MESSAGE("${Green} use taosadapter as httpd, platform is ${PLATFORM_ARCH_STR} ${ColourReset}")
 
   EXECUTE_PROCESS(
       COMMAND  git rev-parse --abbrev-ref HEAD
@@ -26,7 +26,7 @@ ELSE ()
       STRING(SUBSTRING "${taos_version}" 12 -1 taos_version)
       STRING(STRIP "${taos_version}" taos_version)
   ELSE ()
-      STRING(CONCAT taos_version "branch_" "${taos_version}")
+      STRING(CONCAT taos_version "_branch_" "${taos_version}")
       STRING(STRIP "${taos_version}" taos_version)
   ENDIF ()
   EXECUTE_PROCESS(
@@ -61,7 +61,7 @@ ELSE ()
           COMMAND     git clean -f -d
           BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
           INSTALL_COMMAND
-          COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz -o upx.tar.xz && tar -xvJf upx.tar.xz -C ${CMAKE_BINARY_DIR} --strip-components 1 > /dev/null && ${CMAKE_BINARY_DIR}/upx taosadapter || :
+          COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${PLATFORM_ARCH_STR}_linux.tar.xz -o upx.tar.xz && tar -xvJf upx.tar.xz -C ${CMAKE_BINARY_DIR} --strip-components 1 > /dev/null && ${CMAKE_BINARY_DIR}/upx taosadapter || :
           COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
           COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/

taosadapter @ 9e4a94f7

-Subproject commit 8f9501a30b1893c6616d644a924c995aa21ad957
+Subproject commit 9e4a94f7b66abc83ab5d010777f94ab4728f0285