Merge branch 'develop' into fix/TS-715-dev

.gitmodules

 [submodule "src/connector/go"]
 	path = src/connector/go
 	url = https://github.com/taosdata/driver-go.git
-[submodule "src/connector/grafanaplugin"]
-	path = src/connector/grafanaplugin
-	url = https://github.com/taosdata/grafanaplugin.git
 [submodule "src/connector/hivemq-tdengine-extension"]
 	path = src/connector/hivemq-tdengine-extension
 	url = https://github.com/taosdata/hivemq-tdengine-extension.git

Jenkinsfile

@@ -66,10 +66,12 @@ def pre_test(){
     }
     sh'''
     cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached 
     git submodule update --init --recursive
     cd ${WK}
     git reset --hard HEAD~10
@@ -139,10 +141,12 @@ def pre_test_noinstall(){
     }
     sh'''
     cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached 
     git submodule update --init --recursive
     cd ${WK}
     git reset --hard HEAD~10
@@ -209,10 +213,12 @@ def pre_test_mac(){
     }
     sh'''
     cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached
     git submodule update --init --recursive
     cd ${WK}
     git reset --hard HEAD~10

cmake/install.inc

@@ -41,7 +41,6 @@ ELSEIF (TD_WINDOWS)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/jh_taos.exe DESTINATION .)
   ELSE ()
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
-    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)
   ENDIF ()
 
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)

documentation20/cn/05.insert/docs.md

@@ -29,7 +29,7 @@ INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6,
 
 ## <a class="anchor" id="schemaless"></a>无模式（Schemaless）写入
 **前言**
-<br/>在物联网应用中，常会采集比较多的数据项，用于实现智能控制、业务分析、设备监控等。由于应用逻辑的版本升级，或者设备自身的硬件调整等原因，数据采集项就有可能比较频繁地出现变动。为了在这种情况下方便地完成数据记录工作，TDengine 从 2.2.0.0 版本开始，提供调用 Schemaless 写入方式，可以免于预先创建超级表/子表的步骤，随着数据写入写入接口能够自动创建与数据对应的存储结构。并且在必要时，Schemaless 将自动增加必要的数据列，保证用户写入的数据可以被正确存储。
+<br/>在物联网应用中，常会采集比较多的数据项，用于实现智能控制、业务分析、设备监控等。由于应用逻辑的版本升级，或者设备自身的硬件调整等原因，数据采集项就有可能比较频繁地出现变动。为了在这种情况下方便地完成数据记录工作，TDengine 从 2.2.0.0 版本开始，提供调用 Schemaless 写入方式，可以免于预先创建超级表/子表的步骤，随着数据写入接口能够自动创建与数据对应的存储结构。并且在必要时，Schemaless 将自动增加必要的数据列，保证用户写入的数据可以被正确存储。
 <br/>目前，TDengine 的 C/C++ Connector 提供支持 Schemaless 的操作接口，详情请参见 [Schemaless 方式写入接口](https://www.taosdata.com/cn/documentation/connector#schemaless)章节。这里对 Schemaless 的数据表达格式进行了描述。
 <br/>无模式写入方式建立的超级表及其对应的子表与通过 SQL 直接建立的超级表和子表完全没有区别，您也可以通过 SQL 语句直接向其中写入数据。需要注意的是，通过无模式写入方式建立的表，其表名是基于标签值按照固定的映射规则生成，所以无法明确地进行表意，缺乏可读性。
 
@@ -74,21 +74,19 @@ st,t1=3,t2=4,t3=t3 c1=3i64,c3="passit",c2=false,c4=4f64 1626006833639000000
 ### 无模式写入的主要处理逻辑
 
 无模式写入按照如下原则来处理行数据：
-1. 当 tag_set 中有 ID 字段时，该字段的值将作为子表的表名。
-2. 没有 ID 字段时，将使用如下规则来生成子表名：
-首先将measurement 的名称和标签的 key 和 value 组合成为如下的字符串
+<br/>1. 将使用如下规则来生成子表名：首先将measurement 的名称和标签的 key 和 value 组合成为如下的字符串
 ```json
 "measurement,tag_key1=tag_value1,tag_key2=tag_value2"
 ```
 需要注意的是，这里的tag_key1, tag_key2并不是用户输入的标签的原始顺序，而是使用了标签名称按照字符串升序排列后的结果。所以，tag_key1 并不是在行协议中输入的第一个标签。
 排列完成以后计算该字符串的 MD5 散列值 "md5_val"。然后将计算的结果与字符串组合生成表名：“t_md5_val”。其中的 “t_” 是固定的前缀，每个通过该映射关系自动生成的表都具有该前缀。
-<br/>3. 如果解析行协议获得的超级表不存在，则会创建这个超级表。
-<br/>4. 如果解析行协议获得子表不存在，则 Schemaless 会按照步骤 1 或 2 确定的子表名来创建子表。
-<br/>5. 如果数据行中指定的标签列或普通列不存在，则在超级表中增加对应的标签列或普通列（只增不减）。
-<br/>6. 如果超级表中存在一些标签列或普通列未在一个数据行中被指定取值，那么这些列的值在这一行中会被置为 NULL。
-<br/>7. 对 BINARY 或 NCHAR 列，如果数据行中所提供值的长度超出了列类型的限制，自动增加该列允许存储的字符长度上限（只增不减），以保证数据的完整保存。
-<br/>8. 如果指定的数据子表已经存在，而且本次指定的标签列取值跟已保存的值不一样，那么最新的数据行中的值会覆盖旧的标签列取值。
-<br/>9. 整个处理过程中遇到的错误会中断写入过程，并返回错误代码。
+<br/>2. 如果解析行协议获得的超级表不存在，则会创建这个超级表。
+<br/>3. 如果解析行协议获得子表不存在，则 Schemaless 会按照步骤 1 或 2 确定的子表名来创建子表。
+<br/>4. 如果数据行中指定的标签列或普通列不存在，则在超级表中增加对应的标签列或普通列（只增不减）。
+<br/>5. 如果超级表中存在一些标签列或普通列未在一个数据行中被指定取值，那么这些列的值在这一行中会被置为 NULL。
+<br/>6. 对 BINARY 或 NCHAR 列，如果数据行中所提供值的长度超出了列类型的限制，自动增加该列允许存储的字符长度上限（只增不减），以保证数据的完整保存。
+<br/>7. 如果指定的数据子表已经存在，而且本次指定的标签列取值跟已保存的值不一样，那么最新的数据行中的值会覆盖旧的标签列取值。
+<br/>8. 整个处理过程中遇到的错误会中断写入过程，并返回错误代码。
 
 **备注：**
 <br/>无模式所有的处理逻辑，仍会遵循 TDengine 对数据结构的底层限制，例如每行数据的总长度不能超过 16k 字节。这方面的具体限制约束请参见 [TAOS SQL 边界限制](https://www.taosdata.com/cn/documentation/taos-sql#limitation) 章节。

documentation20/cn/08.connector/docs.md

@@ -1037,43 +1037,62 @@ HTTP 请求 URL 采用 `sqlutc` 时，返回结果集的时间戳将采用 UTC
 
 ## <a class="anchor" id="csharp"></a>CSharp Connector
 
-C#连接器支持的系统有：Linux 64/Windows x64/Windows x86
+* C#连接器支持的系统有：Linux 64/Windows x64/Windows x86
 
+* C#连接器现在也支持从[Nuget下载引用](https://www.nuget.org/packages/TDengine.Connector/)
+
+* 在Windows系统上，C#应用程序可以使用TDengine的原生C接口来执行所有数据库操作，后续版本将提供ORM（Dapper）框架驱动。
 ### 安装准备
 
 * 应用驱动安装请参考[安装连接器驱动步骤](https://www.taosdata.com/cn/documentation/connector#driver)。
-* 接口文件TDengineDrivercs.cs和参考程序示例TDengineTest.cs均位于Windows客户端install_directory/examples/C#目录下。
-* 在Windows系统上，C#应用程序可以使用TDengine的原生C接口来执行所有数据库操作，后续版本将提供ORM（Dapper）框架驱动。
+* 接口文件TDengineDrivercs.cs和参考程序示例TDengineTest.cs均位于Windows客户端install_directory/examples/C#目录下。
+* 安装[.NET SDK](https://dotnet.microsoft.com/download)
 
 ### 示例程序
 
-示例程序源码位于install_directory/examples/C#，有：
+示例程序源码位于
+* {client_install_directory}/examples/C#
+* [github C# example source code](https://github.com/taosdata/TDengine/tree/develop/tests/examples/C%23)
 
-TDengineTest.cs       C#示例源程序
+**注意:** TDengineTest.cs       C#示例源程序,包含了数据库连接参数，以及如何执行数据插入、查询等操作。
 
 ### 安装验证
 
-运行install_directory/examples/C#/C#Checker/C#Checker.exe
-
+需要先安装 .Net SDK
 ```cmd
-cd {install_directory}/examples/C#/C#Checker
-csc /optimize *.cs
-C#Checker.exe -h <fqdn>
+cd {client_install_directory}/examples/C#/C#Checker
+//运行测试
+dotnet run -- -h <FQDN>. // 此步骤会先build，然后再运行。
 ```
 
 ### C#连接器的使用
 
 在Windows系统上，C#应用程序可以使用TDengine的C#连接器接口来执行所有数据库的操作。使用的具体步骤如下所示：
 
-1. 将接口文件TDengineDrivercs.cs加入到应用程序所在的项目空间中。
-2. 用户可以参考TDengineTest.cs来定义数据库连接参数，以及如何执行数据插入、查询等操作。
+需要 .NET SDK
+* 创建一个c# project. 
+``` cmd
+mkdir test
+cd test 
+dotnet new console
+```
+* 通过Nuget引用TDengineDriver包
+``` cmd
+dotnet add package TDengine.Connector
+```
+* 在项目中需要用到TDengineConnector的地方引用TDengineDriver namespace。
+```c# 
+using TDengineDriver;
+```
+* 用户可以参考[TDengineTest.cs](https://github.com/taosdata/TDengine/tree/develop/tests/examples/C%23/TDengineTest)来定义数据库连接参数，以及如何执行数据插入、查询等操作。
 
-此接口需要用到taos.dll文件，所以在执行应用程序前，拷贝Windows客户端install_directory/driver目录中的taos.dll文件到项目最后生成.exe可执行文件所在的文件夹。之后运行exe文件，即可访问TDengine数据库并做插入、查询等操作。
 
 **注意：**
 
-1. TDengine V2.0.3.0之后同时支持32位和64位Windows系统，所以C#项目在生成.exe文件时，“解决方案”/“项目”的“平台”请选择对应的“X86” 或“x64”。
-2. 此接口目前已经在Visual Studio 2015/2017中验证过，其它VS版本尚待验证。
+* TDengine V2.0.3.0之后同时支持32位和64位Windows系统，所以C#项目在生成.exe文件时，“解决方案”/“项目”的“平台”请选择对应的“X86” 或“x64”。
+* 此接口目前已经在Visual Studio 2015/2017中验证过，其它VS版本尚待验证。
+* 此连接器需要用到taos.dll文件，所以在未安装客户端时需要在执行应用程序前，拷贝Windows{client_install_directory}/driver目录中的taos.dll文件到项目最后生成.exe可执行文件所在的文件夹。之后运行exe文件，即可访问TDengine数据库并做插入、查询等操作。
+
 
 ### 第三方驱动
 

documentation20/cn/14.devops/03.immigrate/docs.md

@@ -181,7 +181,7 @@ select count(*) from memory
 
 完成查询后，如果写入的数据与预期的相比没有差别，同时写入程序本身没有异常的报错信息，那么可用确认数据写入是完整有效的。
 
-TDengine不支持采用OpenTSDB的查询语法进行查询或数据获取处理，但是针对OpenTSDB的每种查询都提供对应的支持。你可以用检查附件2获取对应的查询处理的调整和应用使用的方式，如果需要全面了解TDengine支持的查询类型，请参阅TDengine的用户手册。
+TDengine不支持采用OpenTSDB的查询语法进行查询或数据获取处理，但是针对OpenTSDB的每种查询都提供对应的支持。可以用检查附录1获取对应的查询处理的调整和应用使用的方式，如果需要全面了解TDengine支持的查询类型，请参阅TDengine的用户手册。
 
 TDengine支持标准的JDBC 3.0接口操纵数据库，你也可以使用其他类型的高级语言的连接器来查询读取数据，以适配你的应用。具体的操作和使用帮助也请参阅用户手册。
 

documentation20/en/08.connector/docs.md

@@ -841,37 +841,60 @@ Only some configuration parameters related to RESTful interface are listed below
 
 ## <a class="anchor" id="csharp"></a> CSharp Connector
 
-The C # connector supports: Linux 64/Windows x64/Windows x86.
+
+* The C # connector supports: Linux 64/Windows x64/Windows x86.
+* C# connector can be download and include as normal table form [Nuget.org](https://www.nuget.org/packages/TDengine.Connector/).
+* On Windows, C # applications can use the native C interface of TDengine to perform all database operations, and future versions will provide the ORM (Dapper) framework driver.
 
 ### Installation preparation
 
-- For application driver installation, please refer to the[ steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
-- . NET interface file TDengineDrivercs.cs and reference sample TDengineTest.cs are both located in the Windows client install_directory/examples/C# directory.
-- On Windows, C # applications can use the native C interface of TDengine to perform all database operations, and future versions will provide the ORM (Dapper) framework driver.
+* For application driver installation, please refer to the[ steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
+* .NET interface file TDengineDrivercs.cs and reference sample TDengineTest.cs are both located in the Windows client install_directory/examples/C# directory.
+* Install [.NET SDK](https://dotnet.microsoft.com/download)
 
-### Installation verification
+### Example Source Code
+you can find sample code under follow directions:
+* {client_install_directory}/examples/C#
+* [github C# example source code](https://github.com/taosdata/TDengine/tree/develop/tests/examples/C%23)
 
-Run install_directory/examples/C#/C#Checker/C#Checker.exe
+**Tips:** TDengineTest.cs       One of C# connector's sample code that include basic examples like connection,sql executions and so on.
+
+### Installation verification
+Run {client_install_directory}/examples/C#/C#Checker/C#Checker.cs
 
+Need install .Net SDK first
 ```cmd
-cd {install_directory}/examples/C#/C#Checker
-csc /optimize *.cs
-C#Checker.exe -h <fqdn>
+cd {client_install_directory}/examples/C#/C#Checker
+//run c#checker.cs
+dotnet run -- -h <FQDN> //dotnet run will build project first by default.
 ```
 
 ### How to use C# connector
-
 On Windows system, .NET applications can use the .NET interface of TDengine to perform all database operations. The steps to use it are as follows:
 
-1. Add the. NET interface file TDengineDrivercs.cs to the .NET project where the application is located.
-2. Users can refer to TDengineTest.cs to define database connection parameters and how to perform data insert, query and other operations;
+need to install .NET SDK first
+* create a c# project. 
+``` cmd
+mkdir test
+cd test 
+dotnet new console
+```
+* add TDengineDriver as an package through Nuget
 
-This. NET interface requires the taos.dll file, so before executing the application, copy the taos.dll file in the Windows client install_directory/driver directory to the folder where the. NET project finally generated the .exe executable file. After running the exe file, you can access the TDengine database and do operations such as insert and query.
+``` cmd
+dotnet add package TDengine.Connector
+```
+* inlucde the TDnengineDriver in you application's namespace 
+```C#
+using TDengineDriver;
+```
+* user can reference from[TDengineTest.cs](https://github.com/taosdata/TDengine/tree/develop/tests/examples/C%23/TDengineTest) and learn how to define database connection,query,insert and other basic data manipulations.
 
 **Note:**
 
-1. TDengine V2.0. 3.0 supports both 32-bit and 64-bit Windows systems, so when. NET project generates a .exe file, please select the corresponding "X86" or "x64" for the "Platform" under "Solution"/"Project".
-2. This. NET interface has been verified in Visual Studio 2015/2017, and other VS versions have yet to be verified.
+* TDengine V2.0. 3.0 supports both 32-bit and 64-bit Windows systems, so when. NET project generates a .exe file, please select the corresponding "X86" or "x64" for the "Platform" under "Solution"/"Project".
+* This. NET interface has been verified in Visual Studio 2015/2017, and other VS versions have yet to be verified.
+* Since this. NET connector interface requires the taos.dll file, so before executing the application, copy the taos.dll file in the Windows {client_install_directory}/driver directory to the folder where the. NET project finally generated the .exe executable file. After running the exe file, you can access the TDengine database and do operations such as insert and query(This step can be skip if the client has been installed on you machine).
 
 ### Third-party Driver
 

packaging/cfg/nginxd.service

+[Unit]
+Description=Nginx For TDengine Service
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+PIDFile=/usr/local/nginxd/logs/nginx.pid
+ExecStart=/usr/local/nginxd/sbin/nginx
+ExecStop=/usr/local/nginxd/sbin/nginx -s stop
+TimeoutStopSec=1000000s
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+TimeoutStartSec=0
+StandardOutput=null
+Restart=always
+StartLimitBurst=3
+StartLimitInterval=60s
+
+[Install]
+WantedBy=multi-user.target

packaging/cfg/taosd.service

+[Unit]
+Description=TDengine server service
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/taosd
+ExecStartPre=/usr/local/taos/bin/startPre.sh
+TimeoutStopSec=1000000s
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+TimeoutStartSec=0
+StandardOutput=null
+Restart=always
+StartLimitBurst=3
+StartLimitInterval=60s
+
+[Install]
+WantedBy=multi-user.target

packaging/cfg/tarbitratord.service

+[Unit]
+Description=TDengine arbitrator service
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/tarbitrator
+TimeoutStopSec=1000000s
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+TimeoutStartSec=0
+StandardOutput=null
+Restart=always
+StartLimitBurst=3
+StartLimitInterval=60s
+
+[Install]
+WantedBy=multi-user.target

packaging/release.sh

@@ -14,6 +14,7 @@ set -e
 #             -d [taos | power | tq | pro | kh | jh]
 #             -n [2.0.0.3]
 #             -m [2.0.0.0]
+#             -H [ false | true]
 
 # set parameters by default value
 verMode=edge     # [cluster, edge]
@@ -26,8 +27,9 @@ dbName=taos      # [taos | power | tq | pro | kh | jh]
 allocator=glibc  # [glibc | jemalloc]
 verNumber=""
 verNumberComp="1.0.0.0"
+httpdBuild=false
 
-while getopts "hv:V:c:o:l:s:d:a:n:m:" arg
+while getopts "hv:V:c:o:l:s:d:a:n:m:H:" arg
 do
   case $arg in
     v)
@@ -70,6 +72,10 @@ do
       #echo "osType=$OPTARG"
       osType=$(echo $OPTARG)
       ;;
+    H)
+      #echo "httpdBuild=$OPTARG"
+      httpdBuild=$(echo $OPTARG)
+      ;;
     h)
       echo "Usage: `basename $0` -v [cluster | edge] "
       echo "                  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] "
@@ -81,6 +87,7 @@ do
       echo "                  -d [taos | power | tq | pro | kh | jh] "
       echo "                  -n [version number] "
       echo "                  -m [compatible version number] "
+      echo "                  -H [false | true] "
       exit 0
       ;;
     ?) #unknow option
@@ -90,7 +97,7 @@ do
   esac
 done
 
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} allocator=${allocator} verNumber=${verNumber} verNumberComp=${verNumberComp}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} allocator=${allocator} verNumber=${verNumber} verNumberComp=${verNumberComp} httpdBuild=${httpdBuild}"
 
 curr_dir=$(pwd)
 
@@ -405,8 +412,7 @@ if [[ "$dbName" == "jh" ]]; then
   # TODO: src/dnode/CMakeLists.txt
 fi
 
-echo "build ${pagMode} package ..."
-if [[ "$pagMode" == "lite" ]]; then
+if [[ "$httpdBuild" == "true" ]]; then
     BUILD_HTTP=true
     BUILD_TOOLS=false
 else

packaging/tools/install.sh

@@ -700,78 +700,93 @@ function clean_service_on_systemd() {
 function install_service_on_systemd() {
     clean_service_on_systemd
 
-    taosd_service_config="${service_config_dir}/taosd.service"
-    ${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                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'         >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
-    #${csudo} bash -c "echo 'StartLimitIntervalSec=60s'          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
+    [ -f ${script_dir}/cfg/taosd.service ] &&\
+        ${csudo} cp ${script_dir}/cfg/taosd.service \
+        ${service_config_dir}/ || :
+    ${csudo} systemctl daemon-reload
+    
+    #taosd_service_config="${service_config_dir}/taosd.service"
+    #${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                                      >> ${taosd_service_config}"
+    #${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'         >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
+    ##${csudo} bash -c "echo 'StartLimitIntervalSec=60s'          >> ${taosd_service_config}"
+    #${csudo} bash -c "echo                                      >> ${taosd_service_config}"
+    #${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
+    #${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
     ${csudo} systemctl enable taosd
 
-    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    [ -f ${script_dir}/cfg/tarbitratord.service ] &&\
+        ${csudo} cp ${script_dir}/cfg/tarbitratord.service \
+        ${service_config_dir}/ || :
+    ${csudo} systemctl daemon-reload
+    
+    #tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+    #${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    #${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
     #${csudo} systemctl enable tarbitratord
 
     if [ "$verMode" == "cluster" ]; then
-        nginx_service_config="${service_config_dir}/nginxd.service"
-        ${csudo} bash -c "echo '[Unit]'                                             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Description=Nginx For TDengine Service'             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'After=network-online.target'                        >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Wants=network-online.target'                        >> ${nginx_service_config}"
-        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
-        ${csudo} bash -c "echo '[Service]'                                          >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Type=forking'                                       >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                            >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'TimeoutStartSec=0'                                  >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StandardOutput=null'                                >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Restart=always'                                     >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StartLimitBurst=3'                                  >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StartLimitInterval=60s'                             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
-        ${csudo} bash -c "echo '[Install]'                                          >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'WantedBy=multi-user.target'                         >> ${nginx_service_config}"
+        [ -f ${script_dir}/cfg/nginxd.service ] &&\
+            ${csudo} cp ${script_dir}/cfg/nginxd.service \
+            ${service_config_dir}/ || :
+        ${csudo} systemctl daemon-reload
+
+        #nginx_service_config="${service_config_dir}/nginxd.service"
+        #${csudo} bash -c "echo '[Unit]'                                             >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'Description=Nginx For TDengine Service'             >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'After=network-online.target'                        >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'Wants=network-online.target'                        >> ${nginx_service_config}"
+        #${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        #${csudo} bash -c "echo '[Service]'                                          >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'Type=forking'                                       >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                            >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'TimeoutStartSec=0'                                  >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'StandardOutput=null'                                >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'Restart=always'                                     >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'StartLimitBurst=3'                                  >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'StartLimitInterval=60s'                             >> ${nginx_service_config}"
+        #${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        #${csudo} bash -c "echo '[Install]'                                          >> ${nginx_service_config}"
+        #${csudo} bash -c "echo 'WantedBy=multi-user.target'                         >> ${nginx_service_config}"
         if ! ${csudo} systemctl enable nginxd &> /dev/null; then
             ${csudo} systemctl daemon-reexec
             ${csudo} systemctl enable nginxd

packaging/tools/makepkg.sh

@@ -86,6 +86,16 @@ if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
     cp ${compile_dir}/test/cfg/taosadapter.service          ${install_dir}/cfg || :
 fi
 
+if [ -f "${cfg_dir}/taosd.service" ]; then
+    cp ${cfg_dir}/taosd.service          ${install_dir}/cfg || :
+fi
+if [ -f "${cfg_dir}/tarbitratord.service" ]; then
+    cp ${cfg_dir}/tarbitratord.service          ${install_dir}/cfg || :
+fi
+if [ -f "${cfg_dir}/nginxd.service" ]; then
+    cp ${cfg_dir}/nginxd.service          ${install_dir}/cfg || :
+fi
+
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/taosd.deb
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm

src/client/src/tscGlobalmerge.c

@@ -364,7 +364,9 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SQueryInfo*
           SExprInfo* pExprInfo = tscExprGet(pQueryInfo, j);
 
           int32_t functionId = pExprInfo->base.functionId;
+
           if (pColIndex->colId == pExprInfo->base.colInfo.colId && (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ)) {
+
             orderColIndexList[i] = j;
             break;
           }

src/connector/C#/TDengineDriver.cs

@@ -19,7 +19,7 @@ using System.Runtime.InteropServices;
 
 namespace TDengineDriver
 {
-    enum TDengineDataType
+    public enum TDengineDataType
     {
         TSDB_DATA_TYPE_NULL = 0,     // 1 bytes
         TSDB_DATA_TYPE_BOOL = 1,     // 1 bytes
@@ -33,12 +33,12 @@ namespace TDengineDriver
         TSDB_DATA_TYPE_TIMESTAMP = 9,// 8 bytes
         TSDB_DATA_TYPE_NCHAR = 10,   // unicode string
         TSDB_DATA_TYPE_UTINYINT = 11,// 1 byte
-        TSDB_DATA_TYPE_USMALLINT= 12,// 2 bytes
+        TSDB_DATA_TYPE_USMALLINT = 12,// 2 bytes
         TSDB_DATA_TYPE_UINT = 13,    // 4 bytes
-        TSDB_DATA_TYPE_UBIGINT= 14   // 8 bytes
+        TSDB_DATA_TYPE_UBIGINT = 14   // 8 bytes
     }
 
-    enum TDengineInitOption
+    public enum TDengineInitOption
     {
         TSDB_OPTION_LOCALE = 0,
         TSDB_OPTION_CHARSET = 1,
@@ -47,7 +47,7 @@ namespace TDengineDriver
         TDDB_OPTION_SHELL_ACTIVITY_TIMER = 4
     }
 
-    class TDengineMeta
+    public class TDengineMeta
     {
         public string name;
         public short size;
@@ -90,7 +90,7 @@ namespace TDengineDriver
         }
     }
 
-    class TDengine
+    public class TDengine
     {
         public const int TSDB_CODE_SUCCESS = 0;
 

src/connector/grafana-pluain-is-removed-from-TDengine.md

+TDengine Grafana plugin is no more part of the TDengine repo. Please check it out from https://github.com/taosdata/grafanaplugin.

grafanaplugin @ 792ef7c3

-Subproject commit 792ef7c3036f15068796e09883d3f4d47a038fe2

src/connector/grafanaplugin/README.md

+TDengine Grafana plugin is no more part of the TDengine repo. Please check it out from https://github.com/taosdata/grafanaplugin.

src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java

@@ -107,16 +107,6 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
     public void setCatalog(String catalog) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-        /*
-        try (Statement stmt = createStatement()) {
-            boolean execute = stmt.execute("use " + catalog);
-            if (execute)
-                this.catalog = catalog;
-        } catch (SQLException e) {
-            // do nothing
-        }
-        */
-
         this.catalog = catalog;
     }
 
@@ -416,7 +406,6 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         } catch (InterruptedException | ExecutionException ignored) {
         } catch (TimeoutException e) {
             future.cancel(true);
-            status = false;
         } finally {
             executor.shutdownNow();
         }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java

-/***************************************************************************
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *****************************************************************************/
 package com.taosdata.jdbc;
 
 import java.sql.*;
@@ -66,7 +52,7 @@ public class TSDBConnection extends AbstractConnection {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
         }
 
-        long id = this.connector.subscribe(topic, sql, restart, 0);
+        long id = this.connector.subscribe(topic, sql, restart);
         if (id == 0) {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_SUBSCRIBE_FAILED);
         }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java

-/***************************************************************************
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *****************************************************************************/
 package com.taosdata.jdbc;
 
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.sql.*;
-import java.util.*;
+import java.util.Properties;
+import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
 /**
@@ -139,7 +124,7 @@ public class TSDBDriver extends AbstractDriver {
         } catch (SQLException sqlEx) {
             throw sqlEx;
         } catch (Exception ex) {
-            throw new SQLException("SQLException:" + ex.toString(), ex);
+            throw new SQLException("SQLException:" + ex, ex);
         }
     }
 
@@ -152,7 +137,7 @@ public class TSDBDriver extends AbstractDriver {
     public boolean acceptsURL(String url) throws SQLException {
         if (url == null)
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
-        return url.length() > 0 && url.trim().length() > 0 && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1));
+        return url.trim().length() > 0 && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1));
     }
 
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java

-/**
- * *************************************************************************
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- * <p>
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * ***************************************************************************
- */
 package com.taosdata.jdbc;
 
 import com.alibaba.fastjson.JSONObject;
@@ -261,8 +245,8 @@ public class TSDBJNIConnector {
     /**
      * Create a subscription
      */
-    long subscribe(String topic, String sql, boolean restart, int period) {
-        return subscribeImp(this.taos, restart, topic, sql, period);
+    long subscribe(String topic, String sql, boolean restart) {
+        return subscribeImp(this.taos, restart, topic, sql, 0);
     }
 
     private native long subscribeImp(long connection, boolean restart, String topic, String sql, int period);
@@ -285,16 +269,6 @@ public class TSDBJNIConnector {
 
     private native void unsubscribeImp(long subscription, boolean isKeep);
 
-    /**
-     * Validate if a <I>create table</I> SQL statement is correct without actually creating that table
-     */
-    public boolean validateCreateTableSql(String sql) {
-        int res = validateCreateTableSqlImp(taos, sql.getBytes());
-        return res == 0;
-    }
-
-    private native int validateCreateTableSqlImp(long connection, byte[] sqlBytes);
-
     public long prepareStmt(String sql) throws SQLException {
         long stmt = prepareStmtImp(sql.getBytes(), this.taos);
 

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java

@@ -39,7 +39,7 @@ public class RestfulDriver extends AbstractDriver {
         String port = props.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "6041");
         String database = props.containsKey(TSDBDriver.PROPERTY_KEY_DBNAME) ? props.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME) : null;
 
-        String loginUrl = "http://" + host + ":" + port + "/rest/login/" + props.getProperty(TSDBDriver.PROPERTY_KEY_USER) + "/" + props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD) + "";
+        String loginUrl;
         try {
             if (!props.containsKey(TSDBDriver.PROPERTY_KEY_USER))
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_USER_IS_REQUIRED);
@@ -53,8 +53,8 @@ public class RestfulDriver extends AbstractDriver {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "unsupported UTF-8 concoding, user: " + props.getProperty(TSDBDriver.PROPERTY_KEY_USER) + ", password: " + props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
         }
 
-        int poolSize = Integer.valueOf(props.getProperty("httpPoolSize", HttpClientPoolUtil.DEFAULT_MAX_PER_ROUTE));
-        boolean keepAlive = Boolean.valueOf(props.getProperty("httpKeepAlive", HttpClientPoolUtil.DEFAULT_HTTP_KEEP_ALIVE));
+        int poolSize = Integer.parseInt(props.getProperty("httpPoolSize", HttpClientPoolUtil.DEFAULT_MAX_PER_ROUTE));
+        boolean keepAlive = Boolean.parseBoolean(props.getProperty("httpKeepAlive", HttpClientPoolUtil.DEFAULT_HTTP_KEEP_ALIVE));
 
         HttpClientPoolUtil.init(poolSize, keepAlive);
         String result = HttpClientPoolUtil.execute(loginUrl);
@@ -79,7 +79,7 @@ public class RestfulDriver extends AbstractDriver {
     public boolean acceptsURL(String url) throws SQLException {
         if (url == null)
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
-        return url.length() > 0 && url.trim().length() > 0 && url.startsWith(URL_PREFIX);
+        return url.trim().length() > 0 && url.startsWith(URL_PREFIX);
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

@@ -65,7 +65,11 @@ public class RestfulStatement extends AbstractStatement {
         boolean result = true;
 
         if (SqlSyntaxValidator.isUseSql(sql)) {
-            HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
+            String ret = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
+            JSONObject resultJson = JSON.parseObject(ret);
+            if (resultJson.getString("status").equals("error")) {
+                throw TSDBError.createSQLException(resultJson.getInteger("code"), "sql: " + sql + ", desc: " + resultJson.getString("desc"));
+            }
             this.database = sql.trim().replace("use", "").trim();
             this.conn.setCatalog(this.database);
             result = false;
@@ -114,7 +118,7 @@ public class RestfulStatement extends AbstractStatement {
         String result = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
         JSONObject resultJson = JSON.parseObject(result);
         if (resultJson.getString("status").equals("error")) {
-            throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
+            throw TSDBError.createSQLException(resultJson.getInteger("code"), "sql: " + sql + ", desc: " + resultJson.getString("desc"));
         }
         this.resultSet = new RestfulResultSet(database, this, resultJson);
         this.affectedRows = -1;
@@ -125,7 +129,7 @@ public class RestfulStatement extends AbstractStatement {
         String result = HttpClientPoolUtil.execute(getUrl(), sql, this.conn.getToken());
         JSONObject jsonObject = JSON.parseObject(result);
         if (jsonObject.getString("status").equals("error")) {
-            throw TSDBError.createSQLException(jsonObject.getInteger("code"), jsonObject.getString("desc"));
+            throw TSDBError.createSQLException(jsonObject.getInteger("code"), "sql: " + sql + ", desc: " + jsonObject.getString("desc"));
         }
         this.resultSet = null;
         this.affectedRows = getAffectedRows(jsonObject);
@@ -133,16 +137,14 @@ public class RestfulStatement extends AbstractStatement {
     }
 
     private int getAffectedRows(JSONObject jsonObject) throws SQLException {
-        // create ... SQLs should return 0 , and Restful result like this:
-        // {"status": "succ", "head": ["affected_rows"], "data": [[0]], "rows": 1}
         JSONArray head = jsonObject.getJSONArray("head");
         if (head.size() != 1 || !"affected_rows".equals(head.getString(0)))
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "invalid variable: [" + head.toJSONString() + "]");
         JSONArray data = jsonObject.getJSONArray("data");
         if (data != null) {
             return data.getJSONArray(0).getInteger(0);
         }
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "invalid variable: [" + jsonObject.toJSONString() + "]");
     }
 
     @Override

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java

@@ -8,8 +8,13 @@ import java.sql.SQLException;
 public class ConnectWrongDatabaseTest {
 
     @Test(expected = SQLException.class)
-    public void connect() throws SQLException {
+    public void connectByJni() throws SQLException {
         DriverManager.getConnection("jdbc:TAOS://localhost:6030/wrong_db?user=root&password=taosdata");
     }
 
+    @Test(expected = SQLException.class)
+    public void connectByRestful() throws SQLException {
+        DriverManager.getConnection("jdbc:TAOS-RS://localhost:6041/wrong_db?user=root&password=taosdata");
+    }
+
 }

src/kit/CMakeLists.txt

@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 ADD_SUBDIRECTORY(shell)
-ADD_SUBDIRECTORY(taosdemo)
 
 IF (TD_TAOS_TOOLS)
     INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/kit/taos_tools/deps/avro/lang/c/src)

taos-tools @ b76b5a76

-Subproject commit 7ed1e6b485d04cc93c4bb0bc9e844086da1b4714
+Subproject commit b76b5a76756a5c6530ba1d418de51fd336ae23b1

src/kit/taosdemo/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
-PROJECT(TDengine)
-
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-INCLUDE_DIRECTORIES(inc)
-
-FIND_PACKAGE(Git)
-IF (GIT_FOUND)
-    MESSAGE("Git found")
-    EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1)
-    IF ("${TAOSDEMO_COMMIT_SHA1}" STREQUAL "")
-        SET(TAOSDEMO_COMMIT_SHA1 "unknown")
-    ELSE ()
-        STRING(SUBSTRING "${TAOSDEMO_COMMIT_SHA1}" 0 7 TAOSDEMO_COMMIT_SHA1)
-        STRING(STRIP "${TAOSDEMO_COMMIT_SHA1}" TAOSDEMO_COMMIT_SHA1)
-    ENDIF ()
-    EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSDEMO_STATUS)
-    IF (TD_LINUX)
-      EXECUTE_PROCESS(
-        COMMAND bash "-c" "echo '${TAOSDEMO_STATUS}' | awk '{print $1}'"
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSDEMO_STATUS)
-    ENDIF (TD_LINUX)
-ELSE()
-    MESSAGE("Git not found")
-    SET(TAOSDEMO_COMMIT_SHA1 "unknown")
-    SET(TAOSDEMO_STATUS "unknown")
-ENDIF (GIT_FOUND)
-
-
-MESSAGE("taosdemo's latest commit in short is:" ${TAOSDEMO_COMMIT_SHA1})
-STRING(STRIP "${TAOSDEMO_STATUS}" TAOSDEMO_STATUS)
-
-IF (TAOSDEMO_STATUS MATCHES "M")
-    SET(TAOSDEMO_STATUS "modified")
-ELSE()
-    SET(TAOSDEMO_STATUS "")
-ENDIF ()
-MESSAGE("taosdemo's status is:" ${TAOSDEMO_STATUS})
-
-ADD_DEFINITIONS(-DTAOSDEMO_COMMIT_SHA1="${TAOSDEMO_COMMIT_SHA1}")
-ADD_DEFINITIONS(-DTAOSDEMO_STATUS="${TAOSDEMO_STATUS}")
-
-MESSAGE("TD_VER_NUMBER is:" ${TD_VER_NUMBER})
-IF ("${TD_VER_NUMBER}" STREQUAL "")
-    SET(TD_VERSION_NUMBER "TDengine-version-unknown")
-ELSE()
-    SET(TD_VERSION_NUMBER ${TD_VER_NUMBER})
-ENDIF ()
-MESSAGE("TD_VERSION_NUMBER is:" ${TD_VERSION_NUMBER})
-ADD_DEFINITIONS(-DTD_VERNUMBER="${TD_VERSION_NUMBER}")
-
-IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
-  ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
-  SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
-ELSE ()
-  SET(LINK_JEMALLOC "")
-ENDIF ()
-
-IF (TD_LINUX)
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  ADD_EXECUTABLE(taosdemo ${SRC})
-
-  IF (TD_SOMODE_STATIC)
-      TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua ${LINK_JEMALLOC})
-  ELSE ()
-      TARGET_LINK_LIBRARIES(taosdemo taos cJson ${LINK_JEMALLOC})
-  ENDIF ()
-ELSEIF (TD_WINDOWS)
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  ADD_EXECUTABLE(taosdemo ${SRC})
-  SET_SOURCE_FILES_PROPERTIES(./src/demoUtil.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoData.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoInsert.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoCommandOpt.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoQuery.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoMain.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoSubscribe.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoOutput.c PROPERTIES COMPILE_FLAGS -w)
-  SET_SOURCE_FILES_PROPERTIES(./src/demoJsonOpt.c PROPERTIES COMPILE_FLAGS -w)
-  IF (TD_SOMODE_STATIC)
-    TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(taosdemo taos cJson lua)
-  ENDIF ()
-ELSEIF (TD_DARWIN)
-  # missing a few dependencies, such as <argp.h>
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  ADD_EXECUTABLE(taosdemo ${SRC})
-  
-  IF (TD_SOMODE_STATIC)
-    TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(taosdemo taos cJson lua)
-  ENDIF ()
-ENDIF ()
-

src/kit/taosdemo/async-sub.json

-{
-  "filetype": "subscribe",
-  "cfgdir": "/etc/taos",
-  "host": "127.0.0.1",
-  "port": 6030,
-  "user": "root",
-  "password": "taosdata",
-  "databases": "test",
-  "specified_table_query": {
-    "concurrent": 1,
-    "mode": "async",
-    "interval": 1000,
-    "restart": "yes",
-    "keepProgress": "yes",
-    "resubAfterConsume": 10,
-    "sqls": [
-      {
-        "sql": "select col1 from meters where col1 > 1;",
-        "result": "./subscribe_res0.txt"
-      },
-      {
-        "sql": "select col2 from meters where col2 > 1;",
-        "result": "./subscribe_res2.txt"
-      }
-    ]
-  },
-  "super_table_query": {
-    "stblname": "meters",
-    "threads": 1,
-    "mode": "sync",
-    "interval": 1000,
-    "restart": "yes",
-    "keepProgress": "yes",
-    "sqls": [
-      {
-        "sql": "select col1 from xxxx where col1 > 10;",
-        "result": "./subscribe_res1.txt"
-      }
-    ]
-  }
-}

src/kit/taosdemo/inc/demo.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DEMO__
-#define __DEMO__
-
-#include <stdint.h>
-#include <taos.h>
-#include <taoserror.h>
-#define _GNU_SOURCE
-#define CURL_STATICLIB
-
-#ifdef LINUX
-#include <argp.h>
-#include <inttypes.h>
-#ifndef _ALPINE
-#include <error.h>
-#endif
-#include <pthread.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <wordexp.h>
-#else
-#include <regex.h>
-#include <stdio.h>
-#endif
-
-#include <assert.h>
-#include <stdlib.h>
-
-// #include "os.h"
-#include "taos.h"
-#include "taoserror.h"
-#include "tutil.h"
-
-#define REQ_EXTRA_BUF_LEN 1024
-#define RESP_BUF_LEN 4096
-#define SQL_BUFF_LEN 1024
-
-extern char configDir[];
-
-#define STR_INSERT_INTO "INSERT INTO "
-
-#define MAX_RECORDS_PER_REQ 32766
-
-#define HEAD_BUFF_LEN \
-    TSDB_MAX_COLUMNS * 24  // 16*MAX_COLUMNS + (192+32)*2 + insert into ..
-
-#define BUFFER_SIZE TSDB_MAX_ALLOWED_SQL_LEN
-#define FETCH_BUFFER_SIZE 100 * TSDB_MAX_ALLOWED_SQL_LEN
-#define COND_BUF_LEN (BUFFER_SIZE - 30)
-#define COL_BUFFER_LEN ((TSDB_COL_NAME_LEN + 15) * TSDB_MAX_COLUMNS)
-
-#define MAX_USERNAME_SIZE 64
-#define MAX_HOSTNAME_SIZE \
-    253  // https://man7.org/linux/man-pages/man7/hostname.7.html
-#define MAX_TB_NAME_SIZE 64
-#define MAX_DATA_SIZE \
-    (16 * TSDB_MAX_COLUMNS) + 20  // max record len: 16*MAX_COLUMNS, timestamp
-                                  // string and ,('') need extra space
-#define OPT_ABORT 1               /* –abort */
-#define MAX_FILE_NAME_LEN 256     // max file name length on linux is 255.
-#define MAX_PATH_LEN 4096
-
-#define DEFAULT_START_TIME 1500000000000
-
-#define MAX_PREPARED_RAND 1000000
-#define INT_BUFF_LEN 12
-#define BIGINT_BUFF_LEN 21
-#define SMALLINT_BUFF_LEN 7
-#define TINYINT_BUFF_LEN 5
-#define BOOL_BUFF_LEN 6
-#define FLOAT_BUFF_LEN 22
-#define DOUBLE_BUFF_LEN 42
-#define TIMESTAMP_BUFF_LEN 21
-#define PRINT_STAT_INTERVAL 30 * 1000
-
-#define MAX_SAMPLES 10000
-#define MAX_NUM_COLUMNS \
-    (TSDB_MAX_COLUMNS - 1)  // exclude first column timestamp
-
-#define MAX_DB_COUNT 8
-#define MAX_SUPER_TABLE_COUNT 200
-
-#define MAX_QUERY_SQL_COUNT 100
-
-#define MAX_DATABASE_COUNT 256
-#define MAX_JSON_BUFF 6400000
-
-#define INPUT_BUF_LEN 256
-#define EXTRA_SQL_LEN 256
-#define TBNAME_PREFIX_LEN \
-    (TSDB_TABLE_NAME_LEN - 20)  // 20 characters reserved for seq
-#define SMALL_BUFF_LEN 8
-#define DATATYPE_BUFF_LEN (SMALL_BUFF_LEN * 3)
-#define NOTE_BUFF_LEN (SMALL_BUFF_LEN * 16)
-
-#define DEFAULT_NTHREADS 8
-#define DEFAULT_TIMESTAMP_STEP 1
-#define DEFAULT_INTERLACE_ROWS 0
-#define DEFAULT_DATATYPE_NUM 1
-#define DEFAULT_CHILDTABLES 10000
-#define DEFAULT_TEST_MODE 0
-#define DEFAULT_METAFILE NULL
-#define DEFAULT_SQLFILE NULL
-#define DEFAULT_HOST "localhost"
-#define DEFAULT_PORT 6030
-#define DEFAULT_IFACE INTERFACE_BUT
-#define DEFAULT_DATABASE "test"
-#define DEFAULT_REPLICA 1
-#define DEFAULT_TB_PREFIX "d"
-#define DEFAULT_ESCAPE_CHAR false
-#define DEFAULT_USE_METRIC true
-#define DEFAULT_DROP_DB true
-#define DEFAULT_AGGR_FUNC false
-#define DEFAULT_DEBUG false
-#define DEFAULT_VERBOSE false
-#define DEFAULT_PERF_STAT false
-#define DEFAULT_ANS_YES false
-#define DEFAULT_OUTPUT "./output.txt"
-#define DEFAULT_SYNC_MODE 0
-#define DEFAULT_DATA_TYPE \
-    { TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT }
-#define DEFAULT_DATATYPE \
-    { "FLOAT", "INT", "FLOAT" }
-#define DEFAULT_DATALENGTH \
-    { 4, 4, 4 }
-#define DEFAULT_BINWIDTH 64
-#define DEFAULT_COL_COUNT 4
-#define DEFAULT_LEN_ONE_ROW 76
-#define DEFAULT_INSERT_INTERVAL 0
-#define DEFAULT_QUERY_TIME 1
-#define DEFAULT_PREPARED_RAND 10000
-#define DEFAULT_REQ_PER_REQ 30000
-#define DEFAULT_INSERT_ROWS 10000
-#define DEFAULT_ABORT 0
-#define DEFAULT_RATIO 0
-#define DEFAULT_DISORDER_RANGE 1000
-#define DEFAULT_METHOD_DEL 1
-#define DEFAULT_TOTAL_INSERT 0
-#define DEFAULT_TOTAL_AFFECT 0
-#define DEFAULT_DEMO_MODE true
-#define DEFAULT_CHINESE_OPT false
-#define DEFAULT_CREATE_BATCH 10
-#define DEFAULT_SUB_INTERVAL 10000
-#define DEFAULT_QUERY_INTERVAL 10000
-
-#define SML_LINE_SQL_SYNTAX_OFFSET 7
-
-#if _MSC_VER <= 1900
-#define __func__ __FUNCTION__
-#endif
-
-#define debugPrint(fmt, ...)                            \
-    do {                                                \
-        if (g_args.debug_print || g_args.verbose_print) \
-            fprintf(stderr, "DEBG: " fmt, __VA_ARGS__); \
-    } while (0)
-
-#define verbosePrint(fmt, ...)                                                \
-    do {                                                                      \
-        if (g_args.verbose_print) fprintf(stderr, "VERB: " fmt, __VA_ARGS__); \
-    } while (0)
-
-#define performancePrint(fmt, ...)                      \
-    do {                                                \
-        if (g_args.performance_print)                   \
-            fprintf(stderr, "PERF: " fmt, __VA_ARGS__); \
-    } while (0)
-
-#define errorPrint(fmt, ...)                            \
-    do {                                                \
-        fprintf(stderr, "\033[31m");                    \
-        fprintf(stderr, "%s(%d) ", __FILE__, __LINE__); \
-        fprintf(stderr, "ERROR: " fmt, __VA_ARGS__);    \
-        fprintf(stderr, "\033[0m");                     \
-    } while (0)
-
-enum TEST_MODE {
-    INSERT_TEST,     // 0
-    QUERY_TEST,      // 1
-    SUBSCRIBE_TEST,  // 2
-    INVAID_TEST
-};
-
-typedef enum CREATE_SUB_TABLE_MOD_EN {
-    PRE_CREATE_SUBTBL,
-    AUTO_CREATE_SUBTBL,
-    NO_CREATE_SUBTBL
-} CREATE_SUB_TABLE_MOD_EN;
-
-typedef enum TABLE_EXISTS_EN {
-    TBL_NO_EXISTS,
-    TBL_ALREADY_EXISTS,
-    TBL_EXISTS_BUTT
-} TABLE_EXISTS_EN;
-
-enum enumSYNC_MODE { SYNC_MODE, ASYNC_MODE, MODE_BUT };
-
-enum enum_TAOS_INTERFACE {
-    TAOSC_IFACE,
-    REST_IFACE,
-    STMT_IFACE,
-    SML_IFACE,
-    INTERFACE_BUT
-};
-
-typedef enum enumQUERY_CLASS {
-    SPECIFIED_CLASS,
-    STABLE_CLASS,
-    CLASS_BUT
-} QUERY_CLASS;
-
-typedef enum enum_PROGRESSIVE_OR_INTERLACE {
-    PROGRESSIVE_INSERT_MODE,
-    INTERLACE_INSERT_MODE,
-    INVALID_INSERT_MODE
-} PROG_OR_INTERLACE_MODE;
-
-typedef enum enumQUERY_TYPE {
-    NO_INSERT_TYPE,
-    INSERT_TYPE,
-    QUERY_TYPE_BUT
-} QUERY_TYPE;
-
-enum _show_db_index {
-    TSDB_SHOW_DB_NAME_INDEX,
-    TSDB_SHOW_DB_CREATED_TIME_INDEX,
-    TSDB_SHOW_DB_NTABLES_INDEX,
-    TSDB_SHOW_DB_VGROUPS_INDEX,
-    TSDB_SHOW_DB_REPLICA_INDEX,
-    TSDB_SHOW_DB_QUORUM_INDEX,
-    TSDB_SHOW_DB_DAYS_INDEX,
-    TSDB_SHOW_DB_KEEP_INDEX,
-    TSDB_SHOW_DB_CACHE_INDEX,
-    TSDB_SHOW_DB_BLOCKS_INDEX,
-    TSDB_SHOW_DB_MINROWS_INDEX,
-    TSDB_SHOW_DB_MAXROWS_INDEX,
-    TSDB_SHOW_DB_WALLEVEL_INDEX,
-    TSDB_SHOW_DB_FSYNC_INDEX,
-    TSDB_SHOW_DB_COMP_INDEX,
-    TSDB_SHOW_DB_CACHELAST_INDEX,
-    TSDB_SHOW_DB_PRECISION_INDEX,
-    TSDB_SHOW_DB_UPDATE_INDEX,
-    TSDB_SHOW_DB_STATUS_INDEX,
-    TSDB_MAX_SHOW_DB
-};
-
-// -----------------------------------------SHOW TABLES CONFIGURE
-// -------------------------------------
-enum _show_stables_index {
-    TSDB_SHOW_STABLES_NAME_INDEX,
-    TSDB_SHOW_STABLES_CREATED_TIME_INDEX,
-    TSDB_SHOW_STABLES_COLUMNS_INDEX,
-    TSDB_SHOW_STABLES_METRIC_INDEX,
-    TSDB_SHOW_STABLES_UID_INDEX,
-    TSDB_SHOW_STABLES_TID_INDEX,
-    TSDB_SHOW_STABLES_VGID_INDEX,
-    TSDB_MAX_SHOW_STABLES
-};
-
-enum _describe_table_index {
-    TSDB_DESCRIBE_METRIC_FIELD_INDEX,
-    TSDB_DESCRIBE_METRIC_TYPE_INDEX,
-    TSDB_DESCRIBE_METRIC_LENGTH_INDEX,
-    TSDB_DESCRIBE_METRIC_NOTE_INDEX,
-    TSDB_MAX_DESCRIBE_METRIC
-};
-
-typedef struct SArguments_S {
-    char *   metaFile;
-    uint32_t test_mode;
-    char *   host;
-    uint16_t port;
-    uint16_t iface;
-    char *   user;
-    char     password[SHELL_MAX_PASSWORD_LEN];
-    char *   database;
-    int      replica;
-    char *   tb_prefix;
-    bool     escapeChar;
-    char *   sqlFile;
-    bool     use_metric;
-    bool     drop_database;
-    bool     aggr_func;
-    bool     answer_yes;
-    bool     debug_print;
-    bool     verbose_print;
-    bool     performance_print;
-    char *   output_file;
-    bool     async_mode;
-    char     data_type[MAX_NUM_COLUMNS + 1];
-    char *   dataType[MAX_NUM_COLUMNS + 1];
-    int32_t  data_length[MAX_NUM_COLUMNS + 1];
-    uint32_t binwidth;
-    uint32_t columnCount;
-    uint64_t lenOfOneRow;
-    uint32_t nthreads;
-    uint64_t insert_interval;
-    uint64_t timestamp_step;
-    int64_t  query_times;
-    int64_t  prepared_rand;
-    uint32_t interlaceRows;
-    uint32_t reqPerReq;  // num_of_records_per_req
-    uint64_t max_sql_len;
-    int64_t  ntables;
-    int64_t  insertRows;
-    int      abort;
-    uint32_t disorderRatio;  // 0: no disorder, >0: x%
-    int      disorderRange;  // ms, us or ns. according to database precision
-    uint32_t method_of_delete;
-    uint64_t totalInsertRows;
-    uint64_t totalAffectedRows;
-    bool     demo_mode;  // use default column name and semi-random data
-    bool     chinese;
-} SArguments;
-
-typedef struct SColumn_S {
-    char     field[TSDB_COL_NAME_LEN];
-    char     data_type;
-    char     dataType[DATATYPE_BUFF_LEN];
-    uint32_t dataLen;
-    char     note[NOTE_BUFF_LEN];
-} StrColumn;
-
-typedef struct SSuperTable_S {
-    char     stbName[TSDB_TABLE_NAME_LEN];
-    char     dataSource[SMALL_BUFF_LEN];  // rand_gen or sample
-    char     childTblPrefix[TBNAME_PREFIX_LEN];
-    uint16_t childTblExists;
-    int64_t  childTblCount;
-    uint64_t batchCreateTableNum;  // 0: no batch,  > 0: batch table number in
-                                   // one sql
-    uint8_t  autoCreateTable;  // 0: create sub table, 1: auto create sub table
-    uint16_t iface;            // 0: taosc, 1: rest, 2: stmt
-    uint16_t lineProtocol;
-    int64_t  childTblLimit;
-    uint64_t childTblOffset;
-
-    //  int          multiThreadWriteOneTbl;  // 0: no, 1: yes
-    uint32_t interlaceRows;  //
-    int      disorderRatio;  // 0: no disorder, >0: x%
-    int      disorderRange;  // ms, us or ns. according to database precision
-    uint64_t maxSqlLen;      //
-
-    uint64_t insertInterval;  // insert interval, will override global insert
-                              // interval
-    int64_t insertRows;
-    int64_t timeStampStep;
-    int     tsPrecision;
-    char    startTimestamp[MAX_TB_NAME_SIZE];
-    char    sampleFormat[SMALL_BUFF_LEN];  // csv, json
-    char    sampleFile[MAX_FILE_NAME_LEN];
-    char    tagsFile[MAX_FILE_NAME_LEN];
-
-    uint32_t  columnCount;
-    StrColumn columns[TSDB_MAX_COLUMNS];
-    uint32_t  tagCount;
-    StrColumn tags[TSDB_MAX_TAGS];
-
-    char *   childTblName;
-    bool     escapeChar;
-    char *   colsOfCreateChildTable;
-    uint64_t lenOfOneRow;
-    uint64_t lenOfTagOfOneRow;
-
-    char *sampleDataBuf;
-    bool  useSampleTs;
-
-    uint32_t tagSource;  // 0: rand, 1: tag sample
-    char *   tagDataBuf;
-    uint32_t tagSampleCount;
-    uint32_t tagUsePos;
-
-    // bind param batch
-    char *sampleBindBatchArray;
-    // statistics
-    uint64_t totalInsertRows;
-    uint64_t totalAffectedRows;
-} SSuperTable;
-
-typedef struct {
-    char    name[TSDB_DB_NAME_LEN];
-    char    create_time[32];
-    int64_t ntables;
-    int32_t vgroups;
-    int16_t replica;
-    int16_t quorum;
-    int16_t days;
-    char    keeplist[64];
-    int32_t cache;  // MB
-    int32_t blocks;
-    int32_t minrows;
-    int32_t maxrows;
-    int8_t  wallevel;
-    int32_t fsync;
-    int8_t  comp;
-    int8_t  cachelast;
-    char    precision[SMALL_BUFF_LEN];  // time resolution
-    int8_t  update;
-    char    status[16];
-} SDbInfo;
-
-typedef struct SDbCfg_S {
-    //  int       maxtablesPerVnode;
-    uint32_t minRows;  // 0 means default
-    uint32_t maxRows;  // 0 means default
-    int      comp;
-    int      walLevel;
-    int      cacheLast;
-    int      fsync;
-    int      replica;
-    int      update;
-    int      keep;
-    int      days;
-    int      cache;
-    int      blocks;
-    int      quorum;
-    char     precision[SMALL_BUFF_LEN];
-} SDbCfg;
-
-typedef struct SDataBase_S {
-    char         dbName[TSDB_DB_NAME_LEN];
-    bool         drop;  // 0: use exists, 1: if exists, drop then new create
-    SDbCfg       dbCfg;
-    uint64_t     superTblCount;
-    SSuperTable *superTbls;
-} SDataBase;
-
-typedef struct SDbs_S {
-    char               cfgDir[MAX_FILE_NAME_LEN];
-    char               host[MAX_HOSTNAME_SIZE];
-    struct sockaddr_in serv_addr;
-
-    uint16_t port;
-    char     user[MAX_USERNAME_SIZE];
-    char     password[SHELL_MAX_PASSWORD_LEN];
-    char     resultFile[MAX_FILE_NAME_LEN];
-    bool     use_metric;
-    bool     aggr_func;
-    bool     asyncMode;
-
-    uint32_t threadCount;
-    uint32_t threadCountForCreateTbl;
-    uint32_t dbCount;
-    // statistics
-    uint64_t totalInsertRows;
-    uint64_t totalAffectedRows;
-
-    SDataBase *db;
-} SDbs;
-
-typedef struct SpecifiedQueryInfo_S {
-    uint64_t  queryInterval;  // 0: unlimited  > 0   loop/s
-    uint32_t  concurrent;
-    int       sqlCount;
-    uint32_t  asyncMode;          // 0: sync, 1: async
-    uint64_t  subscribeInterval;  // ms
-    uint64_t  queryTimes;
-    bool      subscribeRestart;
-    int       subscribeKeepProgress;
-    char      sql[MAX_QUERY_SQL_COUNT][BUFFER_SIZE + 1];
-    char      result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
-    int       resubAfterConsume[MAX_QUERY_SQL_COUNT];
-    int       endAfterConsume[MAX_QUERY_SQL_COUNT];
-    TAOS_SUB *tsub[MAX_QUERY_SQL_COUNT];
-    char      topic[MAX_QUERY_SQL_COUNT][32];
-    int       consumed[MAX_QUERY_SQL_COUNT];
-    TAOS_RES *res[MAX_QUERY_SQL_COUNT];
-    uint64_t  totalQueried;
-} SpecifiedQueryInfo;
-
-typedef struct SuperQueryInfo_S {
-    char     stbName[TSDB_TABLE_NAME_LEN];
-    uint64_t queryInterval;  // 0: unlimited  > 0   loop/s
-    uint32_t threadCnt;
-    uint32_t asyncMode;          // 0: sync, 1: async
-    uint64_t subscribeInterval;  // ms
-    bool     subscribeRestart;
-    int      subscribeKeepProgress;
-    uint64_t queryTimes;
-    int64_t  childTblCount;
-    char childTblPrefix[TBNAME_PREFIX_LEN];  // 20 characters reserved for seq
-    int  sqlCount;
-    char sql[MAX_QUERY_SQL_COUNT][BUFFER_SIZE + 1];
-    char result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
-    int  resubAfterConsume;
-    int  endAfterConsume;
-    TAOS_SUB *tsub[MAX_QUERY_SQL_COUNT];
-    char *    childTblName;
-    uint64_t  totalQueried;
-} SuperQueryInfo;
-
-typedef struct SQueryMetaInfo_S {
-    char               cfgDir[MAX_FILE_NAME_LEN];
-    char               host[MAX_HOSTNAME_SIZE];
-    uint16_t           port;
-    struct sockaddr_in serv_addr;
-    char               user[MAX_USERNAME_SIZE];
-    char               password[SHELL_MAX_PASSWORD_LEN];
-    char               dbName[TSDB_DB_NAME_LEN];
-    char               queryMode[SMALL_BUFF_LEN];  // taosc, rest
-    SpecifiedQueryInfo specifiedQueryInfo;
-    SuperQueryInfo     superQueryInfo;
-    uint64_t           totalQueried;
-} SQueryMetaInfo;
-
-typedef struct SThreadInfo_S {
-    TAOS *       taos;
-    TAOS_STMT *  stmt;
-    int64_t *    bind_ts;
-    int64_t *    bind_ts_array;
-    char *       bindParams;
-    char *       is_null;
-    int          threadID;
-    char         db_name[TSDB_DB_NAME_LEN];
-    uint32_t     time_precision;
-    char         filePath[MAX_PATH_LEN];
-    FILE *       fp;
-    char         tb_prefix[TSDB_TABLE_NAME_LEN];
-    uint64_t     start_table_from;
-    uint64_t     end_table_to;
-    int64_t      ntables;
-    int64_t      tables_created;
-    uint64_t     data_of_rate;
-    int64_t      start_time;
-    char *       cols;
-    bool         use_metric;
-    SSuperTable *stbInfo;
-    char *       buffer;  // sql cmd buffer
-
-    // for async insert
-    tsem_t   lock_sem;
-    int64_t  counter;
-    uint64_t st;
-    uint64_t et;
-    uint64_t lastTs;
-
-    // sample data
-    int64_t samplePos;
-    // statistics
-    uint64_t totalInsertRows;
-    uint64_t totalAffectedRows;
-
-    // insert delay statistics
-    uint64_t cntDelay;
-    uint64_t totalDelay;
-    uint64_t avgDelay;
-    uint64_t maxDelay;
-    uint64_t minDelay;
-
-    // seq of query or subscribe
-    uint64_t  querySeq;  // sequence number of sql command
-    TAOS_SUB *tsub;
-
-    char **lines;
-    SOCKET sockfd;
-} threadInfo;
-
-/* ************ Global variables ************  */
-extern char *         g_aggreFuncDemo[];
-extern char *         g_aggreFunc[];
-extern SArguments     g_args;
-extern SDbs           g_Dbs;
-extern char *         g_dupstr;
-extern int64_t        g_totalChildTables;
-extern int64_t        g_actualChildTables;
-extern SQueryMetaInfo g_queryInfo;
-extern FILE *         g_fpOfInsertResult;
-extern bool           g_fail;
-
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-
-/* ************ Function declares ************  */
-/* demoCommandOpt.c */
-int  parse_args(int argc, char *argv[]);
-void setParaFromArg();
-void querySqlFile(TAOS *taos, char *sqlFile);
-void testCmdLine();
-/* demoJsonOpt.c */
-int getInfoFromJsonFile(char *file);
-int testMetaFile();
-/* demoUtil.c */
-int   isCommentLine(char *line);
-void  replaceChildTblName(char *inSql, char *outSql, int tblIndex);
-void  setupForAnsiEscape(void);
-void  resetAfterAnsiEscape(void);
-int   taosRandom();
-void  tmfree(void *buf);
-void  tmfclose(FILE *fp);
-void  fetchResult(TAOS_RES *res, threadInfo *pThreadInfo);
-void  prompt();
-void  ERROR_EXIT(const char *msg);
-int   postProceSql(char *host, uint16_t port, char *sqlstr,
-                   threadInfo *pThreadInfo);
-int   queryDbExec(TAOS *taos, char *command, QUERY_TYPE type, bool quiet);
-int   regexMatch(const char *s, const char *reg, int cflags);
-int   convertHostToServAddr(char *host, uint16_t port,
-                            struct sockaddr_in *serv_addr);
-char *formatTimestamp(char *buf, int64_t val, int precision);
-void  errorWrongValue(char *program, char *wrong_arg, char *wrong_value);
-void  errorUnrecognized(char *program, char *wrong_arg);
-void  errorPrintReqArg(char *program, char *wrong_arg);
-void  errorPrintReqArg2(char *program, char *wrong_arg);
-void  errorPrintReqArg3(char *program, char *wrong_arg);
-bool  isStringNumber(char *input);
-int   getAllChildNameOfSuperTable(TAOS *taos, char *dbName, char *stbName,
-                                  char **  childTblNameOfSuperTbl,
-                                  int64_t *childTblCountOfSuperTbl);
-int   getChildNameOfSuperTableWithLimitAndOffset(TAOS *taos, char *dbName,
-                                                 char *   stbName,
-                                                 char **  childTblNameOfSuperTbl,
-                                                 int64_t *childTblCountOfSuperTbl,
-                                                 int64_t limit, uint64_t offset,
-                                                 bool escapChar);
-/* demoInsert.c */
-int  insertTestProcess();
-void postFreeResource();
-/* demoOutput.c */
-void printVersion();
-void printfInsertMeta();
-void printfInsertMetaToFile(FILE *fp);
-void printStatPerThread(threadInfo *pThreadInfo);
-void appendResultBufToFile(char *resultBuf, threadInfo *pThreadInfo);
-void printfQueryMeta();
-void printHelp();
-void printfQuerySystemInfo(TAOS *taos);
-/* demoQuery.c */
-int queryTestProcess();
-/* demoSubscribe.c */
-int subscribeTestProcess();
-#endif
\ No newline at end of file

src/kit/taosdemo/inc/demoData.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DEMODATA__
-#define __DEMODATA__
-#include "cJSON.h"
-#include "demo.h"
-/***** Global variables ******/
-
-extern char *    g_sampleDataBuf;
-extern char *    g_sampleBindBatchArray;
-extern int32_t * g_randint;
-extern uint32_t *g_randuint;
-extern int64_t * g_randbigint;
-extern uint64_t *g_randubigint;
-extern float *   g_randfloat;
-extern double *  g_randdouble;
-extern char *    g_randbool_buff;
-extern char *    g_randint_buff;
-extern char *    g_randuint_buff;
-extern char *    g_rand_voltage_buff;
-extern char *    g_randbigint_buff;
-extern char *    g_randubigint_buff;
-extern char *    g_randsmallint_buff;
-extern char *    g_randusmallint_buff;
-extern char *    g_randtinyint_buff;
-extern char *    g_randutinyint_buff;
-extern char *    g_randfloat_buff;
-extern char *    g_rand_current_buff;
-extern char *    g_rand_phase_buff;
-extern char *    g_randdouble_buff;
-/***** Declare functions *****/
-int                 init_rand_data();
-char *              rand_bool_str();
-int32_t             rand_bool();
-char *              rand_tinyint_str();
-int32_t             rand_tinyint();
-char *              rand_utinyint_str();
-int32_t             rand_utinyint();
-char *              rand_smallint_str();
-int32_t             rand_smallint();
-char *              rand_usmallint_str();
-int32_t             rand_usmallint();
-char *              rand_int_str();
-int32_t             rand_int();
-char *              rand_uint_str();
-int32_t             rand_uint();
-char *              rand_bigint_str();
-int64_t             rand_bigint();
-char *              rand_ubigint_str();
-int64_t             rand_ubigint();
-char *              rand_float_str();
-float               rand_float();
-char *              demo_current_float_str();
-float UNUSED_FUNC   demo_current_float();
-char *              demo_voltage_int_str();
-int32_t UNUSED_FUNC demo_voltage_int();
-char *              demo_phase_float_str();
-float UNUSED_FUNC   demo_phase_float();
-void                rand_string(char *str, int size);
-char *              rand_double_str();
-double              rand_double();
-
-int     generateTagValuesForStb(SSuperTable *stbInfo, int64_t tableSeq,
-                                char *tagsValBuf);
-int64_t getTSRandTail(int64_t timeStampStep, int32_t seq, int disorderRatio,
-                      int disorderRange);
-int32_t prepareStbStmtBindTag(char *bindArray, SSuperTable *stbInfo,
-                              char *tagsVal, int32_t timePrec);
-int32_t prepareStmtWithoutStb(threadInfo *pThreadInfo, char *tableName,
-                              uint32_t batch, int64_t insertRows,
-                              int64_t recordFrom, int64_t startTime);
-int32_t generateStbInterlaceData(threadInfo *pThreadInfo, char *tableName,
-                                 uint32_t batchPerTbl, uint64_t i,
-                                 uint32_t batchPerTblTimes, uint64_t tableSeq,
-                                 char *buffer, int64_t insertRows,
-                                 int64_t startTime, uint64_t *pRemainderBufLen);
-int64_t generateInterlaceDataWithoutStb(char *tableName, uint32_t batch,
-                                        uint64_t tableSeq, char *dbName,
-                                        char *buffer, int64_t insertRows,
-                                        int64_t   startTime,
-                                        uint64_t *pRemainderBufLen);
-int32_t generateStbProgressiveData(SSuperTable *stbInfo, char *tableName,
-                                   int64_t tableSeq, char *dbName, char *buffer,
-                                   int64_t insertRows, uint64_t recordFrom,
-                                   int64_t startTime, int64_t *pSamplePos,
-                                   int64_t *pRemainderBufLen);
-int32_t generateProgressiveDataWithoutStb(
-    char *tableName, threadInfo *pThreadInfo, char *buffer, int64_t insertRows,
-    uint64_t recordFrom, int64_t startTime, int64_t *pRemainderBufLen);
-int64_t generateStbRowData(SSuperTable *stbInfo, char *recBuf,
-                           int64_t remainderBufLen, int64_t timestamp);
-int     prepareSampleForStb(SSuperTable *stbInfo);
-int     prepareSampleForNtb();
-int     parseSamplefileToStmtBatch(SSuperTable *stbInfo);
-int     parseStbSampleToStmtBatchForThread(threadInfo * pThreadInfo,
-                                           SSuperTable *stbInfo, uint32_t timePrec,
-                                           uint32_t batch);
-int     parseNtbSampleToStmtBatchForThread(threadInfo *pThreadInfo,
-                                           uint32_t timePrec, uint32_t batch);
-int     prepareSampleData();
-int32_t generateSmlConstPart(char *sml, SSuperTable *stbInfo,
-                             threadInfo *pThreadInfo, int tbSeq);
-
-int32_t generateSmlMutablePart(char *line, char *sml, SSuperTable *stbInfo,
-                               threadInfo *pThreadInfo, int64_t timestamp);
-int32_t generateSmlJsonTags(cJSON *tagsList, SSuperTable *stbInfo,
-                            threadInfo *pThreadInfo, int tbSeq);
-int32_t generateSmlJsonCols(cJSON *array, cJSON *tag, SSuperTable *stbInfo,
-                            threadInfo *pThreadInfo, int64_t timestamp);
-#endif
\ No newline at end of file

src/kit/taosdemo/insert-interlace.json

-{
-    "filetype": "insert",
-    "cfgdir": "/etc/taos",
-    "host": "127.0.0.1",
-    "port": 6030,
-    "user": "root",
-    "password": "taosdata",
-    "thread_count": 4,
-    "thread_count_create_tbl": 4,
-    "result_file": "./insert_res.txt",
-    "confirm_parameter_prompt": "no",
-    "insert_interval": 1000,
-    "num_of_records_per_req": 100,
-    "max_sql_len": 1024000,
-    "databases": [{
-        "dbinfo": {
-            "name": "db",
-            "drop": "yes",
-            "replica": 1,
-            "days": 10,
-            "cache": 16,
-            "blocks": 8,
-            "precision": "ms",
-            "keep": 365,
-            "minRows": 100,
-            "maxRows": 4096,
-            "comp":2,
-            "walLevel":1,
-            "cachelast":0,
-            "quorum":1,
-            "fsync":3000,
-            "update": 0
-        },
-        "super_tables": [{
-            "name": "stb",
-            "child_table_exists":"no",
-            "childtable_count": 100,
-            "childtable_prefix": "stb_",
-            "auto_create_table": "no",
-            "data_source": "rand",
-            "insert_mode": "taosc",
-            "insert_rows": 1000,
-            "interlace_rows": 20,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "./sample.csv",
-            "tags_file": "",
-            "columns": [{"type": "INT"}],
-            "tags": [{"type": "TINYINT", "count":1}]
-        }]
-    }]
-}

src/kit/taosdemo/insert.json

-{
-    "filetype": "insert",
-    "cfgdir": "/etc/taos",
-    "host": "127.0.0.1",
-    "port": 6030,
-    "user": "root",
-    "password": "taosdata",
-    "thread_count": 4,
-    "thread_count_create_tbl": 4,
-    "result_file": "./insert_res.txt",
-    "confirm_parameter_prompt": "no",
-    "insert_interval": 0,
-    "num_of_records_per_req": 100,
-    "max_sql_len": 1024000,
-    "databases": [{
-        "dbinfo": {
-            "name": "db",
-            "drop": "yes",
-            "replica": 1,
-            "days": 10,
-            "cache": 16,
-            "blocks": 8,
-            "precision": "ms",
-            "keep": 36500,
-            "minRows": 100,
-            "maxRows": 4096,
-            "comp":2,
-            "walLevel":1,
-            "cachelast":0,
-            "quorum":1,
-            "fsync":3000,
-            "update": 0
-        },
-        "super_tables": [{
-            "name": "stb",
-            "child_table_exists":"no",
-            "childtable_count": 10000,
-            "childtable_prefix": "stb_",
-            "auto_create_table": "no",
-            "data_source": "rand",
-            "insert_mode": "taosc",
-            "insert_rows": 100000,
-            "interlace_rows": 0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "./sample.csv",
-            "tags_file": "",
-            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
-            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
-        }]
-    }]
-}

src/kit/taosdemo/query.json

-{
-  "filetype": "query",
-  "cfgdir": "/etc/taos",
-  "host": "127.0.0.1",
-  "port": 6030,
-  "user": "root",
-  "password": "taosdata",
-  "confirm_parameter_prompt": "yes",
-  "databases": "dbx",
-  "query_times": 1,
-  "specified_table_query": {
-    "query_interval": 1,
-    "concurrent": 4,
-    "sqls": [
-      {
-        "sql": "select last_row(*) from stb where color='red'",
-        "result": "./query_res0.txt"
-      },
-      {
-        "sql": "select count(*) from stb_01",
-        "result": "./query_res1.txt"
-      }
-    ]
-  },
-  "super_table_query": {
-    "stblname": "stb",
-    "query_interval": 1,
-    "threads": 4,
-    "sqls": [
-      {
-        "sql": "select last_row(*) from xxxx",
-        "result": "./query_res2.txt"
-      }
-    ]
-  }
-}

src/kit/taosdemo/src/demoMain.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "demo.h"
-int64_t        g_totalChildTables = DEFAULT_CHILDTABLES;
-int64_t        g_actualChildTables = 0;
-FILE *         g_fpOfInsertResult = NULL;
-char *         g_dupstr = NULL;
-SDbs           g_Dbs;
-SQueryMetaInfo g_queryInfo;
-bool           g_fail = false;
-
-SArguments g_args = {
-    DEFAULT_METAFILE,          // metaFile
-    DEFAULT_TEST_MODE,         // test_mode
-    DEFAULT_HOST,              // host
-    DEFAULT_PORT,              // port
-    DEFAULT_IFACE,             // iface
-    TSDB_DEFAULT_USER,         // user
-    TSDB_DEFAULT_PASS,         // password
-    DEFAULT_DATABASE,          // database
-    DEFAULT_REPLICA,           // replica
-    DEFAULT_TB_PREFIX,         // tb_prefix
-    DEFAULT_ESCAPE_CHAR,       // escapeChar
-    DEFAULT_SQLFILE,           // sqlFile
-    DEFAULT_USE_METRIC,        // use_metric
-    DEFAULT_DROP_DB,           // drop_database
-    DEFAULT_AGGR_FUNC,         // aggr_func
-    DEFAULT_DEBUG,             // debug_print
-    DEFAULT_VERBOSE,           // verbose_print
-    DEFAULT_PERF_STAT,         // performance statistic print
-    DEFAULT_ANS_YES,           // answer_yes;
-    DEFAULT_OUTPUT,            // output_file
-    DEFAULT_SYNC_MODE,         // mode : sync or async
-    DEFAULT_DATA_TYPE,         // data_type
-    DEFAULT_DATATYPE,          // dataType
-    DEFAULT_DATALENGTH,        // data_length
-    DEFAULT_BINWIDTH,          // binwidth
-    DEFAULT_COL_COUNT,         // columnCount, timestamp + float + int + float
-    DEFAULT_LEN_ONE_ROW,       // lenOfOneRow
-    DEFAULT_NTHREADS,          // nthreads
-    DEFAULT_INSERT_INTERVAL,   // insert_interval
-    DEFAULT_TIMESTAMP_STEP,    // timestamp_step
-    DEFAULT_QUERY_TIME,        // query_times
-    DEFAULT_PREPARED_RAND,     // prepared_rand
-    DEFAULT_INTERLACE_ROWS,    // interlaceRows;
-    DEFAULT_REQ_PER_REQ,       // reqPerReq
-    TSDB_MAX_ALLOWED_SQL_LEN,  // max_sql_len
-    DEFAULT_CHILDTABLES,       // ntables
-    DEFAULT_INSERT_ROWS,       // insertRows
-    DEFAULT_ABORT,             // abort
-    DEFAULT_RATIO,             // disorderRatio
-    DEFAULT_DISORDER_RANGE,    // disorderRange
-    DEFAULT_METHOD_DEL,        // method_of_delete
-    DEFAULT_TOTAL_INSERT,      // totalInsertRows;
-    DEFAULT_TOTAL_AFFECT,      // totalAffectedRows;
-    DEFAULT_DEMO_MODE,         // demo_mode;
-    DEFAULT_CHINESE_OPT        // chinese
-};
-
-int main(int argc, char *argv[]) {
-    if (parse_args(argc, argv)) {
-        exit(EXIT_FAILURE);
-    }
-    debugPrint("meta file: %s\n", g_args.metaFile);
-
-    if (g_args.metaFile) {
-        g_totalChildTables = 0;
-        if (getInfoFromJsonFile(g_args.metaFile)) {
-            exit(EXIT_FAILURE);
-        }
-        if (testMetaFile()) {
-            exit(EXIT_FAILURE);
-        }
-    } else {
-        memset(&g_Dbs, 0, sizeof(SDbs));
-        g_Dbs.db = calloc(1, sizeof(SDataBase));
-        if (NULL == g_Dbs.db) {
-            errorPrint("%s", "failed to allocate memory\n");
-        }
-
-        g_Dbs.db[0].superTbls = calloc(1, sizeof(SSuperTable));
-        if (NULL == g_Dbs.db[0].superTbls) {
-            errorPrint("%s", "failed to allocate memory\n");
-        }
-
-        setParaFromArg();
-
-        if (NULL != g_args.sqlFile) {
-            TAOS *qtaos = taos_connect(g_Dbs.host, g_Dbs.user, g_Dbs.password,
-                                       g_Dbs.db[0].dbName, g_Dbs.port);
-            querySqlFile(qtaos, g_args.sqlFile);
-            taos_close(qtaos);
-        } else {
-            testCmdLine();
-        }
-    }
-    postFreeResource();
-
-    return 0;
-}
\ No newline at end of file

src/kit/taosdemo/subscribe.json

-{
-  "filetype": "subscribe",
-  "cfgdir": "/etc/taos",
-  "host": "127.0.0.1",
-  "port": 6030,
-  "user": "root",
-  "password": "taosdata",
-  "databases": "test",
-  "specified_table_query": {
-    "concurrent": 1,
-    "mode": "sync",
-    "interval": 1000,
-    "restart": "yes",
-    "keepProgress": "yes",
-    "resubAfterConsume": 10,
-    "sqls": [
-      {
-        "sql": "select avg(col1) from meters where col1 > 1;",
-        "result": "./subscribe_res0.txt"
-      }
-    ]
-  },
-  "super_table_query": {
-    "stblname": "meters",
-    "threads": 1,
-    "mode": "sync",
-    "interval": 1000,
-    "restart": "yes",
-    "keepProgress": "yes",
-    "sqls": [
-      {
-        "sql": "select col1 from xxxx where col1 > 10;",
-        "result": "./subscribe_res1.txt"
-      }
-    ]
-  }
-}

src/tsdb/src/tsdbMemTable.c

@@ -714,13 +714,17 @@ static int tsdbScanAndConvertSubmitMsg(STsdbRepo *pRepo, SSubmitMsg *pMsg) {
 static SMemRow tsdbInsertDupKeyMerge(SMemRow row1, SMemRow row2, STsdbRepo* pRepo,
                                      STSchema **ppSchema1, STSchema **ppSchema2,
                                      STable* pTable, int32_t* pPoints, SMemRow* pLastRow) {
-  
+
   //for compatiblity, duplicate key inserted when update=0 should be also calculated as affected rows!
   if(row1 == NULL && row2 == NULL && pRepo->config.update == TD_ROW_DISCARD_UPDATE) {
     (*pPoints)++;
     return NULL;
   }
 
+  tsdbTrace("vgId:%d a row is %s table %s tid %d uid %" PRIu64 " key %" PRIu64, REPO_ID(pRepo),
+            "updated in", TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable),
+            memRowKey(row1));
+
   if(row2 == NULL || pRepo->config.update != TD_ROW_PARTIAL_UPDATE) {
     void* pMem = tsdbAllocBytes(pRepo, memRowTLen(row1));
     if(pMem == NULL) return NULL;
@@ -841,7 +845,6 @@ static int tsdbInsertDataToTable(STsdbRepo* pRepo, SSubmitBlk* pBlock, int32_t *
   int64_t dsize = SL_SIZE(pTableData->pData) - osize;
   (*pAffectedRows) += points;
 
-
   if(lastRow != NULL) {
     TSKEY lastRowKey = memRowKey(lastRow);
     if (pMemTable->keyFirst > firstRowKey) pMemTable->keyFirst = firstRowKey;

tests/examples/C#/C#checker/C#checker.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>C_checker</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TDengine.Connector" Version="1.0.2" />
+  </ItemGroup>
+
+</Project>