Merge branch 'develop' into test/td-12517

Jenkinsfile

@@ -8,6 +8,7 @@ def skipbuild = 0
 def win_stop = 0
 def scope = []
 def mod = [0,1,2,3,4]
+def sim_mod = [0,1,2,3]
 
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
@@ -367,6 +368,7 @@ pipeline {
               else{
                 sh'''
                   cd ${WKC}
+                  git reset --hard HEAD~10
                   git fetch
                   git checkout ${CHANGE_BRANCH}
                   git pull
@@ -381,7 +383,9 @@ pipeline {
                   temp = (gitlog =~ /\((.*?)\)/)
                   temp = temp[0].remove(1)
                   scope = temp.split(",")
+                  scope = ['connector','query','insert','other','tools','taosAdapter']
                   Collections.shuffle mod
+                  Collections.shuffle sim_mod
                 }
 
               }
@@ -399,10 +403,10 @@ pipeline {
           }
       parallel {
         stage('python_1') {
-          agent{label " slave1 || slave6 || slave11 || slave16 "}
+          agent{label " slave1 || slave11 "}
           steps {
             pre_test()
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 100, unit: 'MINUTES'){
               script{
                 scope.each {
                   sh """
@@ -416,10 +420,10 @@ pipeline {
           }
         }
         stage('python_2') {
-          agent{label " slave2 || slave7 || slave12 || slave17 "}
+          agent{label " slave2 || slave12 "}
           steps {
             pre_test()
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 100, unit: 'MINUTES'){
                  script{
                   scope.each {
                     sh """
@@ -433,7 +437,7 @@ pipeline {
           }
         }
         stage('python_3') {
-          agent{label " slave3 || slave8 || slave13 ||slave18 "}
+          agent{label " slave3 || slave13 "}
           steps {
             timeout(time: 105, unit: 'MINUTES'){
               pre_test()
@@ -450,9 +454,9 @@ pipeline {
           }
         }
         stage('python_4') {
-          agent{label " slave4 || slave9 || slave14 || slave19 "}
+          agent{label " slave4 || slave14 "}
           steps {
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 100, unit: 'MINUTES'){
               pre_test()
               script{
               scope.each {
@@ -468,9 +472,9 @@ pipeline {
           }
         }
         stage('python_5') {
-          agent{label " slave5 || slave10 || slave15 || slave20 "}
+          agent{label " slave5 || slave15 "}
           steps {
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 100, unit: 'MINUTES'){
               pre_test()
               script{
               scope.each {
@@ -485,35 +489,98 @@ pipeline {
             }
           }
         }
-        stage('arm64centos7') {
-          agent{label " arm64centos7 "}
+        stage('sim_1') {
+          agent{label " slave6 || slave16 "}
           steps {
-              pre_test_noinstall()
-            }
+            pre_test()
+            timeout(time: 100, unit: 'MINUTES'){
+                  sh """
+                    date
+                    cd ${WKC}/tests
+                    ./test-CI.sh sim 4 ${sim_mod[0]}
+                    date"""
+              }
+          }            
         }
-        stage('arm64centos8') {
-          agent{label " arm64centos8 "}
+        stage('sim_2') {
+          agent{label " slave7 || slave17 "}
           steps {
-              pre_test_noinstall()
+            pre_test()
+            timeout(time: 100, unit: 'MINUTES'){
+              sh """
+                date
+                cd ${WKC}/tests
+                ./test-CI.sh sim 4 ${sim_mod[1]} 
+                date"""
             }
+          }
         }
-        stage('arm32bionic') {
-          agent{label " arm32bionic "}
+        stage('sim_3') {
+          agent{label " slave8 || slave18 "}
           steps {
-              pre_test_noinstall()
+            timeout(time: 105, unit: 'MINUTES'){
+              pre_test()
+              sh """
+                date
+                cd ${WKC}/tests
+                ./test-CI.sh sim 4 ${sim_mod[2]}
+                date"""
             }
+          }
         }
-        stage('arm64bionic') {
-          agent{label " arm64bionic "}
+        stage('sim_4') {
+          agent{label " slave9 || slave19 "}
           steps {
-              pre_test_noinstall()
+            timeout(time: 100, unit: 'MINUTES'){
+              pre_test()
+              sh """
+                date
+                cd ${WKC}/tests
+                ./test-CI.sh sim 4 ${sim_mod[3]}
+                date"""
+              }
             }
+          
         }
-        stage('arm64focal') {
-          agent{label " arm64focal "}
+        stage('other') {
+          agent{label " slave10 || slave20 "}
           steps {
-              pre_test_noinstall()
+            timeout(time: 100, unit: 'MINUTES'){
+              pre_test()
+              timeout(time: 60, unit: 'MINUTES'){
+                sh '''
+                cd ${WKC}/tests/pytest
+                ./crash_gen.sh -a -p -t 4 -s 2000
+                '''
+              }
+              timeout(time: 60, unit: 'MINUTES'){
+                sh '''
+                cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
+                ./handle_crash_gen_val_log.sh
+                '''
+                sh '''
+                cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
+                ./handle_taosd_val_log.sh
+                '''
+              }
+              catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                ./valgrind-test.sh 2>&1 > mem-error-out.log
+                ./handle_val_log.sh
+                '''
+              } 
+              sh '''
+                cd ${WKC}/tests
+                ./test-all.sh full unit
+                date
+              '''
             }
+          }
         }
         stage('centos7') {
           agent{label " centos7 "}
@@ -545,12 +612,41 @@ pipeline {
               pre_test_mac()
             }
         }
-
+        stage('arm64centos7') {
+          agent{label " arm64centos7 "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64centos8') {
+          agent{label " arm64centos8 "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm32bionic') {
+          agent{label " arm32bionic "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64bionic') {
+          agent{label " arm64bionic "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64focal') {
+          agent{label " arm64focal "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
         stage('build'){
           agent{label " wintest "}
           steps {
             pre_test()
-            script{
+            script{             
                 while(win_stop == 0){
                   sleep(1)
                   }
@@ -560,6 +656,7 @@ pipeline {
         stage('test'){
           agent{label "win"}
           steps{
+            
             catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                 pre_test_win()
                 timeout(time: 20, unit: 'MINUTES'){
@@ -568,7 +665,7 @@ pipeline {
                 .\\test-all.bat wintest
                 '''
                 }
-            }
+            }     
             script{
               win_stop=1
             }

cmake/define.inc

@@ -136,7 +136,6 @@ IF (TD_ALPINE)
   MESSAGE(STATUS "aplhine is defined")
 ENDIF ()
 
-
 IF ("${BUILD_HTTP}" STREQUAL "")
   IF (TD_LINUX)
     IF (TD_ARM_32)
@@ -153,6 +152,9 @@ ELSEIF (${BUILD_HTTP} MATCHES "false")
   SET(TD_BUILD_HTTP FALSE)
 ELSEIF (${BUILD_HTTP} MATCHES "true")
   SET(TD_BUILD_HTTP TRUE)
+ELSEIF (${BUILD_HTTP} MATCHES "internal")
+  SET(TD_BUILD_HTTP FALSE)
+  SET(TD_BUILD_TAOSA_INTERNAL TRUE)
 ELSE ()
   SET(TD_BUILD_HTTP TRUE)
 ENDIF ()

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.3.2.0")
+  SET(TD_VER_NUMBER "2.4.0.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

jemalloc @ ea6b3e97

-Subproject commit 9015e129bd7de389afa4196495451669700904d0
+Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756

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

@@ -15,22 +15,34 @@ $ docker -v
 Docker version 20.10.3, build 48d30b5
 ```
 
-## 在 Docker 容器中运行 TDengine
+## 使用 Docker 在容器中运行 TDengine
 
-1，使用命令拉取 TDengine 镜像，并使它在后台运行。
+### 在 Docker 容器中运行 TDengine server
 
 ```bash
-$  docker run -d --name tdengine tdengine/tdengine
-7760c955f225d72e9c1ec5a4cef66149a7b94dae7598b11eb392138877e7d292
+$ docker run -d -p 6030-6041:6030-6041 -p 6030-6041:6030-6041/udp tdengine/tdengine
+526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd
 ```
 
+这条命令，启动一个运行了 TDengine server 的 docker 容器，并且将容器的 6030 到 6041 端口映射到宿主机的 6030 到 6041 端口上。如果宿主机已经运行了 TDengine server 并占用了相同端口，需要映射容器的端口到不同的未使用端口段。（详情参见 [TDengine 2.0 端口说明](https://www.taosdata.com/cn/documentation/faq#port)）。为了支持 TDengine 客户端操作 TDengine server 服务， TCP 和 UDP 端口都需要打开。
+
 - **docker run**：通过 Docker 运行一个容器
-- **--name tdengine**：设置容器名称，我们可以通过容器名称来查看对应的容器
 - **-d**：让容器在后台运行
+- **-p**：指定映射端口。注意：如果不是用端口映射，依然可以进入 Docker 容器内部使用 TDengine 服务或进行应用开发，只是不能对容器外部提供服务
 - **tdengine/tdengine**：拉取的 TDengine 官方发布的应用镜像
-- **7760c955f225d72e9c1ec5a4cef66149a7b94dae7598b11eb392138877e7d292**：这个返回的长字符是容器 ID，我们也可以通过容器 ID 来查看对应的容器
+- **526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd**：这个返回的长字符是容器 ID，我们也可以通过容器 ID 来查看对应的容器
+
+进一步，还可以使用 docker run 命令启动运行 TDengine server 的 docker 容器，并使用 --name 命令行参数将容器命名为 tdengine，使用 --hostname 指定 hostname 为 tdengine-server，通过 -v 挂载本地目录(-v)，实现宿主机与容器内部的数据同步，防止容器删除后，数据丢失。
 
-2，确认容器是否已经正确运行。
+```
+$ docker run -d --name tdengine --hostname="tdengine-server" -v ~/work/taos/log:/var/log/taos -v ~/work/taos/data:/var/lib/taos  -p 6030-6041:6030-6041 -p 6030-6041:6030-6041/udp tdengine/tdengine
+```
+
+- **--name tdengine**：设置容器名称，我们可以通过容器名称来访问对应的容器
+- **--hostnamename=tdengine-server**：设置容器内 Linux 系统的 hostname，我们可以通过映射 hostname 和 IP 来解决容器 IP 可能变化的问题。
+- **-v**：设置宿主机文件目录映射到容器内目录，避免容器删除后数据丢失。
+
+### 使用 docker ps 命令确认容器是否已经正确运行
 
 ```bash
 $ docker ps
@@ -45,23 +57,23 @@ c452519b0f9b   tdengine/tdengine   "taosd"   14 minutes ago   Up 14 minutes   ·
 - **CREATED**：容器创建时间。
 - **STATUS**：容器状态。UP 表示运行中。
 
-3，进入 Docker 容器内，使用 TDengine。
+### 通过 docker exec 命令，进入到 docker 容器中去做开发
 
 ```bash
 $ docker exec -it tdengine /bin/bash
-root@c452519b0f9b:~/TDengine-server-2.0.20.13# 
+root@tdengine-server:~/TDengine-server-2.0.20.13# 
 ```
 
 - **docker exec**：通过 docker exec 命令进入容器，如果退出，容器不会停止。
 - **-i**：进入交互模式。
 - **-t**：指定一个终端。
-- **c452519b0f9b**：容器 ID，需要根据 docker ps 指令返回的值进行修改。
+- **tdengine**：容器名称，需要根据 docker ps 指令返回的值进行修改。
 - **/bin/bash**：载入容器后运行 bash 来进行交互。
 
-4，进入容器后，执行 taos shell 客户端程序。
+进入容器后，执行 taos shell 客户端程序。
 
 ```bash
-$ root@c452519b0f9b:~/TDengine-server-2.0.20.13# taos
+root@tdengine-server:~/TDengine-server-2.0.20.13# taos
 
 Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
@@ -73,19 +85,92 @@ TDengine 终端成功连接服务端，打印出了欢迎消息和版本信息
 
 在 TDengine 终端中，可以通过 SQL 命令来创建/删除数据库、表、超级表等，并可以进行插入和查询操作。具体可以参考 [TAOS SQL 说明文档](https://www.taosdata.com/cn/documentation/taos-sql)。
 
-## 通过 taosdemo 进一步了解 TDengine
 
-1，接上面的步骤，先退出 TDengine 终端程序。
+### 在宿主机访问 Docker 容器中的 TDengine server
 
-```bash
-$ taos> q
-root@c452519b0f9b:~/TDengine-server-2.0.20.13#
+在使用了 -p 命令行参数映射了正确的端口启动了 TDengine Docker 容器后，就在宿主机使用 taos shell 命令即可访问运行在  Docker 容器中的 TDengine。
+
+```
+$ taos
+
+Welcome to the TDengine shell from Linux, Client Version:2.0.22.3
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos>
 ```
 
-2，在命令行界面执行 taosdemo。
+也可以在宿主机使用 curl 通过 RESTful 端口访问 Docker 容器内的 TDengine server。
+
+```
+$ curl -u root:taosdata -d 'show databases' 127.0.0.1:6041/rest/sql
+{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","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],["keep0,keep1,keep(D)",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":[["test","2021-08-18 06:01:11.021",10000,4,1,1,10,"3650,3650,3650",16,6,100,4096,1,3000,2,0,"ms",0,"ready"],["log","2021-08-18 05:51:51.065",4,1,1,1,10,"30,30,30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":2}
+```
+
+这条命令，通过 RESTful 接口访问 TDengine server，这时连接的是本机的 6041 端口，可见连接成功。
+
+TDengine RESTful 接口详情请参考[官方文档](https://www.taosdata.com/cn/documentation/connector#restful)。
+
+
+### 使用 Docker 容器运行 TDengine server 和 taosAdapter
+
+在 TDegnine 2.4.0.0 之后版本的 Docker 容器，开始一个组件 taosAdapter，taosAdapter 支持通过 RESTful 接口对 TDengine server 的数据写入和查询能力，并提供和 InfluxDB/OpenTSDB 兼容的数据摄取接口，允许 InfluxDB/OpenTSDB 应用程序无缝移植到 TDengine。
+
+注意：如果容器中运行 taosAdapter，需要根据需要增加映射其他端口，具体端口默认配置和修改方法请参考[taosAdapter文档](https://github.com/taosdata/taosadapter/blob/develop/README-CN.md)。
+
+使用 docker 运行 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.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 中。
+
+
+### 应用示例：在宿主机使用 taosdemo 写入数据到 Docker 容器中的 TDengine server
+
+1，在宿主机命令行界面执行 taosdemo 写入数据到 Docker 容器中的 TDengine server
 
 ```bash
-root@c452519b0f9b:~/TDengine-server-2.0.20.13# taosdemo
+$ taosdemo
 
 taosdemo is simulating data generated by power equipments monitoring...
 
@@ -134,9 +219,9 @@ column[0]:FLOAT column[1]:INT column[2]:FLOAT
 
 回车后，该命令将在数据库 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"。
 
-执行这条命令大概需要几分钟，最后共插入 1 亿条记录。
+最后共插入 1 亿条记录。
 
-3，进入 TDengine 终端，查看 taosdemo 生成的数据。
+2，进入 TDengine 终端，查看 taosdemo 生成的数据。
 
 - **进入命令行。**
 
@@ -217,27 +302,3 @@ tdengine
 - **docker stop**：通过 docker stop 停止指定的正在运行中的 docker 镜像。
 - **tdengine**：容器名称。
 
-## 编程开发时连接在 Docker 中的 TDengine
-
-从 Docker 之外连接使用在 Docker 容器内运行的 TDengine 服务，有以下两个思路：
-
-1，通过端口映射(-p)，将容器内部开放的网络端口映射到宿主机的指定端口上。通过挂载本地目录(-v)，可以实现宿主机与容器内部的数据同步，防止容器删除后，数据丢失。
-
-```bash
-$ docker run -d -v /etc/taos:/etc/taos -p 6041:6041 tdengine/tdengine
-526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd
-
-$ curl -u root:taosdata -d 'show databases' 127.0.0.1:6041/rest/sql
-{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","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],["keep0,keep1,keep(D)",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":[["test","2021-08-18 06:01:11.021",10000,4,1,1,10,"3650,3650,3650",16,6,100,4096,1,3000,2,0,"ms",0,"ready"],["log","2021-08-18 05:51:51.065",4,1,1,1,10,"30,30,30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":2}
-```
-
-- 第一条命令，启动一个运行了 TDengine 的 docker 容器，并且将容器的 6041 端口映射到宿主机的 6041 端口上。
-- 第二条命令，通过 RESTful 接口访问 TDengine，这时连接的是本机的 6041 端口，可见连接成功。
-
-注意：在这个示例中，出于方便性考虑，只映射了 RESTful 需要的 6041 端口。如果希望以非 RESTful 方式连接 TDengine 服务，则需要映射从 6030 开始的共 11 个端口（完整的端口情况请参见 [TDengine 2.0 端口说明](https://www.taosdata.com/cn/documentation/faq#port)）。在例子中，挂载本地目录也只是处理了配置文件所在的 /etc/taos 目录，而没有挂载数据存储目录。
-
-2，直接通过 exec 命令，进入到 docker 容器中去做开发。也即，把程序代码放在 TDengine 服务端所在的同一个 Docker 容器中，连接容器本地的 TDengine 服务。
-
-```bash
-$ docker exec -it tdengine /bin/bash
-```

documentation20/cn/08.connector/01.java/docs.md

@@ -83,6 +83,7 @@ TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对
 | BINARY            | java.lang.String              | byte array         |
 | NCHAR             | java.lang.String              | java.lang.String   |
 | JSON              | -                             | java.lang.String   |
+
 注意：JSON类型仅在tag中支持。
 
 ## 安装Java Connector

documentation20/cn/12.taos-sql/docs.md

@@ -1653,7 +1653,7 @@ SELECT COUNT(*) FROM temp_table INTERVAL(1D) SLIDING(2D)
 
 使用整数（布尔值）或字符串来标识产生记录时候设备的状态量。产生的记录如果具有相同的状态量数值则归属于同一个状态窗口，数值改变后该窗口关闭。如下图所示，根据状态量确定的状态窗口分别是[2019-04-28 14:22:07，2019-04-28 14:22:10]和[2019-04-28 14:22:11，2019-04-28 14:22:12]两个。（状态窗口暂不支持对超级表使用）
 
-![时间窗口示意图](../images/sql/timewindow-2.png)
+![时间窗口示意图](../images/sql/timewindow-3.png)
 
 
 使用STATE_WINDOW来确定状态窗口划分的列。例如：
@@ -1665,7 +1665,7 @@ SELECT COUNT(*), FIRST(ts), status FROM temp_tb_1 STATE_WINDOW(status)
 
 会话窗口根据记录的时间戳主键的值来确定是否属于同一个会话。如下图所示，如果设置时间戳的连续的间隔小于等于12秒，则以下6条记录构成2个会话窗口，分别是：[2019-04-28 14:22:10，2019-04-28 14:22:30]和[2019-04-28 14:23:10，2019-04-28 14:23:30]。因为2019-04-28 14:22:30与2019-04-28 14:23:10之间的时间间隔是40秒，超过了连续时间间隔（12秒）。
 
-![时间窗口示意图](../images/sql/timewindow-3.png)
+![时间窗口示意图](../images/sql/timewindow-2.png)
 
 在tol_value时间间隔范围内的结果都认为归属于同一个窗口，如果连续的两条记录的时间超过tol_val，则自动开启下一个窗口。（会话窗口暂不支持对超级表使用）
 

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

@@ -15,22 +15,34 @@ $ docker -v
 Docker version 20.10.3, build 48d30b5
 ```
 
-## Running TDengine in a Docker container
+## Using Docker to run TDengine
 
-1, Use the command to pull the TDengine image and make it run in the background.
+### running TDengine server inside Docker
 
 ```bash
-$  docker run -d --name tdengine tdengine/tdengine
-7760c955f225d72e9c1ec5a4cef66149a7b94dae7598b11eb392138877e7d292
+$ docker run -d -p 6030-6041:6030-6041 -p 6030-6041:6030-6041/udp tdengine/tdengine
+526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd
+```
+
+This command starts a docker container with TDengine server running and maps the container's ports from 6030 to 6041 to the host's ports from 6030 to 6041. If the host is already running TDengine server and occupying the same port(s), you need to map the container's port to a different unused port segment. (Please see [TDengine 2.0 Port Description](https://www.taosdata.com/en/documentation/faq#port) for details). In order to support TDengine clients accessing TDengine server services, both TCP and UDP ports need to be open.
+
+- **docker run**: Run a container via Docker
+- **-d**: put the container run in the background
+- **-p**: specify the port(s) to map. Note: If you do not use port mapping, you can still go inside the Docker container to access TDengine services or develop your application, but you cannot provide services outside the container
+- **tdengine/tdengine**: the official TDengine published application image that is pulled
+- **526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd**: The long character returned is the container ID, and we can also view the corresponding container by its container ID
+
+Further, you can also use the `docker run` command to start the docker container running TDengine server, and use the `--name` command line parameter to name the container tdengine, use `--hostname` to specify the hostname as tdengine-server, and use `-v` to mount the local directory (-v) to synchronize the data inside the host and the container to prevent data loss after the container is deleted.
+
+```
+$ docker run -d --name tdengine --hostname="tdengine-server" -v ~/work/taos/log:/var/log/taos -v ~/work/taos/data:/var/lib/taos  -p 6030-6041:6030-6041 -p 6030-6041:6030-6041/udp tdengine/tdengine
 ```
 
-- **docker run**: Running a container via Docker
-- **--name tdengine**: Set the container name, we can see the corresponding container by the container name
-- **-d**: Keeping containers running in the background
-- **tdengine/tdengine**: Pulled from the official TDengine published application image
-- **7760c955f225d72e9c1ec5a4cef66149a7b94dae7598b11eb392138877e7d292**: The long character returned is the container ID, and we can also view the corresponding container by its container ID
+- **--name tdengine**: set the container name, we can access the corresponding container by container name
+- **--hostnamename=tdengine-server**: set the hostname of the Linux system inside the container, we can map the hostname and IP to solve the problem that the container IP may change.
+- **-v**: Set the host file directory to be mapped to the inner container directory to avoid data loss after the container is deleted.
 
-2, Verify that the container is running correctly.
+### Use the `docker ps` command to verify that the container is running correctly
 
 ```bash
 $ docker ps
@@ -38,30 +50,30 @@ CONTAINER ID   IMAGE               COMMAND   CREATED          STATUS          ·
 c452519b0f9b   tdengine/tdengine   "taosd"   14 minutes ago   Up 14 minutes   ···
 ```
 
-- **docker ps**: Lists information about all containers that are in running state.
-- **CONTAINER ID**: Container ID.
-- **IMAGE**: The mirror used.
-- **COMMAND**: The command to run when starting the container.
-- **CREATED**: The time when the container was created.
-- **STATUS**: The container status. Up means running.
+- **docker ps**: list all containers in running state.
+- **CONTAINER ID**: container ID.
+- **IMAGE**: the image used.
+- **COMMAND**: the command to run when starting the container.
+- **CREATED**: container creation time.
+- **STATUS**: container status. UP means running.
 
-3, Go inside the Docker container and use TDengine.
+### Enter the docker container to do development via the `docker exec` COMMAND
 
 ```bash
 $ docker exec -it tdengine /bin/bash
-root@c452519b0f9b:~/TDengine-server-2.0.20.13# 
+root@tdengine-server:~/TDengine-server-2.0.20.13# 
 ```
 
-- **docker exec**: Enter the container via the docker exec command; if you exit, the container will not stop.
-- **-i**: Enter the interactive mode.
-- **-t**: Specify a terminal.
-- **c452519b0f9b**: The container ID, which needs to be modified according to the value returned by the docker ps command.
-- **/bin/bash**: Load the container and run bash to interact with it.
+- **docker exec**: Enter the container by `docker exec` command, if exited, the container will not stop.
+- **-i**: use interactive mode.
+- **-t**: specify a terminal.
+- **tdengine**: container name, needs to be changed according to the value returned by the docker ps command.
+- **/bin/bash**: load the container and run bash to interact with it.
 
-4, After entering the container, execute the taos shell client program.
+After entering the container, execute the taos shell client program.
 
 ```bash
-$ root@c452519b0f9b:~/TDengine-server-2.0.20.13# taos
+root@tdengine-server:~/TDengine-server-2.0.20.13# taos
 
 Welcome to the TDengine shell from Linux, Client Version:2.0.20.13
 Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
@@ -69,23 +81,94 @@ Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
 taos> 
 ```
 
-The TDengine terminal successfully connects to the server and prints out a welcome message and version information. If it fails, an error message is printed.
+The TDengine shell successfully connects to the server and prints out a welcome message and version information. If it fails, an error message is printed.
 
-In the TDengine terminal, you can create/delete databases, tables, super tables, etc., and perform insert and query operations via SQL commands. For details, you can refer to [TAOS SQL guide](https://www.taosdata.com/en/documentation/taos-sql).
+In the TDengine shell, you can create/delete databases, tables, super tables, etc., and perform insert and query operations via SQL commands. For details, please refer to the [TAOS SQL documentation](https://www.taosdata.com/en/documentation/taos-sql).
 
-## Learn more about TDengine with taosdemo
+### Accessing TDengine server inside Docker container from the host side
 
-1, Following the above steps, exit the TDengine terminal program first.
+After starting the TDengine Docker container with the correct port mapped with the -p command line parameter, you can access the TDengine running inside the Docker container from the host side using the taos shell command.
+
+```
+$ taos
+
+Welcome to the TDengine shell from Linux, Client Version:2.0.22.3
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos>
+```
+
+You can also access the TDengine server inside the Docker container using `curl` command from the host side through the RESTful port.
 
-```bash
-$ taos> q
-root@c452519b0f9b:~/TDengine-server-2.0.20.13#
 ```
+$ curl -u root:taosdata -d 'show databases' 127.0.0.1:6041/rest/sql
+{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","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],["keep0,keep1,keep(D)",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":[["test","2021-08-18 06:01:11.021",10000,4,1,1,10,"3650,3650,3650",16,6,100,4096,1,3000,2,0,"ms",0,"ready"],["log","2021-08-18 05:51:51.065",4,1,1,1,10,"30,30,30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":2}
+```
+
+This command accesses the TDengine server through the RESTful interface, which connects to port 6041 on the local machine, so the connection is successful.
+
+TDengine RESTful interface details can be found in the [official documentation](https://www.taosdata.com/en/documentation/connector#restful).
+
+
+### Running TDengine server and taosAdapter with a Docker container
+
+Docker containers of TDegnine version 2.4.0.0 and later include a component named `taosAdapter`, which supports data writing and querying capabilities to the TDengine server through the RESTful interface and provides the data ingestion interfaces compatible with InfluxDB/OpenTSDB. Allows seamless migration of InfluxDB/OpenTSDB applications to access TDengine.
 
-2, Execute taosdemo from the command line interface.
+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.
+
+```
+$ docker run -d --name tdengine-taosa -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine:2.4.0.0
+```
+
+Verify that the RESTful interface taosAdapter provides working using the `curl` command.
+```
+$ 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 supports multiple data collection agents (e.g. Telegraf, StatsD, collectd, etc.), here only demonstrate how StasD is simulated to write data, and the command is executed from the host side as follows.
+```
+$ echo "foo:1|c" | nc -u -w0 127.0.0.1 6044
+```
+
+Then you can use the taos shell to query the taosAdapter automatically created database statsd and the contents of the super table 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>
+```
+
+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
+
+1, execute taosdemo in the host command line interface to write data to the TDengine server in the Docker container
 ```bash
-root@c452519b0f9b:~/TDengine-server-2.0.20.13# taosdemo
+$ taosdemo
 
 taosdemo is simulating data generated by power equipments monitoring...
 
@@ -217,27 +300,3 @@ tdengine
 - **docker stop**: Stop the specified running docker image with docker stop.
 - **tdengine**: The name of the container.
 
-## TDengine connected in Docker during programming development
-
-There are two ideas for connecting from outside of Docker to use TDengine services running inside a Docker container:
-
-1, By port mapping (-p), the open network port inside the container is mapped to the specified port of the host. By mounting the local directory (-v), you can synchronize the data inside the host and the container to prevent data loss after the container is deleted.
-
-```bash
-$ docker run -d -v /etc/taos:/etc/taos -P 6041:6041 tdengine/tdengine
-526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd
-
-$ curl -u root:taosdata -d 'show databases' 127.0.0.1:6041/rest/sql
-{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","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],["keep0,keep1,keep(D)",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":[["test","2021-08-18 06:01:11.021",10000,4,1,1,10,"3650,3650,3650",16,6,100,4096,1,3000,2,0,"ms",0,"ready"],["log","2021-08-18 05:51:51.065",4,1,1,1,10,"30,30,30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":2}
-```
-
-- The first command starts a docker container with TDengine running and maps the 6041 port of the container to port 6041 of the host.
-- The second command, accessing TDengine through the RESTful interface, connects to port 6041 on the local machine, so the connection is successful.
-
-Note: In this example, for convenience reasons, only port 6041 is mapped, which is required for RESTful. If you wish to connect to the TDengine service in a non-RESTful manner, you will need to map a total of 11 ports starting at 6030. In the example, mounting the local directory also only deals with the /etc/taos directory where the configuration files are located, but not the data storage directory.
-
-2, Go directly to the docker container to do development via the exec command. That is, put the program code in the same Docker container where the TDengine server is located and connect to the TDengine service local to the container.
-
-```bash
-$ docker exec -it tdengine /bin/bash
-```

documentation20/en/08.connector/01.java/docs.md

@@ -761,17 +761,16 @@ Query OK, 1 row(s) in set (0.000141s)
 you see sample code here: [JDBC example](https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC)
 
 ## FAQ
-
+- Why does not addBatch and executeBatch provide a performance benefit for executing "batch writes/updates"?
+  **Cause**:In TDengine's JDBC implementation, SQL statements submitted through the addBatch method are executed in the order in which they are added. This method does not reduce the number of interactions with the server and does not improve performance.
+  **Answer**：1. Concatenate multiple values in an INSERT statement; 2. Use multi-threaded concurrent insertion; 3. Use the parameter-binding to write
+  
 - java.lang.UnsatisfiedLinkError: no taos in java.library.path
-
   **Cause**：The application program cannot find Library function *taos*
-
   **Answer**：Copy `C:\TDengine\driver\taos.dll` to `C:\Windows\System32\` on Windows and make a soft link through `ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` on Linux.
 
 - java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform
-
   **Cause**：Currently TDengine only support 64bit JDK
-
   **Answer**：re-install 64bit JDK.
 
 - For other questions, please refer to [Issues](https://github.com/taosdata/TDengine/issues)

packaging/release.sh

@@ -3,7 +3,7 @@
 # Generate the deb package for ubuntu, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
-set -x
+#set -x
 
 # release.sh  -v [cluster | edge]
 #             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
@@ -418,6 +418,10 @@ else
     BUILD_HTTP=false
 fi
 
+if [[ "$verMode" == "cluster" ]]; then
+    BUILD_HTTP=internal
+fi
+
 if [[ "$pagMode" == "full" ]]; then
     BUILD_TOOLS=true
 else

packaging/tools/makepkg.sh

@@ -36,11 +36,11 @@ if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
     [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
     taostools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}')
-    taostools_install_dir="${release_dir}/taos-tools-${taostools_ver}"
+    taostools_install_dir="${release_dir}/taosTools-${taostools_ver}"
 
     cd ${curr_dir}
 else
-    taostools_install_dir="${release_dir}/taos-tools-${version}"
+    taostools_install_dir="${release_dir}/taosTools-${version}"
 fi
 
 # Directories and files

snap/snapcraft.yaml

 name: tdengine
 base: core20
-version: '2.3.2.0'
+version: '2.4.0.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |

src/balance/src/bnMain.c

@@ -567,7 +567,7 @@ void bnCheckStatus() {
   while (1) {
     pIter = mnodeGetNextDnode(pIter, &pDnode);
     if (pDnode == NULL) break;
-    if (tsAccessSquence - pDnode->lastAccess > 3) {
+    if (tsAccessSquence - pDnode->lastAccess > tsOfflineInterval) {
       if (pDnode->status != TAOS_DN_STATUS_DROPPING && pDnode->status != TAOS_DN_STATUS_OFFLINE) {
         pDnode->status = TAOS_DN_STATUS_OFFLINE;
         pDnode->offlineReason = TAOS_DN_OFF_STATUS_MSG_TIMEOUT;

src/client/src/tscGlobalmerge.c

@@ -902,7 +902,7 @@ SSDataBlock* doGlobalAggregate(void* param, bool* newgroup) {
 
       // not belongs to the same group, return the result of current group;
       setInputDataBlock(pOperator, pAggInfo->binfo.pCtx, pAggInfo->pExistBlock, TSDB_ORDER_ASC);
-      updateOutputBuf(&pAggInfo->binfo, &pAggInfo->bufCapacity, pAggInfo->pExistBlock->info.rows);
+      updateOutputBuf(&pAggInfo->binfo, &pAggInfo->bufCapacity, pAggInfo->pExistBlock->info.rows, pOperator->pRuntimeEnv);
 
       { // reset output buffer
         for(int32_t j = 0; j < pOperator->numOfOutput; ++j) {
@@ -954,7 +954,7 @@ SSDataBlock* doGlobalAggregate(void* param, bool* newgroup) {
 
     // not belongs to the same group, return the result of current group
     setInputDataBlock(pOperator, pAggInfo->binfo.pCtx, pBlock, TSDB_ORDER_ASC);
-    updateOutputBuf(&pAggInfo->binfo, &pAggInfo->bufCapacity, pBlock->info.rows * pAggInfo->resultRowFactor);
+    updateOutputBuf(&pAggInfo->binfo, &pAggInfo->bufCapacity, pBlock->info.rows * pAggInfo->resultRowFactor, pOperator->pRuntimeEnv);
 
     doExecuteFinalMerge(pOperator, pOperator->numOfOutput, pBlock);
     savePrevOrderColumns(pAggInfo->currentGroupColData, pAggInfo->groupColumnList, pBlock, 0, &pAggInfo->hasGroupColData);

src/client/src/tscSQLParser.c

@@ -433,7 +433,7 @@ int32_t readFromFile(char *name, uint32_t *len, void **buf) {
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  int fd = open(name, O_RDONLY);
+  int fd = open(name, O_RDONLY | O_BINARY);
   if (fd < 0) {
     tscError("open file %s failed, error:%s", name, strerror(errno));
     tfree(*buf);
@@ -6090,7 +6090,7 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
 
 // todo error !!!!
 int32_t tsRewriteFieldNameIfNecessary(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
-  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' '};
+  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' ', '`'};
 
   for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     char* fieldName = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i)->name;
@@ -7265,6 +7265,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
   const int tokenMonitor = 3;
   const int tokenDebugFlag = 4;
   const int tokenDebugFlagEnd = 20;
+  const int tokenOfflineInterval = 21;
   const SDNodeDynConfOption cfgOptions[] = {
       {"resetLog", 8},    {"resetQueryCache", 15},  {"balance", 7},     {"monitor", 7},
       {"debugFlag", 9},   {"monDebugFlag", 12},     {"vDebugFlag", 10}, {"mDebugFlag", 10},
@@ -7272,6 +7273,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
       {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
       {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
       {"cqDebugFlag", 11},
+      {"offlineInterval", 15},
   };
 
   SStrToken* pOptionToken = taosArrayGet(pOptions->a, 1);
@@ -7303,6 +7305,14 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
       return TSDB_CODE_TSC_INVALID_OPERATION;  // options value is invalid
     }
     return TSDB_CODE_SUCCESS;
+  } else if ((strncasecmp(cfgOptions[tokenOfflineInterval].name, pOptionToken->z, pOptionToken->n) == 0) &&
+             (cfgOptions[tokenOfflineInterval].len == pOptionToken->n)) {
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
+    int32_t    val = strtol(pValToken->z, NULL, 10);
+    if (val < 1 || val > 600) {
+      return TSDB_CODE_TSC_INVALID_OPERATION;  // options value is invalid
+    }
+    return TSDB_CODE_SUCCESS;
   } else {
     SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
 

src/client/src/tscServer.c

@@ -1866,6 +1866,7 @@ int tscProcessRetrieveGlobalMergeRsp(SSqlObj *pSql) {
   bool convertJson = true;
   if (pQueryInfo->isStddev == true) convertJson = false;
   convertQueryResult(pRes, pQueryInfo, pSql->self, true, convertJson);
+  pRes->code = pQueryInfo->pQInfo->code;
 
   code = pRes->code;
   if (pRes->code == TSDB_CODE_SUCCESS) {

src/common/inc/tglobal.h

@@ -119,6 +119,7 @@ extern int32_t tsdbWalFlushSize;
 extern int8_t  tsEnableBalance;
 extern int8_t  tsAlternativeRole;
 extern int32_t tsBalanceInterval;
+extern int32_t tsOfflineInterval;
 extern int32_t tsOfflineThreshold;
 extern int32_t tsMnodeEqualVnodeNum;
 extern int8_t  tsEnableFlowCtrl;

src/common/src/tglobal.c

@@ -164,6 +164,7 @@ int32_t tsdbWalFlushSize = TSDB_DEFAULT_WAL_FLUSH_SIZE;  // MB
 int8_t  tsEnableBalance = 1;
 int8_t  tsAlternativeRole = 0;
 int32_t tsBalanceInterval = 300;          // seconds
+int32_t tsOfflineInterval = 3;            // seconds
 int32_t tsOfflineThreshold = 86400 * 10;  // seconds of 10 days
 int32_t tsMnodeEqualVnodeNum = 4;
 int8_t  tsEnableFlowCtrl = 1;
@@ -653,6 +654,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "offlineInterval";
+  cfg.ptr = &tsOfflineInterval;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 600;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   // 0-any; 1-mnode; 2-vnode
   cfg.option = "role";
   cfg.ptr = &tsAlternativeRole;

src/connector/C#/.gitignore

@@ -4,3 +4,5 @@ src/test/Cases/bin/
 src/test/Cases/obj/
 src/test/XUnitTest/bin/
 src/test/XUnitTest/obj/
+src/test/doc/
+NugetPackTest/
\ No newline at end of file

src/connector/C#/src/TDengineDriver/TDengineDriver.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+ <PropertyGroup>
+    <TargetFrameworks>net5;netstandard2.0;net45</TargetFrameworks>
+    <PackageId>TDengine.Connector</PackageId>
+    <PackageIcon>logo.jpg</PackageIcon>
+    <Version>1.0.3</Version>
+    <Authors>taosdata</Authors>
+    <Company>www.taosdata.com</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageTags>Taos;Data;Microsoft.NET.Sdk;IOT;bigdata;TDengine;taosdata</PackageTags>
+    <Description>
+        This is the C# connector's classlib that lets you connect to TDengine. 
+        This C # connector supports: Linux 64/Windows x64/Windows x86.
+        more information please visit: https://www.taosdata.com
+    </Description>
+    <RepositoryUrl>https://github.com/taosdata/TDengine/tree/develop/src/connector/C%23</RepositoryUrl>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="resource\logo.jpg" Pack="true" PackagePath="\" />
+  </ItemGroup>
+ 
 
 </Project>

src/connector/C#/src/test/Cases/Cases.csproj

@@ -7,10 +7,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup>
-      <GenerateDocumentationFile>true</GenerateDocumentationFile>
-      <DocumentationFile>..\doc\FunctionTest.XML</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DocumentationFile>..\doc\FunctionTest.XML</DocumentationFile>
   </PropertyGroup>
 </Project>

src/connector/C#/src/test/XUnitTest/XUnitTest.csproj

@@ -3,13 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <PropertyGroup>
+    <NoWarn>CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>..\doc\UnitTest.XML</DocumentationFile>
   </PropertyGroup>
 
+
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/connector/node-red-contrib-tdengine/.gitignore

+node_modules
\ No newline at end of file

src/connector/node-red-contrib-tdengine/README.md

+This repositry create a custom Node-Red node for configing TDEngine server connection and execute SQL from preview node msg.payload
+## Design
+Use Taos data restful API to commit SQL, API call like
+```
+curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql/[db_name]
+```
+
+Input options:
+* DB Server: Setup server connection or select a exist server
+* DB Name: Database to execute SQL
+
+Use [axios](https://axios-http.com/) to call http request
+
+## Usage
+
+1. Start Node-Red
+2. Install TDEngine node
+3. Add "taos query" node to workspace from palette 
+4. Setup a TDEngine server and database name
+5. Add function or other node to create SQL, put SQL into msg.payload
+6. Link to "taos query" node
+
+### Demo
+1. Start Node-Red by docker
+```
+docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red
+```
+2. Import sample flow "demo/flow.json"
+![import-flow](demo/ImportFlow.png)
+3. Install TDEngine node by name "node-red-contrib-tdengine", current version is 0.0.2
+![alt](demo/InstallTDEngineNode.png)
+4. Modify your TDEngine server config
+![alt](demo/ModifyServerConfig.png)
+5. Edit test SQL
+![alt](demo/EditTestSQL.png)
+6. Start flow by click Inject node

src/connector/node-red-contrib-tdengine/demo/flow.json

+[
+    {
+        "id": "01ad89bea2c249f6",
+        "type": "tab",
+        "label": "流程 1",
+        "disabled": false,
+        "info": "",
+        "env": [
+            {
+                "name": "test",
+                "value": "abc",
+                "type": "str"
+            },
+            {
+                "name": "path",
+                "value": "{\"codes\":\"/usr/local/processing/codes\",\"parameters\":\"/usr/local/processing/parameters\"}",
+                "type": "json"
+            }
+        ]
+    },
+    {
+        "id": "0ab8aa0c7f1b7522",
+        "type": "taos-query",
+        "z": "01ad89bea2c249f6",
+        "server": "e385222cd91994dc",
+        "database": "demo",
+        "x": 780,
+        "y": 400,
+        "wires": [
+            [
+                "f9c4f70dc2d79548"
+            ]
+        ]
+    },
+    {
+        "id": "ba09b80a40b65780",
+        "type": "inject",
+        "z": "01ad89bea2c249f6",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "INSERT INTO t VALUES (NOW, 23)",
+        "payloadType": "str",
+        "x": 490,
+        "y": 400,
+        "wires": [
+            [
+                "0ab8aa0c7f1b7522"
+            ]
+        ]
+    },
+    {
+        "id": "f9c4f70dc2d79548",
+        "type": "debug",
+        "z": "01ad89bea2c249f6",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 1050,
+        "y": 400,
+        "wires": []
+    },
+    {
+        "id": "e385222cd91994dc",
+        "type": "taos-config",
+        "host": "localhost",
+        "port": "6030",
+        "username": "root",
+        "password": "taosdata"
+    }
+]
\ No newline at end of file

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

+{
+    "name": "node-red-contrib-tdengine",
+    "version": "0.0.2",
+    "description": "",
+    "main": "tdengine.js",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/kevinpan45/node-red-contrib-tdengine.git"
+    },
+    "author": "kevinpan45@163.com",
+    "license": "ISC",
+    "dependencies": {
+        "axios": "^0.24.0",
+        "mocha": "^9.1.3"
+    },
+    "node-red": {
+        "nodes": {
+            "tdengine": "tdengine.js"
+        }
+    },
+    "keywords": [
+        "node-red",
+        "tdengine"
+    ],
+    "devDependencies": {
+        "node-red": "^2.1.4",
+        "node-red-node-test-helper": "^0.2.7"
+    }
+}

src/connector/node-red-contrib-tdengine/tdengine.html

+<script type="text/javascript">
+    "use strict";
+    /*global RED*/
+    RED.nodes.registerType('taos-config', {
+        category: 'config',
+        defaults: {
+            host: {
+                value: "localhost",
+                required: true
+            },
+            port: {
+                value: "6030",
+                required: true
+            },
+            username: {
+                value: "",
+                required: false
+            },
+            password: {
+                value: "",
+                required: false
+            }
+        },
+        label: function () {
+            return this.host || "TDEngine host";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="taos-config">
+    <div class="form-row">
+        <label for="node-config-input-host"><i class="fa fa-server"></i> Host</label>
+        <input type="text" id="node-config-input-host">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-port"><i class="fa fa-server"></i> Port</label>
+        <input type="text" id="node-config-input-port">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-username"><i class="fa fa-server"></i> User Name</label>
+        <input type="text" id="node-config-input-username">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-server"></i> Password</label>
+        <input type="text" id="node-config-input-password">
+    </div>
+</script>
+
+<script type="text/javascript">
+    /*global RED*/
+    RED.nodes.registerType('taos-query', {
+        category: 'TDEngine',
+        inputs: 1,
+        outputs: 1,
+        color: "#ffffff",
+        paletteLabel: "taos query",
+        defaults: {
+            server: {
+                value: "",
+                type: "taos-config"
+            },
+            database: {
+                value: ""
+            },
+            sql: {
+                value: ""
+            }
+        },
+        label: function () {
+            return this.name || "taos " + this.database;
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="taos-query">
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
+        <input type="text" id="node-input-server" placeholder="Server">
+    </div>
+    <div class="form-row">
+        <label for="node-input-database"><i class="fa fa-tag"></i> Database</label>
+        <input type="text" id="node-input-database" placeholder="Database">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="taos-query">
+    <p>TDEngine Query</p>
+    <p>Execute SQL on remote TDEngine server by restful API</p>
+</script>
\ No newline at end of file

src/connector/node-red-contrib-tdengine/tdengine.js

+module.exports = function (RED) {
+  "use strict";
+  const axios = require('axios');
+
+  function TaosConfig(n) {
+    RED.nodes.createNode(this, n);
+    this.host = n.host;
+    this.port = n.port;
+    this.username = n.username;
+    this.password = n.password;
+  }
+  RED.nodes.registerType("taos-config", TaosConfig);
+
+  function TaosQuery(n) {
+    RED.nodes.createNode(this, n);
+    this.server = RED.nodes.getNode(n.server);
+    this.database = n.database;
+    var node = this;
+
+    node.on("close", function (done) {
+      node.status({});
+      client = null;
+      done();
+    });
+
+    node.on("input", async function (msg, send, done) {
+      send = send || function () { node.send.apply(node, arguments) }
+      done = done || function (err) { if (err) node.error(err, msg); }
+
+      let sql = msg.payload;
+
+      if (!msg.payload || msg.payload == "") {
+        throw new Error("Execute SQL must be set.");
+      }
+
+      try {
+        msg.payload = await query(this.server, sql);
+        send(msg);
+        done();
+      } catch (error) {
+        done(error);
+      }
+
+    });
+  }
+  RED.nodes.registerType("taos-query", TaosQuery);
+
+  function query(server, sql) {
+    console.log("Start to execute SQL : " + sql);
+    let url = generateUrl(server);
+    return axios.post(url, sql, {
+      headers: { 'Authorization': token(server) }
+    }).then(function (response) {
+      console.log('Get http response from taos : ' + response.data.data);
+      return response.data.data;
+    }).catch(function (error) {
+      console.error("Request Failed " + e);
+      throw new Error(response.desc);
+    });
+  }
+
+
+
+  function generateUrl(server) {
+    return "http://" + server.host + ":" + server.port + '/rest/sql';
+  }
+
+  function token(server) {
+    return 'Basic ' + Buffer.from(server.username + ":" + server.password).toString('base64')
+  }
+};

src/dnode/src/dnodeMain.c

@@ -240,7 +240,7 @@ static void dnodeCheckDataDirOpenned(char *dir) {
   char filepath[256] = {0};
   sprintf(filepath, "%s/.running", dir);
 
-  int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+  int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRWXU | S_IRWXG | S_IRWXO);
   if (fd < 0) {
     dError("failed to open lock file:%s, reason: %s, quit", filepath, strerror(errno));
     exit(0);

src/dnode/src/dnodeTelemetry.c

@@ -266,7 +266,7 @@ static void* telemetryThread(void* param) {
 }
 
 static void dnodeGetEmail(char* filepath) {
-  int32_t fd = open(filepath, O_RDONLY);
+  int32_t fd = open(filepath, O_RDONLY | O_BINARY);
   if (fd < 0) {
     return;
   }

src/inc/tfs.h

@@ -70,7 +70,7 @@ typedef struct {
 #define TFILE_NAME(pf) ((pf)->aname)
 #define TFILE_REL_NAME(pf) ((pf)->rname)
 
-#define tfsopen(pf, flags) open(TFILE_NAME(pf), flags)
+#define tfsopen(pf, flags) open(TFILE_NAME(pf), flags | O_BINARY)
 #define tfsclose(fd) close(fd)
 #define tfsremove(pf) remove(TFILE_NAME(pf))
 #define tfscopy(sf, df) taosCopy(TFILE_NAME(sf), TFILE_NAME(df))

taos-tools @ 59f00a69

-Subproject commit 27751ba9ca17407425fb50a52cd68295794dedc3
+Subproject commit 59f00a69f36b08cea86a70a22c29b2c27ef506ae

src/os/src/detail/osRand.c

@@ -22,7 +22,7 @@ uint32_t taosSafeRand(void) {
   int fd;
   int seed;
 
-  fd = open("/dev/urandom", 0);
+  fd = open("/dev/urandom", 0 | O_BINARY);
   if (fd < 0) {
     seed = (int)time(0);
   } else {

src/os/src/detail/osSysinfo.c

@@ -713,7 +713,7 @@ bool taosGetSystemUid(char *uid) {
   int fd;
   int len = 0;
 
-  fd = open("/proc/sys/kernel/random/uuid", 0);
+  fd = open("/proc/sys/kernel/random/uuid", 0 | O_BINARY);
   if (fd < 0) {
     return false;
   } else {

src/os/src/linux/linuxEnv.c

@@ -72,7 +72,7 @@ char* taosGetCmdlineByPID(int pid) {
   static char cmdline[1024];
   sprintf(cmdline, "/proc/%d/cmdline", pid);
 
-  int fd = open(cmdline, O_RDONLY);
+  int fd = open(cmdline, O_RDONLY | O_BINARY);
   if (fd >= 0) {
     int n = read(fd, cmdline, sizeof(cmdline) - 1);
     if (n < 0) n = 0;