Merge branch 'develop' into szhou/fix/13297

documentation20/cn/00.index/docs.md

@@ -84,11 +84,10 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 
 ## TDengine 组件与工具
 
-* [taosAdapter 用户手册](/tools/adapter)
-* [TDinsight 用户手册](/tools/insight)
-* [taosTools 安装手册](/tools/taos-tools)
-* [taosdump 用户手册](/tools/taosdump)
-* [taosbenchmark 用户手册](/tools/taosbenchmark)
+* [taosAdapter](/tools/adapter): TDengine 集群和应用之间的 RESTful 接口适配服务。
+* [TDinsight](/tools/insight): 监控 TDengine 集群的 Grafana 面板集合。
+* [taosdump](/tools/taosdump): TDengine 数据备份工具。使用 taosdump 请安装 taosTools。
+* [taosBenchmark](/tools/taosbenchmark): TDengine 压力测试工具。使用 taosBenchmark 请安装 taosTools。
 
 ## [与其他工具的连接](/connections)
 

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

@@ -178,7 +178,7 @@ taos> select avg(current), max(voltage), min(phase) from test.d10 interval(10s);
 ## <a class="anchor" id="taosBenchmark"></a> taosBenchmark 详细功能列表
 
 taosBenchmark 命令本身带有很多选项，配置表的数目、记录条数等等，请执行 `taosBenchmark --help` 详细列出。您可以设置不同参数进行体验。
-taosBenchmark 详细使用方法请参照 [如何使用taosBenchmark对TDengine进行性能测试](https://www.taosdata.com/cn/documentation/getting-started/taosBenchmark )。
+taosBenchmark 详细使用方法请参照 [如何使用taosBenchmark对TDengine进行性能测试](https://www.taosdata.com/2021/10/09/3111.html)。
 
 ## 客户端
 

documentation20/en/00.index/docs.md

@@ -81,11 +81,10 @@ TDengine is a highly efficient platform to store, query, and analyze time-series
 
 ## [Components and Tools](/cn/documentation/)
 
-* [taosAdapter User Manual](/tools/adapter)
-* [TDinsight User Manual](/tools/insight)
-* [taosTools Install Manual](/tools/taos-tools)
-* [taosdump User Manual](/tools/taosdump)
-* [taosbenchmark User Manual](/tools/taosbenchmark)
+* [taosAdapter](/tools/adapter): a bridge/adapter between TDengine cluster and applications.
+* [TDinsight](/tools/insight): monitoring TDengine cluster with Grafana.
+* [taosdump](/tools/taosdump): backup tool for TDengine. Please install `taosTools` package for it.
+* [taosBenchmark](tools/taosbenchmark): stress test tool for TDengine. Please install `taosTools` package for it.
 
 ## [Connections with Other Tools](/connections)
 

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

@@ -183,7 +183,7 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 ## <a class="anchor" id="taosBenchmark"></a> Using taosBenchmark in 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.
+Please refer to [How to use taosBenchmark to test the performance of TDengine](https://tdengine.com/2021/10/09/3114.html) for detail.
 
 ## Client and Alarm Module
 

packaging/tools/make_install.sh

@@ -507,8 +507,8 @@ function install_service_on_systemd() {
 
   ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
   ${csudo}bash -c "echo 'Description=${productName} server service' >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
   ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
   ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
   ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"

packaging/tools/post.sh

@@ -427,8 +427,8 @@ function install_service_on_systemd() {
 
     ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo}bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
     ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
     ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
     ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"

src/client/src/tscSQLParser.c

@@ -7068,6 +7068,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     char name1[TSDB_COL_NAME_LEN] = {0};
     tstrncpy(name1, pItem->pVar.pz, sizeof(name1));
     stringProcess(name1, (int32_t)strlen(name1));
+
     TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {

src/connector/node-red-contrib-tdengine/package.json

 {
     "name": "node-red-contrib-tdengine",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "",
     "main": "tdengine.js",
     "repository": {
@@ -10,8 +10,7 @@
     "author": "kevinpan45@163.com",
     "license": "ISC",
     "dependencies": {
-        "axios": "^0.24.0",
-        "mocha": "^9.1.3"
+        "axios": "^0.24.0"
     },
     "node-red": {
         "nodes": {
@@ -23,7 +22,6 @@
         "tdengine"
     ],
     "devDependencies": {
-        "node-red": "^2.1.4",
-        "node-red-node-test-helper": "^0.2.7"
+        "node-red": "^2.1.4"
     }
 }

taos-tools @ d6baa486

-Subproject commit 18916a1719fdfcefe1ed1d4ce0049f36c3ac4796
+Subproject commit d6baa48620fcbff857642c4ec10e3c48226ca97c

tests/develop-test/5-taos-tools/taosbenchmark/telnet_tcp.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 import os
+import time
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -32,6 +33,7 @@ class TDTestCase:
         cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
+        time.sleep(5)
         tdSql.execute("reset query cache")
         tdSql.query("select count(tbname) from opentsdb_telnet.stb1")
         tdSql.checkData(0, 0, 8)