Merge remote-tracking branch 'origin/develop' into test/TD-10790-1

Jenkinsfile

@@ -367,6 +367,7 @@ pipeline {
               else{
                 sh'''
                   cd ${WKC}
+                  git reset --hard HEAD~10
                   git fetch
                   git checkout ${CHANGE_BRANCH}
                   git pull

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 ()

jemalloc @ ea6b3e97

-Subproject commit 9015e129bd7de389afa4196495451669700904d0
+Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756

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
@@ -804,17 +805,16 @@ Query OK, 1 row(s) in set (0.000141s)
 请参考：[JDBC example](https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC)
 
 ## 常见问题
+* 使用Statement的addBatch和executeBatch来执行“批量写入/更行”，为什么没有带来性能上的提升？
+  **原因**：TDengine的JDBC实现中，通过addBatch方法提交的sql语句，会按照添加的顺序，依次执行，这种方式没有减少与服务端的交互次数，不会带来性能上的提升。
+  **解决方法**：1. 在一条insert语句中拼接多个values值；2. 使用多线程的方式并发插入；3. 使用参数绑定的写入方式
   
 * java.lang.UnsatisfiedLinkError: no taos in java.library.path
-
   **原因**：程序没有找到依赖的本地函数库 taos。
-
   **解决方法**：Windows 下可以将 C:\TDengine\driver\taos.dll 拷贝到 C:\Windows\System32\ 目录下，Linux 下将建立如下软链 `ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` 即可。
 
 * java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform
-
   **原因**：目前 TDengine 只支持 64 位 JDK。
-
   **解决方法**：重新安装 64 位 JDK。
 
 * 其它问题请参考 [Issues](https://github.com/taosdata/TDengine/issues)

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

@@ -1377,8 +1377,60 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     Query OK, 1 row(s) in set (0.001042s)
    ```
 
+- **INTERP  [2.3.1及之后的版本]** 
     
-- **INTERP** 
+    ```mysql
+    SELECT INTERP(field_name) FROM { tb_name | stb_name } [WHERE where_condition] [ RANGE(timestamp1,timestamp2) ] [EVERY(interval)] [FILL ({ VALUE | PREV | NULL | LINEAR | NEXT})];
+    ```
+
+功能说明：返回表/超级表的指定时间截面指定列的记录值（插值）。
+
+返回结果数据类型：同字段类型。
+
+应用字段：数值型字段。
+
+适用于：**表、超级表、嵌套查询**。
+
+说明：
+1）INTERP用于在指定时间断面获取指定列的记录值，如果该时间断面不存在符合条件的行数据，那么会根据 FILL 参数的设定进行插值。
+
+2）INTERP的输入数据为指定列的数据，可以通过条件语句（where子句）来对原始列数据进行过滤，如果没有指定过滤条件则输入为全部数据。
+
+3）INTERP的输出时间范围根据RANGE(timestamp1,timestamp2)字段来指定，需满足timestamp1<=timestamp2。其中timestamp1（必选值）为输出时间范围的起始值，即如果timestamp1时刻符合插值条件则timestamp1为输出的第一条记录，timestamp2（必选值）为输出时间范围的结束值，即输出的最后一条记录的timestamp不能大于timestamp2。如果没有指定RANGE，那么满足过滤条件的输入数据中第一条记录的timestamp即为timestamp1，最后一条记录的timestamp即为timestamp2，同样也满足timestamp1 <= timestamp2。
+
+4）INTERP根据EVERY字段来确定输出时间范围内的结果条数，即从timestamp1开始每隔固定长度的时间（EVERY值）进行插值。如果没有指定EVERY，则默认窗口大小为无穷大，即从timestamp1开始只有一个窗口。
+
+5）INTERP根据FILL字段来决定在每个符合输出条件的时刻如何进行插值，如果没有FILL字段则默认不插值，即输出为原始记录值或不输出（原始记录不存在）。
+
+6）INTERP只能在一个时间序列内进行插值，因此当作用于超级表时必须跟group by tbname一起使用，当作用嵌套查询外层时内层子查询不能含GROUP BY信息。
+
+7）INTERP的插值结果不受ORDER BY timestamp的影响，ORDER BY timestamp只影响输出结果的排序。
+
+SQL示例：
+
+    1) 单点线性插值
+   ```mysql
+    taos> SELECT INTERP(*) FROM t1 RANGE('2017-7-14 18:40:00'，'2017-7-14 18:40:00') FILL(LINEAR);
+   ```
+    2) 在2017-07-14 18:00:00到2017-07-14 19:00:00间每隔5秒钟进行取值(不插值)
+   ```mysql
+    taos> SELECT INTERP(*) FROM t1 RANGE('2017-7-14 18:00:00'，'2017-7-14 19:00:00') EVERY(5s);
+   ```
+    3) 在2017-07-14 18:00:00到2017-07-14 19:00:00间每隔5秒钟进行线性插值
+   ```mysql
+     taos> SELECT INTERP(*) FROM t1 RANGE('2017-7-14 18:00:00'，'2017-7-14 19:00:00') EVERY(5s) FILL(LINEAR);
+   ```
+   4.在所有时间范围内每隔5秒钟进行向后插值
+   ```mysql
+     taos> SELECT INTERP(*) FROM t1 EVERY(5s) FILL(NEXT);
+   ```
+   5.根据2017-07-14 17:00:00到2017-07-14 20:00:00间的数据进行从2017-07-14 18:00:00到2017-07-14 19:00:00间每隔5秒钟进行线性插值
+   ```mysql
+     taos> SELECT INTERP(*) FROM t1 where ts >= '2017-07-14 17:00:00' and ts <= '2017-07-14 20:00:00' RANGE('2017-7-14 18:00:00'，'2017-7-14 19:00:00') EVERY(5s) FILL(LINEAR);
+   ```
+    
+
+- **INTERP  [2.3.1之前的版本]** 
     
     ```mysql
     SELECT INTERP(field_name) FROM { tb_name | stb_name } WHERE ts='timestamp' [FILL ({ VALUE | PREV | NULL | LINEAR | NEXT})];

documentation20/cn/13.faq/docs.md

-# 常见问题
-
-## 0. 怎么报告问题？
+# 常见问题及反馈
 
+## 问题反馈
 如果 FAQ 中的信息不能够帮到您，需要 TDengine 技术团队的技术支持与协助，请将以下两个目录中内容打包：
 1. /var/log/taos （如果没有修改过默认路径）
 2. /etc/taos
@@ -14,7 +13,9 @@
 ```
 但系统正常运行时，请一定将debugFlag设置为131，否则会产生大量的日志信息，降低系统效率。
 
-## 1. TDengine2.0之前的版本升级到2.0及以上的版本应该注意什么？☆☆☆
+## 常见问题列表
+
+**1. TDengine2.0之前的版本升级到2.0及以上的版本应该注意什么？☆☆☆**
 
 2.0版在之前版本的基础上，进行了完全的重构，配置文件和数据文件是不兼容的。在升级之前务必进行如下操作：
 
@@ -24,19 +25,19 @@
 4. 安装最新稳定版本的 TDengine
 5. 如果需要迁移数据或者数据文件损坏，请联系涛思数据官方技术支持团队，进行协助解决
 
-## 2. Windows平台下JDBCDriver找不到动态链接库，怎么办？
+**2. Windows平台下JDBCDriver找不到动态链接库，怎么办？**
 
 请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/950.html)。
 
-## 3. 创建数据表时提示more dnodes are needed
+**3. 创建数据表时提示more dnodes are needed**
 
 请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/965.html)。
 
-## 4. 如何让TDengine crash时生成core文件？
+**4. 如何让TDengine crash时生成core文件？** 
 
 请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/06/974.html)。
 
-## 5. 遇到错误“Unable to establish connection”, 我怎么办？
+**5. 遇到错误“Unable to establish connection”, 我怎么办？**
 
 客户端遇到连接故障，请按照下面的步骤进行检查：
 
@@ -70,7 +71,7 @@
 
 10. 也可以使用taos程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅（包括TCP和UDP）：[TDengine 内嵌网络检测工具使用指南](https://www.taosdata.com/blog/2020/09/08/1816.html)。
 
-## 6. 遇到错误“Unexpected generic error in RPC”或者“Unable to resolve FQDN”，我怎么办？
+**6. 遇到错误“Unexpected generic error in RPC”或者“Unable to resolve FQDN”，我怎么办？**
 
 产生这个错误，是由于客户端或数据节点无法解析FQDN(Fully Qualified Domain Name)导致。对于TAOS Shell或客户端应用，请做如下检查：
 
@@ -79,16 +80,17 @@
 3. 如果网络没有配置DNS server，请检查客户端所在机器的hosts文件，查看该FQDN是否配置，并是否有正确的IP地址
 4. 如果网络配置OK，从客户端所在机器，你需要能Ping该连接的FQDN，否则客户端是无法连接服务器的
 
-## 7. 虽然语法正确，为什么我还是得到 "Invalid SQL" 错误
+**7. 虽然语法正确，为什么我还是得到 "Invalid SQL" 错误**
 
 如果你确认语法正确，2.0之前版本，请检查SQL语句长度是否超过64K。如果超过，也会返回这个错误。
 
-## 8. 是否支持validation queries？
+**8. 是否支持validation queries？**
 
 TDengine还没有一组专用的validation queries。然而建议你使用系统监测的数据库”log"来做。
 
 <a class="anchor" id="update"></a>
-## 9. 我可以删除或更新一条记录吗？
+
+**9. 我可以删除或更新一条记录吗？**
 
 TDengine 目前尚不支持删除功能，未来根据用户需求可能会支持。
 
@@ -98,15 +100,15 @@ TDengine 目前尚不支持删除功能，未来根据用户需求可能会支
 
 此外，从 2.1.7.0 版本开始，支持将 UPDATE 参数设为 2，表示“支持部分列更新”。也即，当 UPDATE 设为 1 时，如果更新一个数据行，其中某些列没有提供取值，那么这些列会被设为 NULL；而当 UPDATE 设为 2 时，如果更新一个数据行，其中某些列没有提供取值，那么这些列会保持原有数据行中的对应值。
 
-## 10. 我怎么创建超过1024列的表？
+**10. 我怎么创建超过1024列的表？**
 
 使用 2.0 及其以上版本，默认支持 1024 列；2.0 之前的版本，TDengine 最大允许创建 250 列的表。但是如果确实超过限值，建议按照数据特性，逻辑地将这个宽表分解成几个小表。（从 2.1.7.0 版本开始，表的最大列数增加到了 4096 列。）
 
-## 11. 最有效的写入数据的方法是什么？
+**11. 最有效的写入数据的方法是什么？**
 
 批量插入。每条写入语句可以一张表同时插入多条记录，也可以同时插入多张表的多条记录。
 
-## 12. Windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
+**12. Windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？** 
 
 Windows下插入nchar类的数据中如果有中文，请先确认系统的地区设置成了中国（在Control Panel里可以设置），这时cmd中的`taos`客户端应该已经可以正常工作了；如果是在IDE里开发Java应用，比如Eclipse， Intellij，请确认IDE里的文件编码为GBK（这是Java默认的编码类型），然后在生成Connection时，初始化客户端的配置，具体语句如下：
 ```JAVA
@@ -116,7 +118,7 @@ properties.setProperty(TSDBDriver.LOCALE_KEY, "UTF-8");
 Connection = DriverManager.getConnection(url, properties);
 ```
 
-## 13.JDBC报错： the excuted SQL is not a DML or a DDL？
+**13.JDBC报错： the excuted SQL is not a DML or a DDL？** 
 
 请更新至最新的JDBC驱动
 ```xml
@@ -127,15 +129,15 @@ Connection = DriverManager.getConnection(url, properties);
 </dependency>
 ```
 
-## 14. taos connect failed, reason&#58; invalid timestamp
+**14. taos connect failed, reason&#58; invalid timestamp**
 
 常见原因是服务器和客户端时间没有校准，可以通过和时间服务器同步的方式（Linux 下使用 ntpdate 命令，Windows 在系统时间设置中选择自动同步）校准。
 
-## 15. 表名显示不全
+**15. 表名显示不全**
 
 由于 taos shell 在终端中显示宽度有限，有可能比较长的表名显示不全，如果按照显示的不全的表名进行相关操作会发生 Table does not exist 错误。解决方法可以是通过修改 taos.cfg 文件中的设置项 maxBinaryDisplayWidth， 或者直接输入命令 set max_binary_display_width 100。或者在命令结尾使用 \G 参数来调整结果的显示方式。
 
-## 16. 如何进行数据迁移？
+**16. 如何进行数据迁移？**
 
 TDengine是根据hostname唯一标志一台机器的，在数据文件从机器A移动机器B时，注意如下两件事：
 
@@ -143,7 +145,7 @@ TDengine是根据hostname唯一标志一台机器的，在数据文件从机器A
 - 2.0.7.0 及以后的版本，到/var/lib/taos/dnode下，修复dnodeEps.json的dnodeId对应的FQDN，重启。确保机器内所有机器的此文件是完全相同的。
 - 1.x 和 2.x 版本的存储结构不兼容，需要使用迁移工具或者自己开发应用导出导入数据。
 
-## 17. 如何在命令行程序 taos 中临时调整日志级别
+**17. 如何在命令行程序 taos 中临时调整日志级别**
 
 为了调试方便，从 2.0.16 版本开始，命令行程序 taos 新增了与日志记录相关的两条指令：
 
@@ -162,7 +164,8 @@ ALTER LOCAL RESETLOG;
 其含义是，清空本机所有由客户端生成的日志文件。
 
 <a class="anchor" id="timezone"></a>
-## 18. 时间戳的时区信息是怎样处理的？
+
+**18. 时间戳的时区信息是怎样处理的？**
 
 TDengine 中时间戳的时区总是由客户端进行处理，而与服务端无关。具体来说，客户端会对 SQL 语句中的时间戳进行时区转换，转为 UTC 时区（即 Unix 时间戳——Unix Timestamp）再交由服务端进行写入和查询；在读取数据时，服务端也是采用 UTC 时区提供原始数据，客户端收到后再根据本地设置，把时间戳转换为本地系统所要求的时区进行显示。
 
@@ -173,7 +176,8 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 4. 在书写 SQL 语句时，也可以直接使用 Unix 时间戳（例如 `1554984068000`）或带有时区的时间戳字符串，也即以 RFC 3339 格式（例如 `2013-04-12T15:52:01.123+08:00`）或 ISO-8601 格式（例如 `2013-04-12T15:52:01.123+0800`）来书写时间戳，此时这些时间戳的取值将不再受其他时区设置的影响。
 
 <a class="anchor" id="port"></a>
-## 19. TDengine 都会用到哪些网络端口？
+
+**19. TDengine 都会用到哪些网络端口？**
 
 在 TDengine 2.0 版本中，会用到以下这些网络端口（以默认端口 6030 为前提进行说明，如果修改了配置文件中的设置，那么这里列举的端口都会出现变化），管理员可以参考这里的信息调整防火墙设置：
 
@@ -191,7 +195,7 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 | UDP | 6030-6034 | 客户端与服务端之间通讯。            | 随 serverPort 端口变化。        |
 | UDP | 6035-6039 | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
 
-## 20. go 语言编写组件编译失败怎样解决？
+**20. go 语言编写组件编译失败怎样解决？**
 
 新版本 TDengine 2.3.0.0 包含一个使用 go 语言开发的 taosAdapter 组件，取代之前内置的 httpd ，提供包含原  httpd 功能以及支持多种其他软件（Prometheus、Telegraf、collectd、StatsD等）的数据接入功能。
 使用最新 develop 分支代码编译需要先 `git submodule update --init --recursive` 下载 taosAdapter 仓库代码后再编译。
@@ -205,3 +209,5 @@ go env -w GOPROXY=https://goproxy.cn,direct
 
 如果希望继续使用之前的内置 httpd，可以关闭 taosAdapter 编译，使用 
 `cmake .. -DBUILD_HTTP=true` 使用原来内置的 httpd。
+
+

packaging/release.sh

@@ -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

src/client/src/tscParseInsert.c

@@ -360,7 +360,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
         return tscInvalidOperationMsg(msg, "json tag length too long", pToken->z);
       }
       if (pToken->type == TK_NULL) {
-        *(int8_t *)payload = TSDB_DATA_TINYINT_NULL;
+        *(int8_t *)payload = TSDB_DATA_JSON_PLACEHOLDER;
       } else if (pToken->type != TK_STRING){
         tscInvalidOperationMsg(msg, "invalid json data", pToken->z);
       } else{
@@ -1063,7 +1063,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
         sToken.n -= 2;
       }
 
-      char tagVal[TSDB_MAX_TAGS_LEN];
+      char tagVal[TSDB_MAX_TAGS_LEN] = {0};
       code = tsParseOneColumn(pSchema, &sToken, tagVal, pInsertParam->msg, &sql, false, tinfo.precision);
       if (code != TSDB_CODE_SUCCESS) {
         tdDestroyKVRowBuilder(&kvRowBuilder);

src/client/src/tscParseLineProtocol.c

@@ -1060,8 +1060,8 @@ static int32_t insertChildTablePointsBatch(TAOS* taos, char* cTableName, char* s
 
   tscDebug("SML:0x%"PRIx64" insert child table table %s of super table %s : %s", info->id, cTableName, sTableName, sql);
 
+  size_t maxBatchSize = TSDB_MAX_WAL_SIZE/rowSize * 2 / 3;
   size_t rows = taosArrayGetSize(rowsBind);
-  size_t maxBatchSize = TSDB_MAX_WAL_SIZE/rowSize * 4 / 5;
   size_t batchSize = MIN(maxBatchSize, rows);
   tscDebug("SML:0x%"PRIx64" insert rows into child table %s. num of rows: %zu, batch size: %zu",
            info->id, cTableName, rows, batchSize);

src/client/src/tscSQLParser.c

@@ -6871,7 +6871,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
     SKVRowBuilder kvRowBuilder = {0};
     if (pTagsSchema->type == TSDB_DATA_TYPE_JSON) {
-      if (pItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
+      if (pItem->pVar.nType != TSDB_DATA_TYPE_BINARY && pItem->pVar.nType != TSDB_DATA_TYPE_NULL) {
         tscError("json type error, should be string");
         return invalidOperationMsg(pMsg, msg25);
       }
@@ -8714,7 +8714,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
       tVariantListItem* pItem = taosArrayGet(pValList, 0);
-      if(pItem->pVar.nType != TSDB_DATA_TYPE_BINARY){
+      if(pItem->pVar.nType != TSDB_DATA_TYPE_BINARY && pItem->pVar.nType != TSDB_DATA_TYPE_NULL){
         tscError("json type error, should be string");
         tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
@@ -8724,6 +8724,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
         tdDestroyKVRowBuilder(&kvRowBuilder);
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
+
       ret = parseJsontoTagData(pItem->pVar.pz, &kvRowBuilder, tscGetErrorMsgPayload(pCmd), pTagSchema[0].colId);
       if (ret != TSDB_CODE_SUCCESS) {
         tdDestroyKVRowBuilder(&kvRowBuilder);

src/client/src/tscServer.c

@@ -3124,11 +3124,12 @@ int tscRenewTableMeta(SSqlObj *pSql) {
 
   pSql->rootObj->retryReason = pSql->retryReason;
 
-  SSqlObj *tmpSql = pSql->rootObj;
-  tscFreeSubobj(pSql->rootObj);
-  tfree(tmpSql->pSubs);
+  SSqlObj *rootSql = pSql->rootObj;
+  tscFreeSubobj(rootSql);
+  tfree(rootSql->pSubs);
+  tscResetSqlCmd(&rootSql->cmd, true, rootSql->self);
 
-  code = getMultiTableMetaFromMnode(tmpSql, pNameList, vgroupList, NULL, tscTableMetaCallBack, true);
+  code = getMultiTableMetaFromMnode(rootSql, pNameList, vgroupList, NULL, tscTableMetaCallBack, true);
   taosArrayDestroyEx(&pNameList, freeElem);
   taosArrayDestroyEx(&vgroupList, freeElem);
 

src/client/src/tscUtil.c

@@ -5459,7 +5459,7 @@ int parseJsontoTagData(char* json, SKVRowBuilder* kvRowBuilder, char* errMsg, in
   varDataSetLen(nullTypeVal + CHAR_BYTES, INT_BYTES);
   *(uint32_t*)(varDataVal(nullTypeKey)) = jsonNULL;
   tdAddColToKVRow(kvRowBuilder, jsonIndex++, TSDB_DATA_TYPE_NCHAR, nullTypeKey, false);   // add json null type
-  if (strtrim(json) == 0 || strcasecmp(json, "null") == 0){
+  if (!json || strtrim(json) == 0 || strcasecmp(json, "null") == 0){
     *(uint32_t*)(varDataVal(nullTypeVal + CHAR_BYTES)) = jsonNULL;
     tdAddColToKVRow(kvRowBuilder, jsonIndex++, TSDB_DATA_TYPE_NCHAR, nullTypeVal, true);   // add json null value
     return TSDB_CODE_SUCCESS;

src/common/src/tvariant.c

@@ -953,7 +953,7 @@ int32_t tVariantDumpEx(tVariant *pVariant, char *payload, int16_t type, bool inc
       break;
     }
     case TSDB_DATA_TYPE_JSON:{
-      if (pVariant->nType == TSDB_DATA_TYPE_BINARY){
+      if (pVariant->nType == TSDB_DATA_TYPE_BINARY || pVariant->nType == TSDB_DATA_TYPE_NULL){
         *((int8_t *)payload) = TSDB_DATA_JSON_PLACEHOLDER;
       } else if (pVariant->nType == TSDB_DATA_TYPE_JSON){   // select * from stable, set tag type to json，from setTagValue/tag_project_function
         memcpy(payload, pVariant->pz, pVariant->nLen);

src/connector/C#/src/TDengineDriver/TaosBind.cs

 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 
 namespace TDengineDriver
@@ -249,7 +250,8 @@ namespace TDengineDriver
             TAOS_BIND bind = new TAOS_BIND();
             IntPtr umanageBinary = Marshal.StringToHGlobalAnsi(val);
 
-            int leng = val.Length;
+            var strToBytes = System.Text.Encoding.Default.GetBytes(val);
+            int leng = strToBytes.Length;
             IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong));
             Marshal.WriteInt64(lenPtr, leng);
 
@@ -264,9 +266,11 @@ namespace TDengineDriver
         public static TAOS_BIND BindNchar(String val)
         {
             TAOS_BIND bind = new TAOS_BIND();
+            var strToBytes = System.Text.Encoding.Default.GetBytes(val);
             IntPtr umanageNchar = (IntPtr)Marshal.StringToHGlobalAnsi(val);
 
-            int leng = val.Length;
+
+            int leng = strToBytes.Length;
             IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong));
             Marshal.WriteInt64(lenPtr, leng);
 

src/connector/C#/src/TDengineDriver/TaosMultiBind.cs

@@ -449,28 +449,27 @@ namespace TDengineDriver
             for (int i = 0; i < elementCount; i++)
             {
                 int itemLength = 0;
+                byte[] decodeByte = GetStringEncodeByte(arr[i]);
+                itemLength = decodeByte.Length;
                 // if element if not null and element length is less then typeSize
                 // fill the memory with default char.Since arr element memory need align.
-                if (!String.IsNullOrEmpty(arr[i]) && typeSize <= arr[i].Length)
+                if (!String.IsNullOrEmpty(arr[i]) && typeSize == itemLength)
                 {
-                    itemLength = arr[i].Length;
                     arrStrBuilder.Append(arr[i]);
                 }
-                else if (!String.IsNullOrEmpty(arr[i]) && typeSize > arr[i].Length)
+                else if (!String.IsNullOrEmpty(arr[i]) && typeSize > itemLength)
                 {
-                    itemLength = arr[i].Length;
                     arrStrBuilder.Append(arr[i]);
-                    arrStrBuilder.Append(AlignCharArr(typeSize - arr[i].Length));
+                    arrStrBuilder.Append(AlignCharArr(typeSize - itemLength));
                 }
                 else
                 {
                     // if is null value,fill the memory with default values.
-                    itemLength = 0;
                     arrStrBuilder.Append(AlignCharArr(typeSize));
                 }
 
                 //set TAOS_MULTI_BIND.length
-                Marshal.WriteInt32(lengthArr, intSize * i, itemLength);
+                Marshal.WriteInt32(lengthArr, intSize * i, typeSize);
                 //set TAOS_MULTI_BIND.is_null 
                 Marshal.WriteByte(nullArr, byteSize * i, Convert.ToByte(String.IsNullOrEmpty(arr[i]) ? 1 : 0));
             }
@@ -505,28 +504,27 @@ namespace TDengineDriver
             for (int i = 0; i < elementCount; i++)
             {
                 int itemLength = 0;
+                byte[] decodeByte = GetStringEncodeByte(arr[i]);
+                itemLength = decodeByte.Length;
                 // if element if not null and element length is less then typeSize
                 // fill the memory with default char.Since arr element memory need align.
-                if (!String.IsNullOrEmpty(arr[i]) && typeSize <= arr[i].Length)
+                if (!String.IsNullOrEmpty(arr[i]) && typeSize == itemLength)
                 {
-                    itemLength = arr[i].Length;
                     arrStrBuilder.Append(arr[i]);
                 }
-                else if (!String.IsNullOrEmpty(arr[i]) && typeSize > arr[i].Length)
+                else if (!String.IsNullOrEmpty(arr[i]) && typeSize > itemLength)
                 {
-                    itemLength = arr[i].Length;
                     arrStrBuilder.Append(arr[i]);
-                    arrStrBuilder.Append(AlignCharArr(typeSize - arr[i].Length));
+                    arrStrBuilder.Append(AlignCharArr(typeSize - itemLength));
                 }
                 else
                 {
                     // if is null value,fill the memory with default values.
-                    itemLength = 0;
                     arrStrBuilder.Append(AlignCharArr(typeSize));
                 }
 
                 //set TAOS_MULTI_BIND.length
-                Marshal.WriteInt32(lengthArr, intSize * i, itemLength);
+                Marshal.WriteInt32(lengthArr, intSize * i, typeSize);
                 //set TAOS_MULTI_BIND.is_null 
                 Marshal.WriteByte(nullArr, byteSize * i, Convert.ToByte(String.IsNullOrEmpty(arr[i]) ? 1 : 0));
             }
@@ -604,13 +602,28 @@ namespace TDengineDriver
             int max = 0;
             for (int i = 0; i < strArr.Length; i++)
             {
-                if (!String.IsNullOrEmpty(strArr[i]) && max < strArr[i].Length)
+                int tmpLength = GetStringEncodeByte(strArr[i]).Length;
+                if (!String.IsNullOrEmpty(strArr[i]) && max < tmpLength)
                 {
-                    max = strArr[i].Length;
+                    max = tmpLength;
                 }
             }
             return max;
         }
+
+        private static Byte[] GetStringEncodeByte(string str)
+        {   
+            Byte[] strToBytes = null;
+            if(String.IsNullOrEmpty(str))
+            {
+                strToBytes = System.Text.Encoding.Default.GetBytes(String.Empty);
+            }
+            else
+            {
+                strToBytes = System.Text.Encoding.Default.GetBytes(str);
+            } 
+            return strToBytes;
+        }
     }
 
 }
\ No newline at end of file

src/connector/C#/src/test/Cases/DataSource.cs

@@ -21,7 +21,8 @@ namespace Test.UtilsTools.DataSource
         public static string[] binaryArr = new string[5] { "1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", String.Empty, null, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM", "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890~!@#$%^&*()_+=-`[]{}:,./<>?" };
         public static string[] ncharArr = new string[5] { "1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", null, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM", "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", string.Empty };
 
-
+        public static string[] binaryArrCn = new string[5] { "涛思数据", String.Empty, null, "taosdata涛思数据", "涛思数据TDengine" };
+        public static string[] NcharArrCn = new string[5] { "涛思数据", null, "taosdata涛思数据", "涛思数据TDengine", String.Empty };
         public static TAOS_BIND[] getTags()
         {
             TAOS_BIND[] binds = new TAOS_BIND[13];
@@ -40,6 +41,47 @@ namespace Test.UtilsTools.DataSource
             binds[12] = TaosBind.BindNchar("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKZXCVBNM`1234567890-=+_)(*&^%$#@!~[];,./<>?:{}");
             return binds;
         }
+
+        public static TAOS_BIND[] getCNTags()
+        {
+            TAOS_BIND[] binds = new TAOS_BIND[13];
+            binds[0] = TaosBind.BindBool(true);
+            binds[1] = TaosBind.BindTinyInt(-2);
+            binds[2] = TaosBind.BindSmallInt(short.MaxValue - 1);
+            binds[3] = TaosBind.BindInt(int.MaxValue - 1);
+            binds[4] = TaosBind.BindBigInt(Int64.MaxValue - 1);
+            binds[5] = TaosBind.BindUTinyInt(byte.MaxValue - 1);
+            binds[6] = TaosBind.BindUSmallInt(UInt16.MaxValue - 1);
+            binds[7] = TaosBind.BindUInt(uint.MinValue + 1);
+            binds[8] = TaosBind.BindUBigInt(UInt64.MinValue + 1);
+            binds[9] = TaosBind.BindFloat(11.11F);
+            binds[10] = TaosBind.BindDouble(22.22D);
+            binds[11] = TaosBind.BindBinary("TDengine涛思数据");
+            binds[12] = TaosBind.BindNchar("涛思");
+            return binds;
+        }
+
+        public static TAOS_BIND[] getNtableCNRow()
+        {
+            TAOS_BIND[] binds = new TAOS_BIND[15];
+            binds[0] = TaosBind.BindTimestamp(1637064040000);
+            binds[1] = TaosBind.BindTinyInt(-2);
+            binds[2] = TaosBind.BindSmallInt(short.MaxValue);
+            binds[3] = TaosBind.BindInt(int.MaxValue);
+            binds[4] = TaosBind.BindBigInt(Int64.MaxValue);
+            binds[5] = TaosBind.BindUTinyInt(byte.MaxValue - 1);
+            binds[6] = TaosBind.BindUSmallInt(UInt16.MaxValue - 1);
+            binds[7] = TaosBind.BindUInt(uint.MinValue + 1);
+            binds[8] = TaosBind.BindUBigInt(UInt64.MinValue + 1);
+            binds[9] = TaosBind.BindFloat(11.11F);
+            binds[10] = TaosBind.BindDouble(22.22D);
+            binds[11] = TaosBind.BindBinary("TDengine数据");
+            binds[12] = TaosBind.BindNchar("taosdata涛思数据");
+            binds[13] = TaosBind.BindBool(true);
+            binds[14] = TaosBind.BindNil();
+            return binds;
+        }
+
         public static TAOS_BIND[] getNtableRow()
         {
             TAOS_BIND[] binds = new TAOS_BIND[15];
@@ -60,7 +102,6 @@ namespace Test.UtilsTools.DataSource
             binds[14] = TaosBind.BindNil();
             return binds;
         }
-
         public static TAOS_MULTI_BIND[] GetMultiBindArr()
         {
             TAOS_MULTI_BIND[] mBinds = new TAOS_MULTI_BIND[14];
@@ -80,6 +121,26 @@ namespace Test.UtilsTools.DataSource
             mBinds[13] = TaosMultiBind.MultiBindNchar(ncharArr);
             return mBinds;
         }
+        public static TAOS_MULTI_BIND[] GetMultiBindCNArr()
+        {
+            TAOS_MULTI_BIND[] mBinds = new TAOS_MULTI_BIND[14];
+            mBinds[0] = TaosMultiBind.MultiBindTimestamp(tsArr);
+            mBinds[1] = TaosMultiBind.MultiBindBool(boolArr);
+            mBinds[2] = TaosMultiBind.MultiBindTinyInt(tinyIntArr);
+            mBinds[3] = TaosMultiBind.MultiBindSmallInt(shortArr);
+            mBinds[4] = TaosMultiBind.MultiBindInt(intArr);
+            mBinds[5] = TaosMultiBind.MultiBindBigint(longArr);
+            mBinds[6] = TaosMultiBind.MultiBindFloat(floatArr);
+            mBinds[7] = TaosMultiBind.MultiBindDouble(doubleArr);
+            mBinds[8] = TaosMultiBind.MultiBindUTinyInt(uTinyIntArr);
+            mBinds[9] = TaosMultiBind.MultiBindUSmallInt(uShortArr);
+            mBinds[10] = TaosMultiBind.MultiBindUInt(uIntArr);
+            mBinds[11] = TaosMultiBind.MultiBindUBigInt(uLongArr);
+            mBinds[12] = TaosMultiBind.MultiBindBinary(binaryArrCn);
+            mBinds[13] = TaosMultiBind.MultiBindNchar(NcharArrCn);
+            return mBinds;
+        }
+
         public static TAOS_BIND[] GetQueryCondition()
         {
             TAOS_BIND[] queryCondition = new TAOS_BIND[2];

src/connector/C#/src/test/Cases/Program.cs

-using System;
+using System;
 using Test.UtilsTools;
 using Cases;
 
@@ -14,9 +14,9 @@ namespace Cases.EntryPoint
             IntPtr res = IntPtr.Zero;
 
             conn = UtilsTools.TDConnection("127.0.0.1", "root", "taosdata", "", 0);
-            UtilsTools.ExecuteQuery(conn, "drop database if  exists csharp");
-            UtilsTools.ExecuteQuery(conn, "create database if not exists csharp keep 3650");
-            UtilsTools.ExecuteQuery(conn, "use csharp");
+            UtilsTools.ExecuteUpdate(conn, "drop database if  exists csharp");
+            UtilsTools.ExecuteUpdate(conn, "create database if not exists csharp keep 3650");
+            UtilsTools.ExecuteUpdate(conn, "use csharp");
 
             Console.WriteLine("====================StableColumnByColumn===================");
             StableColumnByColumn columnByColumn = new StableColumnByColumn();
@@ -34,6 +34,8 @@ namespace Cases.EntryPoint
             Console.WriteLine("====================NtableSingleLine===================");
             NtableSingleLine ntableSingleLine = new NtableSingleLine();
             ntableSingleLine.Test(conn, "stablesingleline");
+            IntPtr resPtr = UtilsTools.ExecuteQuery(conn, "select * from stablesingleline ");
+            UtilsTools.DisplayRes(resPtr);
 
             Console.WriteLine("====================NtableMutipleLine===================");
             NtableMutipleLine ntableMutipleLine = new NtableMutipleLine();
@@ -50,6 +52,27 @@ namespace Cases.EntryPoint
             FetchFields fetchFields = new FetchFields();
             fetchFields.Test(conn, "fetchfeilds");
 
+           
+            StableStmtCases stableStmtCases = new StableStmtCases();
+            Console.WriteLine("====================stableStmtCases.TestBindSingleLineCn===================");
+            stableStmtCases.TestBindSingleLineCn(conn, "stablestmtcasestestbindsinglelinecn");
+
+            Console.WriteLine("====================stableStmtCases.TestBindColumnCn===================");
+            stableStmtCases.TestBindColumnCn(conn, " stablestmtcasestestbindcolumncn");
+
+            Console.WriteLine("====================stableStmtCases.TestBindMultiLineCn===================");
+            stableStmtCases.TestBindMultiLineCn(conn, "stablestmtcasestestbindmultilinecn");
+
+            NormalTableStmtCases normalTableStmtCases = new NormalTableStmtCases();
+            Console.WriteLine("====================normalTableStmtCases.TestBindSingleLineCn===================");
+            normalTableStmtCases.TestBindSingleLineCn(conn, "normaltablestmtcasestestbindsinglelinecn");
+
+            Console.WriteLine("====================normalTableStmtCases.TestBindColumnCn===================");
+            normalTableStmtCases.TestBindColumnCn(conn, "normaltablestmtcasestestbindcolumncn");
+
+            Console.WriteLine("====================normalTableStmtCases.TestBindMultiLineCn===================");
+            normalTableStmtCases.TestBindMultiLineCn(conn, "normaltablestmtcasestestbindmultilinecn");
+
             Console.WriteLine("===================JsonTagTest====================");
             JsonTagTest jsonTagTest = new JsonTagTest();
             jsonTagTest.Test(conn);

src/connector/C#/src/test/Cases/StmtNormalTable.cs

@@ -7,7 +7,11 @@ namespace Cases
 {
     public class NtableSingleLine
     {
-
+        /// <author>xiaolei</author>
+        /// <Name>NtableSingleLine.Test</Name>
+        /// <describe>Test stmt insert sinle line data into normal table</describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
         public void Test(IntPtr conn, string tableName)
         {
             String createTb = "create table " + tableName + "(ts timestamp,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200),bo bool,nullVal int);";
@@ -23,21 +27,26 @@ namespace Cases
             StmtUtilTools.StmtExecute(stmt);
             StmtUtilTools.StmtClose(stmt);
             DataSource.FreeTaosBind(valuesRow);
+
         }
     }
 
     public class NtableMutipleLine
     {
-        TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
+        /// <author>xiaolei</author>
+        /// <Name>NtableMutipleLine.Test</Name>
+        /// <describe>Test stmt insert multiple rows of data into normal table</describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
         public void Test(IntPtr conn, string tableName)
         {
+            TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
             String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
             String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
-            UtilsTools.ExecuteQuery(conn, createTb);
-            String[] loadList = { tableName };
+            UtilsTools.ExecuteUpdate(conn, createTb);
+
             IntPtr stmt = StmtUtilTools.StmtInit(conn);
-            StmtUtilTools.loadTableInfo(conn, loadList);
             StmtUtilTools.StmtPrepare(stmt, insertSql);
             StmtUtilTools.SetTableName(stmt, tableName);
             StmtUtilTools.BindParamBatch(stmt, mbind);
@@ -48,16 +57,93 @@ namespace Cases
         }
     }
     public class NtableColumnByColumn
+    {
+        /// <author>xiaolei</author>
+        /// <Name>NtableColumnByColumn.Test</Name>
+        /// <describe>Test stmt insert multiple rows of data into normal table by column after column </describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void Test(IntPtr conn, string tableName)
         {
             DataSource data = new DataSource();
             TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
-        public void Test(IntPtr conn, string tableName)
+            String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
+            String insertSql = "insert into ?  values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+
+            UtilsTools.ExecuteUpdate(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13);
+
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+
+            DataSource.FreeTaosMBind(mbind);
+
+        }
+    }
+
+    public class NormalTableStmtCases
+    {
+        /// <author>xiaolei</author>
+        /// <Name>NormalTableStmtCases.TestBindSingleLineCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into normal table by column after column </describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindSingleLineCn(IntPtr conn, string tableName)
+        {
+            String createTb = "create table " + tableName + "(ts timestamp,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200),bo bool,nullVal int);";
+            String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            TAOS_BIND[] valuesRow = DataSource.getNtableCNRow();
+            UtilsTools.ExecuteUpdate(conn, createTb);
+
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindParam(stmt, valuesRow);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(valuesRow);
+
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
+
+        }
+
+        /// <author>xiaolei</author>
+        /// <Name>NormalTableStmtCases.TestBindColumnCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into normal table by column after column </describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindColumnCn(IntPtr conn,string tableName)
         {
+            DataSource data = new DataSource();
+            TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr();
             String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
             String insertSql = "insert into ?  values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 
-            UtilsTools.ExecuteQuery(conn, createTb);
+            UtilsTools.ExecuteUpdate(conn, createTb);
             IntPtr stmt = StmtUtilTools.StmtInit(conn);
 
             StmtUtilTools.StmtPrepare(stmt, insertSql);
@@ -84,6 +170,36 @@ namespace Cases
 
             DataSource.FreeTaosMBind(mbind);
 
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
+        }
+        /// <author>xiaolei</author>
+        /// <Name>NormalTableStmtCases.TestBindMultiLineCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into normal table by column after column </describe>
+        /// <filename>StmtNormalTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindMultiLineCn(IntPtr conn, string tableName)
+        {
+            TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr();
+            String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
+            String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            UtilsTools.ExecuteUpdate(conn, createTb);
+
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindParamBatch(stmt, mbind);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+            
+            DataSource.FreeTaosMBind(mbind);
+
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
         }
     }
 }
\ No newline at end of file

src/connector/C#/src/test/Cases/StmtStable.cs

@@ -15,10 +15,8 @@ namespace Cases
             String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
             String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
-            UtilsTools.ExecuteQuery(conn, createTb);
-            String[] loadList = { tableName };
+            UtilsTools.ExecuteUpdate(conn, createTb);
             IntPtr stmt = StmtUtilTools.StmtInit(conn);
-            StmtUtilTools.loadTableInfo(conn, loadList);
 
             StmtUtilTools.StmtPrepare(stmt, insertSql);
             StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
@@ -43,12 +41,89 @@ namespace Cases
             String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 
-            UtilsTools.ExecuteQuery(conn, createTb);
+            UtilsTools.ExecuteUpdate(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+
+            StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+
+            DataSource.FreeTaosBind(tags);
+            DataSource.FreeTaosMBind(mbind);
+
+        }
+    }
+
+    public class StableStmtCases
+    {
+        /// <author>xiaolei</author>
+        /// <Name>StableStmtCases.TestBindSingleLineCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into stable by column after column </describe>
+        /// <filename>StmtSTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindSingleLineCn(IntPtr conn, string tableName)
+        {
+            TAOS_BIND[] tags = DataSource.getCNTags();
+            TAOS_BIND[] binds = DataSource.getNtableCNRow();
+            String createTb = "create stable " + tableName + " (ts timestamp,v1 tinyint,v2 smallint,v4 int,v8 bigint,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,f4 float,f8 double,bin binary(200),blob nchar(200),b bool,nilcol int)tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
+            String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            UtilsTools.ExecuteUpdate(conn, createTb);
             IntPtr stmt = StmtUtilTools.StmtInit(conn);
 
             StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+            StmtUtilTools.BindParam(stmt, binds);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(tags);
+            DataSource.FreeTaosBind(binds);
 
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
+
+        }
+
+        /// <author>xiaolei</author>
+        /// <Name>StableStmtCases.TestBindColumnCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into stable by column after column </describe>
+        /// <filename>StmtSTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindColumnCn(IntPtr conn, string tableName)
+        {
+            DataSource data = new DataSource();
+            TAOS_BIND[] tags = DataSource.getCNTags();
+            TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr();
+
+            String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
+            String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+
+            UtilsTools.ExecuteUpdate(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
             StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0);
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1);
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2);
@@ -63,6 +138,7 @@ namespace Cases
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11);
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12);
             StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13);
+
             StmtUtilTools.AddBatch(stmt);
             StmtUtilTools.StmtExecute(stmt);
             StmtUtilTools.StmtClose(stmt);
@@ -70,7 +146,43 @@ namespace Cases
             DataSource.FreeTaosBind(tags);
             DataSource.FreeTaosMBind(mbind);
 
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
+
+
         }
+
+        /// <author>xiaolei</author>
+        /// <Name>StableStmtCases.TestBindMultiLineCn</Name>
+        /// <describe>Test stmt insert single line of chinese character into stable by column after column </describe>
+        /// <filename>StmtSTable.cs</filename>
+        /// <result>pass or failed </result>  
+        public void TestBindMultiLineCn(IntPtr conn, string tableName)
+        {
+            TAOS_BIND[] tags = DataSource.getCNTags();
+            TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr();
+
+            String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
+            String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            UtilsTools.ExecuteUpdate(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+            StmtUtilTools.BindParamBatch(stmt, mbind);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(tags);
+            DataSource.FreeTaosMBind(mbind);
+
+            string querySql = "select * from " + tableName;
+            IntPtr res = UtilsTools.ExecuteQuery(conn, querySql);
+            UtilsTools.DisplayRes(res);
         }
 
+    }
 }
\ No newline at end of file

src/connector/C#/src/test/Cases/Utils.cs

@@ -8,7 +8,7 @@ namespace Test.UtilsTools
     public class UtilsTools
     {
 
-        static string configDir = "C:/TDengine/cfg";
+        static string configDir = "/etc/taos";//"C:/TDengine/cfg";
 
         public static IntPtr TDConnection(string ip, string user, string password, string db, short port)
         {
@@ -60,6 +60,28 @@ namespace Test.UtilsTools
             return res;
         }
 
+        public static void ExecuteUpdate(IntPtr conn, String sql)
+        {
+            IntPtr res = TDengine.Query(conn, sql);
+            if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+            {
+                Console.Write(sql.ToString() + " failure, ");
+                if (res != IntPtr.Zero)
+                {
+                    Console.Write("reason: " + TDengine.Error(res));
+
+                }
+                Console.WriteLine("");
+                ExitProgram();
+            }
+            else
+            {
+                Console.WriteLine(sql.ToString() + " success");
+
+            }
+            TDengine.FreeResult(res);
+        }
+
         public static void DisplayRes(IntPtr res)
         {
             long queryRows = 0;

src/connector/C#/src/test/XUnitTest/TestTaosBind.cs

@@ -652,8 +652,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 8;
             String buffer = "qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-=";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-=");
             int BindLengPtr = Marshal.ReadInt32(bind.length);
@@ -674,8 +674,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 8;
             String buffer = "一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./");
             int BindLengPtr = Marshal.ReadInt32(bind.length);
@@ -696,8 +696,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 8;
             String buffer = "一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM");
             int BindLengPtr = Marshal.ReadInt32(bind.length);
@@ -718,8 +718,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 10;
             String buffer = "qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-=";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-=");
             int BindLengPtr = Marshal.ReadInt32(bind.length);
@@ -739,8 +739,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 10;
             String buffer = "一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./");
             int BindLengPtr = Marshal.ReadInt32(bind.length);
@@ -760,8 +760,8 @@ namespace TDengineDriver.Test
         {
             int bufferType = 10;
             String buffer = "一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
-            int bufferLength = buffer.Length;
-            int length = buffer.Length;
+            int bufferLength = System.Text.Encoding.Default.GetBytes(buffer).Length;
+            int length = System.Text.Encoding.Default.GetBytes(buffer).Length;
 
             TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM");
             int BindLengPtr = Marshal.ReadInt32(bind.length);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/confprops/HttpKeepAliveTest.java

 package com.taosdata.jdbc.confprops;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.sql.Connection;
@@ -13,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+@Ignore
 public class HttpKeepAliveTest {
 
     private static final String host = "127.0.0.1";

taos-tools @ 27751ba9

-Subproject commit 14a23779d24a9571cdb7165bea2b0208d54c53ad
+Subproject commit 27751ba9ca17407425fb50a52cd68295794dedc3

src/plugins/CMakeLists.txt

@@ -8,6 +8,8 @@ IF (TD_BUILD_HTTP)
   MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
   MESSAGE("")
   ADD_SUBDIRECTORY(http)
+ELSEIF(TD_BUILD_TAOSA_INTERNAL)
+  MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
 ELSE ()
   MESSAGE("")
   MESSAGE("${Green} use taosadapter as httpd ${ColourReset}")

taosadapter @ 273b5219

-Subproject commit 11d1e02255edfeeaa8d5b1f45abfa9637332ce65
+Subproject commit 273b5219f8bcc604e43beebc6f1f95abed85170a

tests/develop-test/0-others/json_tag.py

@@ -22,9 +22,9 @@ import json
 class TDTestCase:
     def caseDescription(self):
         '''
-        Json tag test case, include create table with json tag,
-        select json tag and query with json tag in where condition,
-        besides, include json tag in group by/order by/join/subquery.
+        Json tag test case, include create table with json tag, select json tag and query with json tag in where condition, besides, include json tag in group by/order by/join/subquery.
+        case1: [TD-12452] fix error if json tag is NULL
+        case2: [TD-12389] describe child table, tag length error if the tag is json tag
         '''
         return
 
@@ -515,6 +515,23 @@ class TDTestCase:
         tdSql.query("select jtag->'tag3' from jsons1_16")
         tdSql.checkData(0, 0, '-2.111000000')
 
+        # test TD-12452
+        tdSql.execute("ALTER TABLE jsons1_1 SET TAG jtag=NULL")
+        tdSql.query("select jtag from jsons1_1")
+        tdSql.checkData(0, 0, None)
+        tdSql.execute("CREATE TABLE if not exists jsons1_20 using jsons1 tags(NULL)")
+        tdSql.query("select jtag from jsons1_20")
+        tdSql.checkData(0, 0, None)
+        tdSql.execute("insert into jsons1_21 using jsons1 tags(NULL) values(1591061628000, 11, false, '你就会','')")
+        tdSql.query("select jtag from jsons1_21")
+        tdSql.checkData(0, 0, None)
+
+        #test TD-12389
+        tdSql.query("describe jsons1")
+        tdSql.checkData(5, 2, 4096)
+        tdSql.query("describe jsons1_1")
+        tdSql.checkData(5, 2, 4096)
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/develop-test/3-connectors/java/test.sh

@@ -14,4 +14,32 @@ stopTaosd
 rm -rf /var/lib/taos/*
 rm -rf /var/log/taos/*
 nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+nohup taosadapter -c /etc/taos/taosadapter.toml > /dev/null 2>&1 &
 sleep 10
+
+cd ../../../../
+WKC=`pwd`
+cd ${WKC}/src/connector/jdbc
+
+mvn clean test > jdbc-out.log 2>&1
+tail -n 20 jdbc-out.log
+
+cases=`grep 'Tests run' jdbc-out.log | awk 'END{print $3}'`
+totalJDBCCases=`echo ${cases/%,}`
+failed=`grep 'Tests run' jdbc-out.log | awk 'END{print $5}'`
+JDBCFailed=`echo ${failed/%,}`
+error=`grep 'Tests run' jdbc-out.log | awk 'END{print $7}'`
+JDBCError=`echo ${error/%,}`
+
+totalJDBCFailed=`expr $JDBCFailed + $JDBCError`
+totalJDBCSuccess=`expr $totalJDBCCases - $totalJDBCFailed`
+
+if [ "$totalJDBCSuccess" -gt "0" ]; then
+  echo -e "\n${GREEN} ### Total $totalJDBCSuccess JDBC case(s) succeed! ### ${NC}"
+fi
+
+if [ "$totalJDBCFailed" -ne "0" ]; then
+  echo -e "\n${RED} ### Total $totalJDBCFailed JDBC case(s) failed! ### ${NC}"
+  exit 8
+fi
+

tests/pytest/insert/openTsdbTelnetLinesInsert.py

@@ -30,7 +30,10 @@ class TDTestCase:
         self._conn = conn 
         self.smlChildTableName_value = tdSql.getVariable("smlChildTableName")[0].upper()
 
-    def createDb(self, name="test", db_update_tag=0):
+    def createDb(self, name="test", db_update_tag=0, protocol=None):
+        if protocol == "telnet-tcp":
+            name = "opentsdb_telnet"
+            
         if db_update_tag == 0:
             tdSql.execute(f"drop database if exists {name}")
             tdSql.execute(f"create database if not exists {name} precision 'us'")
@@ -142,10 +145,13 @@ class TDTestCase:
                 type_num_list.append(14)
         return type_num_list
 
-    def inputHandle(self, input_sql, ts_type):
+    def inputHandle(self, input_sql, ts_type, protocol=None):
         input_sql_split_list = input_sql.split(" ")
+        if protocol == "telnet-tcp":
+            input_sql_split_list.pop(0)
         stb_name = input_sql_split_list[0]
         stb_tag_list = input_sql_split_list[3:]
+        stb_tag_list[-1] = stb_tag_list[-1].strip()
         stb_col_value = input_sql_split_list[2]
         ts_value = self.timeTrans(input_sql_split_list[1], ts_type)
 
@@ -209,7 +215,7 @@ class TDTestCase:
                         t8="L\"ncharTagValue\"", ts="1626006833641",
                         id_noexist_tag=None, id_change_tag=None, id_upper_tag=None, id_mixul_tag=None, id_double_tag=None,
                         t_add_tag=None, t_mul_tag=None, c_multi_tag=None, c_blank_tag=None, t_blank_tag=None, 
-                        chinese_tag=None, multi_field_tag=None, point_trans_tag=None):
+                        chinese_tag=None, multi_field_tag=None, point_trans_tag=None, protocol=None, tcp_keyword_tag=None):
         if stb_name == "":
             stb_name = tdCom.getLongName(len=6, mode="letters")
         if tb_name == "":
@@ -253,6 +259,10 @@ class TDTestCase:
             sql_seq = f'{stb_name} {ts} {value} {id}={tb_name} t0={t0} {value}'
         if point_trans_tag is not None:
             sql_seq = f'.point.trans.test {ts} {value} t0={t0}'
+        if tcp_keyword_tag is not None:
+            sql_seq = f'put {ts} {value} t0={t0}'
+        if protocol == "telnet-tcp":
+            sql_seq = 'put ' + sql_seq + '\n'
         return sql_seq, stb_name
     
     def genMulTagColStr(self, genType, count=1):
@@ -280,13 +290,15 @@ class TDTestCase:
         long_sql = stb_name + ' ' + ts + ' ' + col_str + ' ' + ' ' + tag_str
         return long_sql, stb_name
 
-    def getNoIdTbName(self, stb_name):
+    def getNoIdTbName(self, stb_name, protocol=None):
         query_sql = f"select tbname from {stb_name}"
-        tb_name = self.resHandle(query_sql, True)[0][0]
+        tb_name = self.resHandle(query_sql, True, protocol)[0][0]
         return tb_name
 
-    def resHandle(self, query_sql, query_tag):
+    def resHandle(self, query_sql, query_tag, protocol=None):
         tdSql.execute('reset query cache')
+        if protocol == "telnet-tcp":
+            time.sleep(0.5)
         row_info = tdSql.query(query_sql, query_tag)
         col_info = tdSql.getColNameList(query_sql, query_tag)
         res_row_list = []
@@ -299,14 +311,17 @@ class TDTestCase:
         res_type_list = col_info[1]
         return res_row_list, res_field_list_without_ts, res_type_list
 
-    def resCmp(self, input_sql, stb_name, query_sql="select * from", condition="", ts=None, ts_type=None, id=True, none_check_tag=None, precision=None):
-        expect_list = self.inputHandle(input_sql, ts_type)
+    def resCmp(self, input_sql, stb_name, query_sql="select * from", condition="", ts=None, ts_type=None, id=True, none_check_tag=None, precision=None, protocol=None):
+        expect_list = self.inputHandle(input_sql, ts_type, protocol)
+        if protocol == "telnet-tcp":
+            tdCom.tcpClient(input_sql)
+        else:
             if precision == None:
                 self._conn.schemaless_insert([input_sql], TDSmlProtocolType.TELNET.value, ts_type)
             else:
                 self._conn.schemaless_insert([input_sql], TDSmlProtocolType.TELNET.value, precision)
         query_sql = f"{query_sql} {stb_name} {condition}"
-        res_row_list, res_field_list_without_ts, res_type_list = self.resHandle(query_sql, True)
+        res_row_list, res_field_list_without_ts, res_type_list = self.resHandle(query_sql, True, protocol)
         if ts == 0:
             res_ts = self.dateToTs(res_row_list[0][0])
             current_time = time.time()
@@ -327,16 +342,16 @@ class TDTestCase:
         for i in range(len(res_type_list)):
             tdSql.checkEqual(res_type_list[i], expect_list[2][i])
 
-    def initCheckCase(self):
+    def initCheckCase(self, protocol=None):
         """
             normal tags and cols, one for every elm
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql, stb_name = self.genFullTypeSql()
-        self.resCmp(input_sql, stb_name)
+        input_sql, stb_name = self.genFullTypeSql(protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
 
-    def boolTypeCheckCase(self):
+    def boolTypeCheckCase(self, protocol=None):
         """
             check all normal type
         """
@@ -344,10 +359,10 @@ class TDTestCase:
         tdCom.cleanTb()
         full_type_list = ["f", "F", "false", "False", "t", "T", "true", "True"]
         for t_type in full_type_list:
-            input_sql, stb_name = self.genFullTypeSql(t0=t_type)
-            self.resCmp(input_sql, stb_name)
+            input_sql, stb_name = self.genFullTypeSql(t0=t_type, protocol=protocol)
+            self.resCmp(input_sql, stb_name, protocol=protocol)
         
-    def symbolsCheckCase(self):
+    def symbolsCheckCase(self, protocol=None):
         """
             check symbols = `~!@#$%^&*()_-+={[}]\|:;'\",<.>/? 
         """
@@ -359,10 +374,10 @@ class TDTestCase:
         tdCom.cleanTb()
         binary_symbols = '"abcd`~!@#$%^&*()_-{[}]|:;<.>?lfjal"'
         nchar_symbols = f'L{binary_symbols}'
-        input_sql1, stb_name1 = self.genFullTypeSql(value=binary_symbols, t7=binary_symbols, t8=nchar_symbols)
-        input_sql2, stb_name2 = self.genFullTypeSql(value=nchar_symbols, t7=binary_symbols, t8=nchar_symbols)
-        self.resCmp(input_sql1, stb_name1)
-        self.resCmp(input_sql2, stb_name2)
+        input_sql1, stb_name1 = self.genFullTypeSql(value=binary_symbols, t7=binary_symbols, t8=nchar_symbols, protocol=protocol)
+        input_sql2, stb_name2 = self.genFullTypeSql(value=nchar_symbols, t7=binary_symbols, t8=nchar_symbols, protocol=protocol)
+        self.resCmp(input_sql1, stb_name1, protocol=protocol)
+        self.resCmp(input_sql2, stb_name2, protocol=protocol)
 
     def tsCheckCase(self):
         """
@@ -406,38 +421,38 @@ class TDTestCase:
             except SchemalessError as err:
                 tdSql.checkNotEqual(err.errno, 0)
     
-    def idSeqCheckCase(self):
+    def idSeqCheckCase(self, protocol=None):
         """
             check id.index in tags
             eg: t0=**,id=**,t1=**
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql, stb_name = self.genFullTypeSql(id_change_tag=True)
-        self.resCmp(input_sql, stb_name)
+        input_sql, stb_name = self.genFullTypeSql(id_change_tag=True, protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
     
-    def idLetterCheckCase(self):
+    def idLetterCheckCase(self, protocol=None):
         """
             check id param
             eg: id and ID
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql, stb_name = self.genFullTypeSql(id_upper_tag=True)
-        self.resCmp(input_sql, stb_name)
-        input_sql, stb_name = self.genFullTypeSql(id_mixul_tag=True)
-        self.resCmp(input_sql, stb_name)
-        input_sql, stb_name = self.genFullTypeSql(id_change_tag=True, id_upper_tag=True)
-        self.resCmp(input_sql, stb_name)
+        input_sql, stb_name = self.genFullTypeSql(id_upper_tag=True, protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
+        input_sql, stb_name = self.genFullTypeSql(id_mixul_tag=True, protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
+        input_sql, stb_name = self.genFullTypeSql(id_change_tag=True, id_upper_tag=True, protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
 
-    def noIdCheckCase(self):
+    def noIdCheckCase(self, protocol=None):
         """
             id not exist
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql, stb_name = self.genFullTypeSql(id_noexist_tag=True)
-        self.resCmp(input_sql, stb_name)
+        input_sql, stb_name = self.genFullTypeSql(id_noexist_tag=True, protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
         query_sql = f"select tbname from {stb_name}"
         res_row_list = self.resHandle(query_sql, True)[0]
         if len(res_row_list[0][0]) > 0:
@@ -461,7 +476,7 @@ class TDTestCase:
             except SchemalessError as err:
                 tdSql.checkNotEqual(err.errno, 0)
 
-    def stbTbNameCheckCase(self):
+    def stbTbNameCheckCase(self, protocol=None):
         """
             test illegal id name
             mix "`~!@#$¥%^&*()-+{}|[]、「」【】:;《》<>?"
@@ -470,18 +485,18 @@ class TDTestCase:
         tdCom.cleanTb()
         rstr = list("~!@#$¥%^&*()-+{}|[]、「」【】:;《》<>?")
         for i in rstr:
-            input_sql, stb_name = self.genFullTypeSql(tb_name=f"\"aaa{i}bbb\"")
-            self.resCmp(input_sql, f'`{stb_name}`')
+            input_sql, stb_name = self.genFullTypeSql(tb_name=f"\"aaa{i}bbb\"", protocol=protocol)
+            self.resCmp(input_sql, f'`{stb_name}`', protocol=protocol)
             tdSql.execute(f'drop table if exists `{stb_name}`')
 
-    def idStartWithNumCheckCase(self):
+    def idStartWithNumCheckCase(self, protocol=None):
         """
             id is start with num
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql, stb_name = self.genFullTypeSql(tb_name="1aaabbb")
-        self.resCmp(input_sql, stb_name)
+        input_sql, stb_name = self.genFullTypeSql(tb_name="1aaabbb", protocol=protocol)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
 
     def nowTsCheckCase(self):
         """
@@ -1060,15 +1075,18 @@ class TDTestCase:
             stb_name = input_sql.split(' ')[0]
             self.resCmp(input_sql, stb_name)
 
-    def pointTransCheckCase(self):
+    def pointTransCheckCase(self, protocol=None):
         """
             metric value "." trans to "_"
         """
         tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
         tdCom.cleanTb()
-        input_sql = self.genFullTypeSql(point_trans_tag=True)[0]
+        input_sql = self.genFullTypeSql(point_trans_tag=True, protocol=protocol)[0]
+        if protocol == 'telnet-tcp':
+            stb_name = f'`{input_sql.split(" ")[1]}`'
+        else:
             stb_name = f'`{input_sql.split(" ")[0]}`'
-        self.resCmp(input_sql, stb_name)
+        self.resCmp(input_sql, stb_name, protocol=protocol)
         tdSql.execute("drop table `.point.trans.test`")
 
     def defaultTypeCheckCase(self):
@@ -1105,6 +1123,17 @@ class TDTestCase:
             col_tag_res = tdSql.getColNameList(query_sql)
             tdSql.checkEqual(col_tag_res, ['ts', 'value', '"t$3"', 't!@#$%^&*()_+[];:<>?,9', 't#2', 't%4', 't&6', 't*7', 't^5', 'Tt!0', 'tT@1'])
             tdSql.execute('drop table `rFa$sta`')
+
+    def tcpKeywordsCheckCase(self, protocol="telnet-tcp"):
+        """
+            stb = "put"
+        """
+        tdLog.info(f'{sys._getframe().f_code.co_name}() function is running')
+        tdCom.cleanTb()
+        input_sql = self.genFullTypeSql(tcp_keyword_tag=True, protocol=protocol)[0]
+        stb_name = f'`{input_sql.split(" ")[1]}`'
+        self.resCmp(input_sql, stb_name, protocol=protocol)
+
     def genSqlList(self, count=5, stb_name="", tb_name=""):
         """
             stb --> supertable
@@ -1430,10 +1459,21 @@ class TDTestCase:
 
     def run(self):
         print("running {}".format(__file__))
-        self.createDb()
+        
         try:
-            # self.blankTagInsertCheckCase()
+            self.createDb()
             self.runAll()
+            # self.createDb(protocol="telnet-tcp")
+            # self.initCheckCase('telnet-tcp')
+            # self.boolTypeCheckCase('telnet-tcp')
+            # self.symbolsCheckCase('telnet-tcp')
+            # self.idSeqCheckCase('telnet-tcp')
+            # self.idLetterCheckCase('telnet-tcp')
+            # self.noIdCheckCase('telnet-tcp')
+            # self.stbTbNameCheckCase('telnet-tcp')
+            # self.idStartWithNumCheckCase('telnet-tcp')
+            # self.pointTransCheckCase('telnet-tcp')
+            # self.tcpKeywordsCheckCase()
         except Exception as err:
             print(''.join(traceback.format_exception(None, err, err.__traceback__)))
             raise err

tests/pytest/query/queryGroupTbname.py

@@ -32,7 +32,7 @@ class TDTestCase:
         tb_str = ""
 
         for tbname in tbname_list:
-            globals()[tbname] = tdCom.getLongName(8, "letters_mixed")
+            globals()[tbname] = tdCom.getLongName(8, "letters_mixed").upper()
         tdSql.execute(f'CREATE TABLE {table_name} (ts timestamp, {table_name_sub1} tinyint, \
                      {table_name_sub2} smallint, {table_name_sub3} int, {table_name_sub4} bigint, \
                     {table_name_sub5} float, {table_name_sub6} double, {table_name_sub7} binary(20),\
@@ -44,7 +44,7 @@ class TDTestCase:
 
         for i in range(10):
             for tbname in tbname_list:
-                tdSql.execute(f'insert into {globals()[tbname]} values (now, 1, 2, 3, 4, 1.1, 2.2, "{globals()[tbname]}", "{globals()[tbname]}", True)')
+                tdSql.execute(f'insert into {globals()[tbname]} values (now-{i*i}s, 1, 2, 3, 4, 1.1, 2.2, "{globals()[tbname]}", "{globals()[tbname]}", True)')
         
         for i in range(100):
             tdSql.query(f'select {table_name_sub1},{table_name_sub2},{table_name_sub3},{table_name_sub4},{table_name_sub5},{table_name_sub6},{table_name_sub7},{table_name_sub8},{table_name_sub9} from {table_name} where tbname in ("{table_name_sub1}","{table_name_sub2}","{table_name_sub3}","{table_name_sub4}","{table_name_sub5}","{table_name_sub6}","{table_name_sub7}","{table_name_sub8}","{table_name_sub9}") and ts >= "1980-01-01 00:00:00.000"')

tests/pytest/util/common.py

@@ -17,6 +17,7 @@ from util.sql import tdSql
 from util.dnodes import tdDnodes
 import requests
 import time
+import socket
 class TDCom:
     def init(self, conn, logSql):
         tdSql.init(conn.cursor(), logSql)
@@ -30,6 +31,21 @@ class TDCom:
         telnet_url = "http://127.0.0.1:6041/opentsdb/v1/put/telnet"
         return header, sql_url, sqlt_url, sqlutc_url, influx_url, telnet_url
 
+    def genTcpParam(self):
+        MaxBytes = 1024*1024
+        host ='127.0.0.1'
+        port = 6046
+        return MaxBytes, host, port
+
+    def tcpClient(self, input):
+        MaxBytes = tdCom.genTcpParam()[0]
+        host = tdCom.genTcpParam()[1]
+        port = tdCom.genTcpParam()[2]
+        sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
+        sock.connect((host, port))
+        sock.send(input.encode())
+        sock.close()
+
     def restApiPost(self, sql):
         requests.post(self.preDefine()[1], sql.encode("utf-8"), headers = self.preDefine()[0])
 

tests/system-test/1-insert/stmt_error.py

+# encoding:UTF-8
+from taos import *
+
+from ctypes import *
+from datetime import datetime
+import taos
+
+import taos
+import time
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+class TDTestCase:
+    def __init__(self):
+        self.err_case = 0
+        self.curret_case = 0
+
+    def caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>: [TD-11899] : this is an test case for check stmt error use .
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def conn(self):
+    # type: () -> taos.TaosConnection
+        return connect()
+
+    def test_stmt_insert(self,conn):
+        # type: (TaosConnection) -> None
+
+        dbname = "pytest_taos_stmt"
+        try:
+            conn.execute("drop database if exists %s" % dbname)
+            conn.execute("create database if not exists %s" % dbname)
+            conn.select_db(dbname)
+
+            conn.execute(
+                "create table if not exists log(ts timestamp, bo bool, nil tinyint, ti tinyint, si smallint, ii int,\
+                bi bigint, tu tinyint unsigned, su smallint unsigned, iu int unsigned, bu bigint unsigned, \
+                ff float, dd double, bb binary(100), nn nchar(100), tt timestamp)",
+            )
+            conn.load_table_info("log")
+            
+
+            stmt = conn.statement("insert into log values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+            params = new_bind_params(16)
+            params[0].timestamp(1626861392589, PrecisionEnum.Milliseconds)
+            params[1].bool(True)
+            params[2].null()
+            params[3].tinyint(2)
+            params[4].smallint(3)
+            params[5].int(4)
+            params[6].bigint(5)
+            params[7].tinyint_unsigned(6)
+            params[8].smallint_unsigned(7)
+            params[9].int_unsigned(8)
+            params[10].bigint_unsigned(9)
+            params[11].float(10.1)
+            params[12].double(10.11)
+            params[13].binary("hello")
+            params[14].nchar("stmt")
+            params[15].timestamp(1626861392589, PrecisionEnum.Milliseconds)
+
+            stmt.bind_param(params)
+            stmt.execute()
+
+            result = stmt.use_result()
+            assert result.affected_rows == 1
+            result.close()
+            stmt.close()
+
+            stmt = conn.statement("select * from log")
+            stmt.execute()
+            result = stmt.use_result()
+            row  = result.next()
+            print(row)
+            assert row[2] == None
+            for i in range(3, 11):
+                assert row[i] == i - 1
+            #float == may not work as expected
+            # assert row[10] == c_float(10.1)
+            assert row[12] == 10.11
+            assert row[13] == "hello"
+            assert row[14] == "stmt"
+
+            conn.execute("drop database if exists %s" % dbname)
+            conn.close()
+
+        except Exception as err:
+            conn.execute("drop database if exists %s" % dbname)
+            conn.close()
+            raise err
+
+    def test_stmt_insert_error(self,conn):
+        # type: (TaosConnection) -> None
+
+        dbname = "pytest_taos_stmt_error"
+        try:
+            conn.execute("drop database if exists %s" % dbname)
+            conn.execute("create database if not exists %s" % dbname)
+            conn.select_db(dbname)
+
+            conn.execute(
+                "create table if not exists log(ts timestamp, bo bool, nil tinyint, ti tinyint, si smallint, ii int,\
+                bi bigint, tu tinyint unsigned, su smallint unsigned, iu int unsigned, bu bigint unsigned, \
+                ff float, dd double, bb binary(100), nn nchar(100), tt timestamp , error_data int )",
+            )
+            conn.load_table_info("log")
+            
+
+            stmt = conn.statement("insert into log values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1000)")
+            params = new_bind_params(16)
+            params[0].timestamp(1626861392589, PrecisionEnum.Milliseconds)
+            params[1].bool(True)
+            params[2].null()
+            params[3].tinyint(2)
+            params[4].smallint(3)
+            params[5].int(4)
+            params[6].bigint(5)
+            params[7].tinyint_unsigned(6)
+            params[8].smallint_unsigned(7)
+            params[9].int_unsigned(8)
+            params[10].bigint_unsigned(9)
+            params[11].float(10.1)
+            params[12].double(10.11)
+            params[13].binary("hello")
+            params[14].nchar("stmt")
+            params[15].timestamp(1626861392589, PrecisionEnum.Milliseconds)
+
+            stmt.bind_param(params)
+            stmt.execute()
+
+            result = stmt.use_result()
+            assert result.affected_rows == 1
+            result.close()
+            stmt.close()
+
+            stmt = conn.statement("select * from log")
+            stmt.execute()
+            result = stmt.use_result()
+            row  = result.next()
+            print(row)
+            assert row[2] == None
+            for i in range(3, 11):
+                assert row[i] == i - 1
+            #float == may not work as expected
+            # assert row[10] == c_float(10.1)
+            assert row[12] == 10.11
+            assert row[13] == "hello"
+            assert row[14] == "stmt"
+
+            conn.execute("drop database if exists %s" % dbname)
+            conn.close()
+
+        except Exception as err:
+            conn.execute("drop database if exists %s" % dbname)
+            conn.close()
+            raise err
+    
+    def run(self):
+        
+        self.test_stmt_insert(self.conn())
+        try:
+            self.test_stmt_insert_error(self.conn())
+        except Exception as error :
+            
+            if str(error)=='[0x0200]: invalid operation: only ? allowed in values':
+                tdLog.info('=========stmt error occured  for bind part colum ==============')
+            else:
+                tdLog.exit("expect error not occured")
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/2-query/TD-12344.py → tests/system-test/2-query/TD-12191.py

@@ -14,6 +14,7 @@
 from posixpath import split
 import sys
 import os 
+import psutil
 
 from util.log import *
 from util.cases import *
@@ -25,35 +26,9 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
-        
         self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
         self.num = 10
         
-    def getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root) - len("/build/bin")]
-                    break
-        return buildPath
-
-
-    def caseDescription(self):
-
-        '''
-        case1 <wenzhouwww>: [TD-12344] : 
-            this test case is an test case for unexpectd crash for session function , it will coredump taoshell ;
-            
-        ''' 
-        return 
 
     def getBuildPath(self):
         selfPath = os.path.dirname(os.path.realpath(__file__))
@@ -67,7 +42,7 @@ class TDTestCase:
             if ("taosd" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
                 if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
+                    buildPath = root[:len(root) - len("/build/bin")]
                     break
         return buildPath
 
@@ -82,23 +57,50 @@ class TDTestCase:
         cfgPath = projPath + "/sim/dnode1/cfg  "
         return cfgPath
 
+    def caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>: [TD-12191] : 
+            this test case is an test case for unexpectd error for taosd work error ,it maybe caused by  ;
+        ''' 
+        return 
+   
     def run(self):
         tdSql.prepare()
-        tdSql.execute("create database if not exists testdb keep 36500;")
-        tdSql.execute("use testdb;")
-        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
-        for i in range(self.num):
-            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
-            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
-            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
-            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
-
-        cfg_path = self.getcfgPath()
-        print(cfg_path)
-        tdSql.execute('select elapsed(ts,10s) from testdb.st   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;')  # session not support super table
-        taos_cmd1= "taos  -c %s -s 'select elapsed(ts,10s) from testdb.st   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;' " % (cfg_path)
+        
+        # prepare data for generate draft 
+
+        build_path = self.getBuildPath()+"/build/bin/"
+        taos_cmd1= "%staosBenchmark -f 2-query/td_12191.json " % (build_path)
+        print(taos_cmd1)
+        taos_cmd2 = 'taos -s "create table test_TD11483.elapsed_vol as select elapsed(ts) from test_TD11483.stb interval(1m) sliding(30s)"'
+        taos_cmd3 = 'taos -s "show queries;"'
+        taos_cmd4 = 'taos -s "show streams;"'
+
+        # only taos -s for shell can generate this issue 
         _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8")
+        _ = subprocess.check_output(taos_cmd2, shell=True).decode("utf-8")
+        _ = subprocess.check_output(taos_cmd3, shell=True).decode("utf-8")
+        _ = subprocess.check_output(taos_cmd4, shell=True).decode("utf-8")  
+
+        # check data written done 
+        tdSql.execute("use test_TD11483")
+        tdSql.query("select count(*) from elapsed_vol;")
+        tdSql.checkRows(0)
+
+
+        taosd_pid = int(subprocess.getstatusoutput('ps aux|grep "taosd" |grep -v "grep"|awk \'{print $2}\'')[1])
+        
+        sleep(10)
+        cmd = "top -H -p %d -n 1"%taosd_pid
+        sys_output = subprocess.check_output(cmd, shell=True).decode("utf-8")
+        print(sys_output)
 
+        cmd_insert = "%staosBenchmark -y -n 10 -t 10 -S 10000 > /dev/null 2>&1 & " % (build_path)
+        os.system(cmd_insert)
+        sleep(5)
+        tdSql.query("select count(*) from meters")
+        tdSql.checkData(0,0,10)
 
     def stop(self):
         tdSql.close()

tests/system-test/2-query/TD-12276.py

+###################################################################
+#           Copyright (c) 2020 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+from posixpath import split
+import sys
+import os 
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
+
+    def caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>:[TD-12276] : 
+            this test case is an test case elapsed result about desc order timestamp  .
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.query('select elapsed(ts) from (select csum(value) from tb1 );')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,9900.0)
+        
+        tdSql.query('select elapsed(ts) from (select csum(value) from tb1 order by ts desc );')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,9900.0)
+
+        tdSql.query('select elapsed(ts) from (select diff(value) from tb2 );')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,19600.0)
+
+        tdSql.query('select elapsed(ts) from (select diff(value) from tb2 order by ts desc);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,400.0)
+
+
+        
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/3-connectors/restful/restful_binddbname.py

+# #################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+
+# #################################################################
+
+# -*- coding: utf-8 -*-
+
+# TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations
+
+from distutils.log import error
+import sys
+
+from requests.api import head
+from requests.models import Response
+from util.log import *
+from util.cases import *
+from util.sql import *
+import time, datetime
+import requests, json
+import threading
+import string
+import random
+import re
+ 
+
+null = ''
+true= 'true'
+false = 'false'
+def caseDescription(self):
+    '''
+    case1<jiacy-jcy>:dbname binding
+    case2<jiacy-jcy>:dbname without binding
+
+    '''
+def check_unbind_db(url, data, header):
+     resp = requests.post(url, data, headers = header )
+     resp.encoding='utf-8'
+     resp = eval(resp.text)
+     status = resp['status']
+     #cod = resp['code']
+     sqls = data
+     if status=="error" :#and cod == 401:
+         print(" %s : check pass" %sqls)
+     else:
+         printf("%s error occured , " %sqls)
+         sys.exit(1)
+
+def check_bind_db(url, data, header):
+    resp = requests.post(url, data, headers = header )
+    resp.encoding='utf-8'
+    resp_dict = eval(resp.text)
+    status = resp_dict['status']
+    if status =="succ":
+        print("%s  run success!"%data)
+        # print(resp.text)
+    else :
+        print("%s run failed !"%data)
+        print(resp.text)
+        sys.exit(1)
+        
+class TDTestCase():
+     
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists test')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('drop database if exists test01')
+        tdSql.execute('create database test')
+        tdSql.execute('create database test01')
+
+        header = {'Authorization': 'Basic cm9vdDp0YW9zZGF0YQ=='}
+        url = "http://127.0.0.1:6041/rest/sql"
+
+        
+        # case 1: test with no bind dbname
+        sqls1 = ["show databases;",
+        "use test;", 
+        "show dnodes;",
+        "create database db;",
+        "drop database db;",
+        "select client_version();" ,
+        "ALTER DATABASE test COMP 2;",
+        "show test.tables",
+        "create table test.tb (ts timestamp, id int , data double)",
+        "insert into test.tb values (now , 2, 2.0) ",
+        "select * from test.tb"
+        ]
+        sqls2 = ["show tables;",
+        "show vgroups;",
+        "create table tb (ts timestamp, id int , data double)",
+        "insert into tb values (now , 1, 1.0) ",
+        "select * from tb",
+        "insert into tb values (now , 2, 2.0) ",
+        "select * from tb"
+        ]
+        
+        print("==================="*5)
+        print("                        check unbind db about restful                  ")
+        print("==================="*5)
+        for sql in sqls1:
+            print("===================")
+            check_bind_db(url,sql,header)
+        
+        for sql in sqls2:
+            print("===================")
+            check_unbind_db(url,sql,header)
+
+        tdSql.execute('drop database if exists test01')
+        tdSql.execute('drop database if exists test')
+        tdSql.execute('create database test')
+        tdSql.execute('create database test01')
+
+        #case 2: test with bind dbname
+        sqls3 = ["show databases;",
+        "use test;", 
+        "show tables;",
+        "show dnodes;",
+        "show vgroups;",
+        "create database db;",
+        "drop database db;",
+        "select client_version();" ,
+        "use test",
+        "ALTER DATABASE test COMP 2;",
+        "create table tb (ts timestamp, id int , data double)",
+        "insert into tb values (now , 1, 1.0) ",
+        "select * from tb",
+        "show test.tables",
+        "show tables",
+        "insert into tb values (now , 2, 2.0) ",
+        "create table test.tb1 (ts timestamp, id int , data double)",
+        "insert into test.tb1 values (now , 2, 2.0) ",
+        "select * from tb",
+        "select * from test.tb1"
+        ]
+
+        
+        print("==================="*5)
+        print("                        check bind db about restful                  ")
+        print("==================="*5)
+        url = "http://127.0.0.1:6041/rest/sql/test"
+        for sql in sqls3:
+            print("===================")
+            
+            check_bind_db(url,sql,header)
+        # check data
+        tdSql.query("select * from test.tb")
+        tdSql.checkRows(2)
+
+        os.system('sudo timedatectl set-ntp on')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/fulltest-connector.sh

+
+python3 ./test.py -f 3-connectors/restful/restful_binddbname.py
+
 bash 3-connectors/c#/test.sh 
 bash 3-connectors/go/test.sh
 bash 3-connectors/java/test.sh
@@ -5,3 +8,4 @@ bash 3-connectors/nodejs/test.sh
 bash 3-connectors/python/test.sh
 bash 3-connectors/restful/test.sh
 bash 3-connectors/rust/test.sh 
+

tests/system-test/fulltest-insert.sh

 python3 test.py -f 1-insert/TD-11970.py
+python3 test.py -f 1-insert/stmt_error.py  
+

tests/system-test/fulltest-query.sh

@@ -2,4 +2,3 @@ python3 ./test.py -f 2-query/TD-11256.py
 # python3 ./test.py -f 2-query/TD-11389.py
 python3 ./test.py -f 2-query/TD-11945_crash.py
 python3 ./test.py -f 2-query/TD-12340-12342.py
-python3 ./test.py -f 2-query/TD-12344.py

tests/test-all.sh

@@ -348,6 +348,17 @@ if [ "$2" != "sim" ] && [ "$2" != "jdbc" ] && [ "$2" != "unit" ]  && [ "$2" != "
     runPyCaseOneByOne regressiontest.sh
   elif [ "$1" == "full" ]; then
     echo "### run Python full test ###"
+    cd $tests_dir/develop-test
+    for name in *.sh
+    do
+      runPyCaseOneByOne $name
+    done
+    cd $tests_dir/system-test
+    for name in *.sh
+    do
+      runPyCaseOneByOne $name
+    done
+    cd $tests_dir/pytest
     runPyCaseOneByOne fulltest.sh    
   elif [ "$1" == "pytest" ]; then
     echo "### run Python full test ###"