diff --git a/Jenkinsfile b/Jenkinsfile
index 35a2bf82606313fe015457cda3a6a57c23e2ef4d..03af9ba24408deb9bfa1a5baa1e924b262ccbd77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -367,6 +367,7 @@ pipeline {
else{
sh'''
cd ${WKC}
+ git reset --hard HEAD~10
git fetch
git checkout ${CHANGE_BRANCH}
git pull
diff --git a/cmake/define.inc b/cmake/define.inc
index 9e39dc9463f63c935ec67dbb712377dc3d0ac96f..00fd015b4ccfc5e06e40f963d8f19598b071a74e 100755
--- a/cmake/define.inc
+++ b/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 ()
diff --git a/deps/jemalloc b/deps/jemalloc
index 9015e129bd7de389afa4196495451669700904d0..ea6b3e973b477b8061e0076bb257dbd7f3faa756 160000
--- a/deps/jemalloc
+++ b/deps/jemalloc
@@ -1 +1 @@
-Subproject commit 9015e129bd7de389afa4196495451669700904d0
+Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756
diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index 93a0389f5578bd47ac21059ed46130a6601d15e6..f7d002bac4727cd58ea26e7fd201bcac26a2846f 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/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
diff --git a/documentation20/cn/13.faq/docs.md b/documentation20/cn/13.faq/docs.md
index 9132e8dca63c47e4b22ad87ef9fd4d4a1997077a..507ffc09ba954ed6acba39ece128ebbbe5a4142e 100644
--- a/documentation20/cn/13.faq/docs.md
+++ b/documentation20/cn/13.faq/docs.md
@@ -1,7 +1,6 @@
-# 常见问题
-
-## 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"来做。
-## 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);
```
-## 14. taos connect failed, reason: invalid timestamp
+**14. taos connect failed, reason: 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;
其含义是，清空本机所有由客户端生成的日志文件。
-## 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`）来书写时间戳，此时这些时间戳的取值将不再受其他时区设置的影响。
-## 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。
+
+
diff --git a/packaging/release.sh b/packaging/release.sh
index 866a21e552909ca9ad8e6083f4e571f5da91cc91..38e5dd929e78ce1a167464892089c42a044d94f6 100755
--- a/packaging/release.sh
+++ b/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
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/confprops/HttpKeepAliveTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/confprops/HttpKeepAliveTest.java
index 7f7979eb01154a85b25bbea7b9d3f042b4f1c104..33c6a6062766826ed37fc0fd338446ba9267904c 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/confprops/HttpKeepAliveTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/confprops/HttpKeepAliveTest.java
@@ -1,6 +1,7 @@
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";
diff --git a/src/kit/taos-tools b/src/kit/taos-tools
index 14a23779d24a9571cdb7165bea2b0208d54c53ad..27751ba9ca17407425fb50a52cd68295794dedc3 160000
--- a/src/kit/taos-tools
+++ b/src/kit/taos-tools
@@ -1 +1 @@
-Subproject commit 14a23779d24a9571cdb7165bea2b0208d54c53ad
+Subproject commit 27751ba9ca17407425fb50a52cd68295794dedc3
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index c7221a6d301ae09e47bd68c76a90599fd85dff2a..765c7195cb4ef2fd7e2a87a1a95cff725d8b0c90 100644
--- a/src/plugins/CMakeLists.txt
+++ b/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}")
diff --git a/src/plugins/taosadapter b/src/plugins/taosadapter
index 11d1e02255edfeeaa8d5b1f45abfa9637332ce65..273b5219f8bcc604e43beebc6f1f95abed85170a 160000
--- a/src/plugins/taosadapter
+++ b/src/plugins/taosadapter
@@ -1 +1 @@
-Subproject commit 11d1e02255edfeeaa8d5b1f45abfa9637332ce65
+Subproject commit 273b5219f8bcc604e43beebc6f1f95abed85170a
diff --git a/tests/develop-test/3-connectors/java/test.sh b/tests/develop-test/3-connectors/java/test.sh
index 15f7b84955b793e0fb6acaa434fba83c6ff0c710..8b43d1a44391c832735b5649258c1131f1133794 100755
--- a/tests/develop-test/3-connectors/java/test.sh
+++ b/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
+
diff --git a/tests/pytest/insert/openTsdbTelnetLinesInsert.py b/tests/pytest/insert/openTsdbTelnetLinesInsert.py
index c6a84c7def8301fa6ecd1752f9238731ce922338..d30bec55d83bfd5d7b991f59225d2419683532d5 100644
--- a/tests/pytest/insert/openTsdbTelnetLinesInsert.py
+++ b/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)
- if precision == None:
- self._conn.schemaless_insert([input_sql], TDSmlProtocolType.TELNET.value, 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:
- self._conn.schemaless_insert([input_sql], TDSmlProtocolType.TELNET.value, precision)
+ 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]
- stb_name = f'`{input_sql.split(" ")[0]}`'
- self.resCmp(input_sql, stb_name)
+ 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, 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
diff --git a/tests/pytest/query/queryGroupTbname.py b/tests/pytest/query/queryGroupTbname.py
index bb67809e60087f94ad7f92ca7515aa8ddfc43151..7beb0832a448780232006bb7c142c5f9fff0bc46 100644
--- a/tests/pytest/query/queryGroupTbname.py
+++ b/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"')
diff --git a/tests/pytest/util/common.py b/tests/pytest/util/common.py
index adfec12cb2a0aafe19b5d125164b583a7dbd288f..df4c0e8e9ce37fe60b5aaaeed16c034054b17508 100644
--- a/tests/pytest/util/common.py
+++ b/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])
diff --git a/tests/system-test/1-insert/stmt_error.py b/tests/system-test/1-insert/stmt_error.py
new file mode 100644
index 0000000000000000000000000000000000000000..8961346034827ba3cdb57b1c33614e5413a2e4bf
--- /dev/null
+++ b/tests/system-test/1-insert/stmt_error.py
@@ -0,0 +1,185 @@
+# 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 : [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())
diff --git a/tests/system-test/2-query/TD-12191.py b/tests/system-test/2-query/TD-12191.py
new file mode 100644
index 0000000000000000000000000000000000000000..b77c2eab3d58aad0d481c74a061503ac42dd7bcf
--- /dev/null
+++ b/tests/system-test/2-query/TD-12191.py
@@ -0,0 +1,112 @@
+###################################################################
+# 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
+import psutil
+
+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 getcfgPath(self):
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+ print(selfPath)
+ if ("community" in selfPath):
+ projPath = selfPath[:selfPath.find("community")]
+ else:
+ projPath = selfPath[:selfPath.find("tests")]
+
+ cfgPath = projPath + "/sim/dnode1/cfg "
+ return cfgPath
+
+ def caseDescription(self):
+
+ '''
+ case1 : [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()
+
+ # 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()
+ tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+
diff --git a/tests/system-test/2-query/TD-12276.py b/tests/system-test/2-query/TD-12276.py
new file mode 100644
index 0000000000000000000000000000000000000000..5353ab66176de30766117505e687f9103191f764
--- /dev/null
+++ b/tests/system-test/2-query/TD-12276.py
@@ -0,0 +1,94 @@
+###################################################################
+# 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 :[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
diff --git a/tests/system-test/2-query/TD-12344.py b/tests/system-test/2-query/TD-12344.py
deleted file mode 100644
index 7685444b24ed00df531ca68328895808f5258cff..0000000000000000000000000000000000000000
--- a/tests/system-test/2-query/TD-12344.py
+++ /dev/null
@@ -1,124 +0,0 @@
-###################################################################
-# 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 : [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__))
-
- 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 getcfgPath(self):
- selfPath = os.path.dirname(os.path.realpath(__file__))
- print(selfPath)
- if ("community" in selfPath):
- projPath = selfPath[:selfPath.find("community")]
- else:
- projPath = selfPath[:selfPath.find("tests")]
-
- cfgPath = projPath + "/sim/dnode1/cfg "
- return cfgPath
-
- 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;')
-
- datas = tdSql.getResult('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;')
- table_names = ["sub_%s"%str(i) for i in range(10)]
- # print(table_names)
-
- for index , table_name in enumerate(table_names):
- tdSql.query("select elapsed(ts,10s) from testdb.%s where ts>=\"2015-01-01 00:00:00.000\" and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) ;"%table_name)
- # print(datas)
- tdSql.checkData(0,1,datas[index][1])
-
-
- for i in range(10):
- 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)
- # print(taos_cmd1)
- _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8")
-
-
-
- def stop(self):
- tdSql.close()
- tdLog.success("%s successfully executed" % __file__)
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
-
-
diff --git a/tests/system-test/3-connectors/restful/restful_binddbname.py b/tests/system-test/3-connectors/restful/restful_binddbname.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c47629b57b72b26f7e4c772474e6e202cbb1389
--- /dev/null
+++ b/tests/system-test/3-connectors/restful/restful_binddbname.py
@@ -0,0 +1,168 @@
+# #################################################################
+# 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:dbname binding
+ case2: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())
diff --git a/tests/system-test/5-taos-tools/taosdump/TD-12435.py b/tests/system-test/5-taos-tools/taosdump/TD-12435.py
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaba5179807513ea4369122e4fb3497ba1a35f
--- /dev/null
+++ b/tests/system-test/5-taos-tools/taosdump/TD-12435.py
@@ -0,0 +1,829 @@
+###################################################################
+# 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 -*-
+
+import sys
+import taos
+import time
+import os
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+ def caseDescription(self):
+ '''
+ case1:taosdump: char "`" can be used for both tag name and column name
+ '''
+ return
+
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ now = time.time()
+ self.ts = int(round(now * 1000))
+
+ def table1_checkall(self,sql):
+ tdLog.info(sql)
+ tdSql.query(sql)
+ tdSql.checkData(0,1,1)
+ tdSql.checkData(0,2,2)
+ tdSql.checkData(0,3,3)
+ tdSql.checkData(0,4,4)
+ tdSql.checkData(0,5,'True')
+ tdSql.checkData(0,6,6)
+ tdSql.checkData(0,7,7)
+ tdSql.checkData(0,8,8)
+ tdSql.checkData(0,9,9)
+ tdSql.checkData(0,10,'1970-01-01 08:00:00.010')
+
+ def table1_checkall_1(self,sql):
+ tdSql.query(sql)
+ tdSql.checkData(0,1,1)
+
+ def table1_checkall_2(self,sql):
+ self.table1_checkall_1(sql)
+ tdSql.checkData(0,2,2)
+
+ def table1_checkall_3(self,sql):
+ self.table1_checkall_2(sql)
+ tdSql.checkData(0,3,3)
+
+ def table1_checkall_4(self,sql):
+ self.table1_checkall_3(sql)
+ tdSql.checkData(0,4,4)
+
+ def table1_checkall_5(self,sql):
+ self.table1_checkall_4(sql)
+ tdSql.checkData(0,5,'True')
+
+ def table1_checkall_6(self,sql):
+ self.table1_checkall_5(sql)
+ tdSql.checkData(0,6,6)
+
+ def table1_checkall_7(self,sql):
+ self.table1_checkall_6(sql)
+ tdSql.checkData(0,7,7)
+
+ def table1_checkall_8(self,sql):
+ self.table1_checkall_7(sql)
+ tdSql.checkData(0,8,8)
+
+ def table1_checkall_9(self,sql):
+ self.table1_checkall_8(sql)
+ tdSql.checkData(0,9,9)
+
+ def table1_checkall_10(self,sql):
+ self.table1_checkall_9(sql)
+ tdSql.checkData(0,10,'1970-01-01 08:00:00.010')
+
+ def run(self):
+
+ testcaseFilename = os.path.split(__file__)[-1]
+ os.system("rm -rf 5-taos-tools/taosdump/%s.sql" % testcaseFilename )
+ tdSql.prepare()
+
+ print("==============step1")
+ print("prepare data")
+
+ # case for defect: https://jira.taosdata.com:18080/browse/TD-2693
+ tdSql.execute("create database db2")
+ tdSql.execute("use db2")
+
+ print("==============new version [escape character] for stable==============")
+ print("==============step1,#create db.stable,db.table; insert db.table; show db.table; select db.table; drop db.table;")
+ print("prepare data")
+
+ self.stb1 = "stable_1~!@#$%^&*()-_+=[]{}':,<.>/?stST13579"
+ self.tb1 = "table_1~!@#$%^&*()-_+=[]{}':,<.>/?stST13579"
+
+ self.col_base = "123~!@#$%^&*()-_+=[]{}':,<.>/?stST13579"
+
+ self.col_int = "stable_col_int%s" %self.col_base
+ print(self.col_int)
+ self.col_bigint = "stable_col_bigint%s" %self.col_base
+ self.col_smallint = "stable_col_smallint%s" %self.col_base
+ self.col_tinyint = "stable_col_tinyint%s" %self.col_base
+ self.col_bool = "stable_col_bool%s" %self.col_base
+ self.col_binary = "stable_col_binary%s" %self.col_base
+ self.col_nchar = "stable_col_nchar%s" %self.col_base
+ self.col_float = "stable_col_float%s" %self.col_base
+ self.col_double = "stable_col_double%s" %self.col_base
+ self.col_ts = "stable_col_ts%s" %self.col_base
+
+ self.tag_base = "abc~!@#$%^&*()-_+=[]{}':,<.>/?stST13579"
+ self.tag_int = "stable_tag_int%s" %self.tag_base
+ self.tag_bigint = "stable_tag_bigint%s" %self.tag_base
+ self.tag_smallint = "stable_tag_smallint%s" %self.tag_base
+ self.tag_tinyint = "stable_tag_tinyint%s" %self.tag_base
+ self.tag_bool = "stable_tag_bool%s" %self.tag_base
+ self.tag_binary = "stable_tag_binary%s" %self.tag_base
+ self.tag_nchar = "stable_tag_nchar%s" %self.tag_base
+ self.tag_float = "stable_tag_float%s" %self.tag_base
+ self.tag_double = "stable_tag_double%s" %self.tag_base
+ self.tag_ts = "stable_tag_ts%s" %self.tag_base
+
+ tdSql.execute('''create stable db.`%s` (ts timestamp, `%s` int , `%s` bigint , `%s` smallint , `%s` tinyint, `%s` bool ,
+ `%s` binary(20) , `%s` nchar(20) ,`%s` float , `%s` double , `%s` timestamp)
+ tags(loc nchar(20), `%s` int , `%s` bigint , `%s` smallint , `%s` tinyint, `%s` bool ,
+ `%s` binary(20) , `%s` nchar(20) ,`%s` float , `%s` double , `%s` timestamp);'''
+ %(self.stb1, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool,
+ self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,
+ self.tag_int, self.tag_bigint, self.tag_smallint, self.tag_tinyint, self.tag_bool,
+ self.tag_binary, self.tag_nchar, self.tag_float, self.tag_double, self.tag_ts))
+ tdSql.query("describe db.`%s` ; " %self.stb1)
+ tdSql.checkRows(22)
+
+ tdSql.query("select _block_dist() from db.`%s` ; " %self.stb1)
+ tdSql.checkRows(0)
+
+ tdSql.query("show create stable db.`%s` ; " %self.stb1)
+ tdSql.checkData(0, 0, self.stb1)
+ tdSql.checkData(0, 1, "create table `%s` (`ts` TIMESTAMP,`%s` INT,`%s` BIGINT,`%s` SMALLINT,`%s` TINYINT,`%s` BOOL,`%s` BINARY(20),`%s` NCHAR(20),`%s` FLOAT,`%s` DOUBLE,`%s` TIMESTAMP)\
+ TAGS (`loc` NCHAR(20),`%s` INT,`%s` BIGINT,`%s` SMALLINT,`%s` TINYINT,`%s` BOOL,`%s` BINARY(20),`%s` NCHAR(20),`%s` FLOAT,`%s` DOUBLE,`%s` TIMESTAMP)"
+ %(self.stb1, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool,
+ self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,
+ self.tag_int, self.tag_bigint, self.tag_smallint, self.tag_tinyint, self.tag_bool,
+ self.tag_binary, self.tag_nchar, self.tag_float, self.tag_double, self.tag_ts))
+
+ tdSql.execute("create table db.`table!1` using db.`%s` tags('table_1' , '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0')" %self.stb1)
+ tdSql.query("describe db.`table!1` ; ")
+ tdSql.checkRows(22)
+
+ time.sleep(10)
+ tdSql.query("show create table db.`table!1` ; ")
+ tdSql.checkData(0, 0, "table!1")
+ tdSql.checkData(0, 1, "CREATE TABLE `table!1` USING `%s` TAGS (\"table_1\",0,0,0,0,false,\"0\",\"0\",0.000000,0.000000,\"0\")" %self.stb1)
+
+ tdSql.execute("insert into db.`table!1` values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)")
+ sql = " select * from db.`table!1`; "
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+ sql = '''select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db.`table!1`; '''\
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+
+ time.sleep(1)
+ tdSql.execute('''insert into db.`table!1`(ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`) values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)'''\
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts) )
+ sql = " select * from db.`table!1`; "
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ tdSql.query("select count(*) from db.`table!1`; ")
+ tdSql.checkData(0, 0, 2)
+ tdSql.query("select _block_dist() from db.`%s` ; " %self.stb1)
+ tdSql.checkRows(1)
+
+ tdSql.execute("create table db.`%s` using db.`%s` TAGS (\"table_2\",2,2,2,2,true,\"2\",\"2\",2.000000,2.000000,\"2\")" %(self.tb1,self.stb1))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.query("show create table db.`%s` ; " %self.tb1)
+ tdSql.checkData(0, 0, self.tb1)
+ tdSql.checkData(0, 1, "CREATE TABLE `%s` USING `%s` TAGS (\"table_2\",2,2,2,2,true,\"2\",\"2\",2.000000,2.000000,\"2\")" %(self.tb1,self.stb1))
+
+ tdSql.execute("insert into db.`%s` values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)" %self.tb1)
+ sql = "select * from db.`%s` ; " %self.tb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+ sql = '''select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db.`%s` ; '''\
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,\
+ self.tag_int, self.tag_bigint, self.tag_smallint, self.tag_tinyint, self.tag_bool, self.tag_binary, self.tag_nchar, self.tag_float, self.tag_double, self.tag_ts, self.tb1)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+
+ time.sleep(1)
+ tdSql.execute('''insert into db.`%s`(ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`) values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)'''\
+ %(self.tb1, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts) )
+ sql = " select * from db.`%s` ; " %self.tb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ sql = " select * from db.`%s` where `%s`=1 and `%s`=2 and `%s`=3 and `%s`=4 and `%s`='True' and `%s`=6 and `%s`=7 and `%s`=8 and `%s`=9 and `%s`=10; " \
+ %(self.tb1, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ tdSql.query("select count(*) from db.`%s`; " %self.tb1)
+ tdSql.checkData(0, 0, 2)
+ sql = "select * from db.`%s` ; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(4)
+ tdSql.query("select count(*) from db.`%s`; " %self.stb1)
+ tdSql.checkData(0, 0, 4)
+
+ sql = "select * from (select * from db.`%s`) ; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(4)
+ tdSql.query("select count(*) from (select * from db.`%s`) ; " %self.stb1)
+ tdSql.checkData(0, 0, 4)
+
+ sql = "select * from (select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db.`%s`) ; " \
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts, self.stb1)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(4)
+
+ sql = "select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from (select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db.`%s`) ; " \
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,\
+ self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts, self.stb1)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(4)
+
+ sql = "select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from (select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db.`%s`\
+ where `%s`=1 and `%s`=2 and `%s`=3 and `%s`=4 and `%s`='True' and `%s`=6 and `%s`=7 and `%s`=8 and `%s`=9 and `%s`=10 ) ; " \
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,\
+ self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts, self.stb1, \
+ self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(4)
+
+ tdSql.query("show db.stables like 'stable_1%' ")
+ tdSql.checkRows(1)
+ tdSql.query("show db.tables like 'table%' ")
+ tdSql.checkRows(2)
+
+ self.cr_tb1 = "create_table_1~!@#$%^&*()-_+=[]{}':,<.>/?stST13579"
+ tdSql.execute("create table db.`%s` as select avg(`%s`) from db.`%s` where ts > now interval(1m) sliding(30s);" %(self.cr_tb1,self.col_bigint,self.stb1))
+ tdSql.query("show db.tables like 'create_table_%' ")
+ tdSql.checkRows(1)
+
+ print("==============drop\ add\ change\ modify column or tag")
+ print("==============drop==============")
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_ts))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(21)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_double))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(20)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_float))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(19)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_nchar))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(18)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_binary))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(17)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_bool))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(16)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_tinyint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(15)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_smallint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(14)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_bigint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(13)
+ tdSql.execute("ALTER TABLE db.`%s` DROP TAG `%s`; " %(self.stb1, self.tag_int))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(12)
+
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_ts))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_9(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(11)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_double))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_8(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(10)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_float))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_7(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(9)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_nchar))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_6(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(8)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_binary))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_5(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(7)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_bool))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_4(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(6)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_tinyint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_3(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(5)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_smallint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_2(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(4)
+ tdSql.execute("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_bigint))
+ sql = " select * from db.`%s`; " %self.stb1
+ datacheck = self.table1_checkall_1(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(3)
+ tdSql.error("ALTER TABLE db.`%s` DROP COLUMN `%s`; " %(self.stb1, self.col_int))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(3)
+
+ print("==============add==============")
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` bigint; " %(self.stb1, self.col_bigint))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(4)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` smallint; " %(self.stb1, self.col_smallint))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(5)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` tinyint; " %(self.stb1, self.col_tinyint))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(6)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` bool; " %(self.stb1, self.col_bool))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(7)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` binary(20); " %(self.stb1, self.col_binary))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(8)
+
+ tdSql.execute("insert into db.`%s` values(now, 1 , 2, 3, 4, 5, 6)" %self.tb1)
+ sql = "select * from db.`%s` order by ts desc; " %self.tb1
+ datacheck = self.table1_checkall_5(sql)
+
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` nchar(20); " %(self.stb1, self.col_nchar))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(9)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` float; " %(self.stb1, self.col_float))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(10)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` double; " %(self.stb1, self.col_double))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(11)
+ tdSql.execute("ALTER TABLE db.`%s` ADD COLUMN `%s` timestamp; " %(self.stb1, self.col_ts))
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(12)
+
+ tdSql.execute("insert into db.`%s` values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)" %self.tb1)
+ sql = "select * from db.`%s` order by ts desc; " %self.tb1
+ datacheck = self.table1_checkall(sql)
+
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` int; " %(self.stb1, self.tag_int))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(13)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` bigint; " %(self.stb1, self.tag_bigint))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(14)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` smallint; " %(self.stb1, self.tag_smallint))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(15)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` tinyint; " %(self.stb1, self.tag_tinyint))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(16)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` bool; " %(self.stb1, self.tag_bool))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(17)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` binary(20); " %(self.stb1, self.tag_binary))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(18)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` nchar(20); " %(self.stb1, self.tag_nchar))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(19)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` float; " %(self.stb1, self.tag_float))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(20)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` double; " %(self.stb1, self.tag_double))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(21)
+ tdSql.execute("ALTER TABLE db.`%s` ADD TAG `%s` timestamp; " %(self.stb1, self.tag_ts))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+
+ print("==============change==============")
+ self.tag_base_change = "abcdas"
+ self.tag_int_change = "stable_tag_int%s" %self.tag_base_change
+ self.tag_bigint_change = "stable_tag_bigint%s" %self.tag_base_change
+ self.tag_smallint_change = "stable_tag_smallint%s" %self.tag_base_change
+ self.tag_tinyint_change = "stable_tag_tinyint%s" %self.tag_base_change
+ self.tag_bool_change = "stable_tag_bool%s" %self.tag_base_change
+ self.tag_binary_change = "stable_tag_binary%s" %self.tag_base_change
+ self.tag_nchar_change = "stable_tag_nchar%s" %self.tag_base_change
+ self.tag_float_change = "stable_tag_float%s" %self.tag_base_change
+ self.tag_double_change = "stable_tag_double%s" %self.tag_base_change
+ self.tag_ts_change = "stable_tag_ts%s" %self.tag_base_change
+
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_int, self.tag_int_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_bigint, self.tag_bigint_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_smallint, self.tag_smallint_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_tinyint, self.tag_tinyint_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_bool, self.tag_bool_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_binary, self.tag_binary_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_nchar, self.tag_nchar_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_float, self.tag_float_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_double, self.tag_double_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER TABLE db.`%s` CHANGE TAG `%s` `%s`; " %(self.stb1, self.tag_ts, self.tag_ts_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+
+ print("==============modify==============")
+ # TD-10810
+ tdSql.execute("ALTER STABLE db.`%s` MODIFY TAG `%s` binary(30); ; " %(self.stb1, self.tag_binary_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER STABLE db.`%s` MODIFY TAG `%s` nchar(30); ; " %(self.stb1, self.tag_nchar_change))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+
+ tdSql.execute("ALTER STABLE db.`%s` MODIFY COLUMN `%s` binary(30); ; " %(self.stb1, self.col_binary))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+ tdSql.execute("ALTER STABLE db.`%s` MODIFY COLUMN `%s` nchar(30); ; " %(self.stb1, self.col_nchar))
+ sql = " select * from db.`%s` order by ts desc; " %self.stb1
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db.`%s` ; " %self.tb1)
+ tdSql.checkRows(22)
+
+ print("==============drop table\stable")
+ try:
+ tdSql.execute("drop table db.`%s` " %self.tb1)
+ except Exception as e:
+ tdLog.exit(e)
+
+ tdSql.error("select * from db.`%s`" %self.tb1)
+ tdSql.query("show db.stables like 'stable_1%' ")
+ tdSql.checkRows(1)
+
+ try:
+ tdSql.execute("drop table db.`%s` " %self.stb1)
+ except Exception as e:
+ tdLog.exit(e)
+
+ tdSql.error("select * from db.`%s`" %self.tb1)
+ tdSql.error("select * from db.`%s`" %self.stb1)
+
+
+ print("==============step2,#create stable,table; insert table; show table; select table; drop table")
+
+ self.stb2 = "stable_2~!@#$%^&*()-_+=[]{}';:,<.>/?stST24680~!@#$%^&*()-_+=[]{}"
+ self.tb2 = "table_2~!@#$%^&*()-_+=[]{}';:,<.>/?stST24680~!@#$%^&*()-_+=[]{}"
+
+ tdSql.execute("create stable `%s` (ts timestamp, i int) tags(j int);" %self.stb2)
+ tdSql.query("describe `%s` ; "%self.stb2)
+ tdSql.checkRows(3)
+
+ tdSql.query("select _block_dist() from `%s` ; " %self.stb2)
+ tdSql.checkRows(0)
+
+ tdSql.query("show create stable `%s` ; " %self.stb2)
+ tdSql.checkData(0, 0, self.stb2)
+ tdSql.checkData(0, 1, "create table `%s` (`ts` TIMESTAMP,`i` INT) TAGS (`j` INT)" %self.stb2)
+
+ tdSql.execute("create table `table!2` using `%s` tags(1)" %self.stb2)
+ tdSql.query("describe `table!2` ; ")
+ tdSql.checkRows(3)
+
+ time.sleep(10)
+
+ tdSql.query("show create table `table!2` ; ")
+ tdSql.checkData(0, 0, "table!2")
+ tdSql.checkData(0, 1, "CREATE TABLE `table!2` USING `%s` TAGS (1)" %self.stb2)
+ tdSql.execute("insert into `table!2` values(now, 1)")
+ tdSql.query("select * from `table!2`; ")
+ tdSql.checkRows(1)
+ tdSql.query("select count(*) from `table!2`; ")
+ tdSql.checkData(0, 0, 1)
+ tdSql.query("select _block_dist() from `%s` ; " %self.stb2)
+ tdSql.checkRows(1)
+
+ tdSql.execute("create table `%s` using `%s` tags(1)" %(self.tb2,self.stb2))
+ tdSql.query("describe `%s` ; " %self.tb2)
+ tdSql.checkRows(3)
+ tdSql.query("show create table `%s` ; " %self.tb2)
+ tdSql.checkData(0, 0, self.tb2)
+ tdSql.checkData(0, 1, "CREATE TABLE `%s` USING `%s` TAGS (1)" %(self.tb2,self.stb2))
+ tdSql.execute("insert into `%s` values(now, 1)" %self.tb2)
+ tdSql.query("select * from `%s` ; " %self.tb2)
+ tdSql.checkRows(1)
+ tdSql.query("select count(*) from `%s`; " %self.tb2)
+ tdSql.checkData(0, 0, 1)
+ tdSql.query("select * from `%s` ; " %self.stb2)
+ tdSql.checkRows(2)
+ tdSql.query("select count(*) from `%s`; " %self.stb2)
+ tdSql.checkData(0, 0, 2)
+
+ tdSql.query("select * from (select * from `%s`) ; " %self.stb2)
+ tdSql.checkRows(2)
+ tdSql.query("select count(*) from (select * from `%s` ); " %self.stb2)
+ tdSql.checkData(0, 0, 2)
+
+ tdSql.query("show stables like 'stable_2%' ")
+ tdSql.checkRows(1)
+ tdSql.query("show tables like 'table%' ")
+ tdSql.checkRows(2)
+
+
+ #TD-10536
+ self.cr_tb2 = "create_table_2~!@#$%^&*()-_+=[]{}';:,<.>/?stST24680~!@#$%^&*()-_+=[]{}"
+ tdSql.execute("create table `%s` as select * from `%s` ;" %(self.cr_tb2,self.stb2))
+ tdSql.query("show db.tables like 'create_table_%' ")
+ tdSql.checkRows(1)
+
+
+ print("==============step3,#create regular_table; insert regular_table; show regular_table; select regular_table; drop regular_table")
+ self.regular_table = "regular_table~!@#$%^&*()-_+=[]{}';:,<.>/?stST24680~!@#$%^&*()-_+=[]{}"
+
+ self.regular_col_base = "123@#$%^&*()-_+=[]{};:,<.>/?~!$%^"
+
+ self.col_int = "regular_table_col_int%s" %self.regular_col_base
+ print(self.col_int)
+ self.col_bigint = "regular_table_col_bigint%s" %self.regular_col_base
+ self.col_smallint = "regular_table_col_smallint%s" %self.regular_col_base
+ self.col_tinyint = "regular_table_col_tinyint%s" %self.regular_col_base
+ self.col_bool = "regular_table_col_bool%s" %self.regular_col_base
+ self.col_binary = "regular_table_col_binary%s" %self.regular_col_base
+ self.col_nchar = "regular_table_col_nchar%s" %self.regular_col_base
+ self.col_float = "regular_table_col_float%s" %self.regular_col_base
+ self.col_double = "regular_table_col_double%s" %self.regular_col_base
+ self.col_ts = "regular_table_col_ts%s" %self.regular_col_base
+
+ tdSql.execute("create table `%s` (ts timestamp,`%s` int , `%s` bigint , `%s` smallint , `%s` tinyint, `%s` bool , \
+ `%s` binary(20) , `%s` nchar(20) ,`%s` float , `%s` double , `%s` timestamp) ;"\
+ %(self.regular_table, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool,
+ self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts))
+ tdSql.query("describe `%s` ; "%self.regular_table)
+ tdSql.checkRows(11)
+
+ tdSql.query("select _block_dist() from `%s` ; " %self.regular_table)
+ tdSql.checkRows(1)
+
+ tdSql.query("show create table `%s` ; " %self.regular_table)
+ tdSql.checkData(0, 0, self.regular_table)
+ tdSql.checkData(0, 1, "create table `%s` (`ts` TIMESTAMP,`%s` INT,`%s` BIGINT,`%s` SMALLINT,`%s` TINYINT,`%s` BOOL,`%s` BINARY(20),`%s` NCHAR(20),`%s` FLOAT,`%s` DOUBLE,`%s` TIMESTAMP)"
+ %(self.regular_table, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool,
+ self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts))
+
+ tdSql.execute("insert into `%s` values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)" %self.regular_table)
+ sql = "select * from `%s` ; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+ sql = '''select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db2.`%s`; '''\
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts, self.regular_table)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(1)
+
+ time.sleep(1)
+ tdSql.execute('''insert into db2.`%s` (ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`) values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)'''\
+ %(self.regular_table, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts) )
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ sql = " select * from db2.`%s` where `%s`=1 and `%s`=2 and `%s`=3 and `%s`=4 and `%s`='True' and `%s`=6 and `%s`=7 and `%s`=8 and `%s`=9 and `%s`=10; " \
+ %(self.regular_table, self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ tdSql.query("select count(*) from `%s`; " %self.regular_table)
+ tdSql.checkData(0, 0, 2)
+ tdSql.query("select _block_dist() from `%s` ; " %self.regular_table)
+ tdSql.checkRows(1)
+
+ sql = "select * from (select * from `%s`) ; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ sql = "select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from (select ts ,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s`,`%s` from db2.`%s`\
+ where `%s`=1 and `%s`=2 and `%s`=3 and `%s`=4 and `%s`='True' and `%s`=6 and `%s`=7 and `%s`=8 and `%s`=9 and `%s`=10 ) ; " \
+ %(self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts,\
+ self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts, self.regular_table, \
+ self.col_int, self.col_bigint, self.col_smallint, self.col_tinyint, self.col_bool, self.col_binary, self.col_nchar, self.col_float, self.col_double, self.col_ts)
+ datacheck = self.table1_checkall(sql)
+ tdSql.checkRows(2)
+
+ tdSql.query("select count(*) from (select * from `%s` ); " %self.regular_table)
+ tdSql.checkData(0, 0, 2)
+
+ tdSql.query("show tables like 'regular_table%' ")
+ tdSql.checkRows(1)
+
+ self.crr_tb = "create_r_table~!@#$%^&*()-_+=[]{}';:,<.>/?stST24680~!@#$%^&*()-_+=[]{}"
+ tdSql.execute("create table `%s` as select * from `%s` ;" %(self.crr_tb,self.regular_table))
+ tdSql.query("show db2.tables like 'create_r_table%' ")
+ tdSql.checkRows(1)
+
+
+ print("==============drop\ add\ change\ modify column ")
+ print("==============drop==============")
+ tdSql.execute("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_ts))
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall_9(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(10)
+ tdSql.execute("ALTER TABLE `%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_double))
+ sql = " select * from `%s`; " %self.regular_table
+ datacheck = self.table1_checkall_8(sql)
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(9)
+ tdSql.execute("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_float))
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall_7(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(8)
+ tdSql.execute("ALTER TABLE `%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_nchar))
+ sql = " select * from `%s`; " %self.regular_table
+ datacheck = self.table1_checkall_6(sql)
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(7)
+ tdSql.execute("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_binary))
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall_5(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(6)
+ tdSql.execute("ALTER TABLE `%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_bool))
+ sql = " select * from `%s`; " %self.regular_table
+ datacheck = self.table1_checkall_4(sql)
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(5)
+ tdSql.execute("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_tinyint))
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall_3(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(4)
+ tdSql.execute("ALTER TABLE `%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_smallint))
+ sql = " select * from `%s`; " %self.regular_table
+ datacheck = self.table1_checkall_2(sql)
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(3)
+ tdSql.execute("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_bigint))
+ sql = " select * from db2.`%s`; " %self.regular_table
+ datacheck = self.table1_checkall_1(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(2)
+ tdSql.error("ALTER TABLE db2.`%s` DROP COLUMN `%s`; " %(self.regular_table, self.col_int))
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(2)
+
+ print("==============add==============")
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` bigint; " %(self.regular_table, self.col_bigint))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(3)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` smallint; " %(self.regular_table, self.col_smallint))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(4)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` tinyint; " %(self.regular_table, self.col_tinyint))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(5)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` bool; " %(self.regular_table, self.col_bool))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(6)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` binary(20); " %(self.regular_table, self.col_binary))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(7)
+
+ tdSql.execute("insert into db2.`%s` values(now, 1 , 2, 3, 4, 5, 6)" %self.regular_table)
+ sql = "select * from db2.`%s` order by ts desc; " %self.regular_table
+ datacheck = self.table1_checkall_5(sql)
+
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` nchar(20); " %(self.regular_table, self.col_nchar))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(8)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` float; " %(self.regular_table, self.col_float))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(9)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` double; " %(self.regular_table, self.col_double))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(10)
+ tdSql.execute("ALTER TABLE db2.`%s` ADD COLUMN `%s` timestamp; " %(self.regular_table, self.col_ts))
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(11)
+
+ tdSql.execute("insert into db2.`%s` values(now, 1 , 2, 3, 4, 5, 6 ,7 ,8 ,9 ,10)" %self.regular_table)
+ sql = "select * from db2.`%s` order by ts desc; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+
+
+ print("==============change, regular not support==============")
+
+
+ print("==============modify==============")
+ # TD-10810
+ tdSql.execute("ALTER TABLE db2.`%s` MODIFY COLUMN `%s` binary(30); ; " %(self.regular_table, self.col_binary))
+ sql = " select * from db2.`%s` order by ts desc; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe db2.`%s` ; " %self.regular_table)
+ tdSql.checkRows(11)
+ tdSql.execute("ALTER TABLE `%s` MODIFY COLUMN `%s` nchar(30); ; " %(self.regular_table, self.col_nchar))
+ sql = " select * from `%s` order by ts desc; " %self.regular_table
+ datacheck = self.table1_checkall(sql)
+ tdSql.query("describe `%s` ; " %self.regular_table)
+ tdSql.checkRows(11)
+
+
+ assert os.system("taosdump -D db") == 0
+ assert os.system("taosdump -D db2") == 0
+
+ assert os.system("taosdump -i . -g") == 0
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/fulltest-connector.sh b/tests/system-test/fulltest-connector.sh
index dbb77b2ce07d8c34c549a22a3218ebcb6894d2a3..0a02608cb8862b0fb685e363e3197759f773bb6e 100755
--- a/tests/system-test/fulltest-connector.sh
+++ b/tests/system-test/fulltest-connector.sh
@@ -1,3 +1,6 @@
+
+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
+
diff --git a/tests/system-test/fulltest-insert.sh b/tests/system-test/fulltest-insert.sh
index 0f797ce646925748ceb0fbaf056a022cc3a3b350..3f2cc0366910ecfdb80a589e5b90e60638098651 100755
--- a/tests/system-test/fulltest-insert.sh
+++ b/tests/system-test/fulltest-insert.sh
@@ -1 +1,3 @@
-python3 test.py -f 1-insert/TD-11970.py
\ No newline at end of file
+python3 test.py -f 1-insert/TD-11970.py
+python3 test.py -f 1-insert/stmt_error.py
+
diff --git a/tests/system-test/fulltest-query.sh b/tests/system-test/fulltest-query.sh
index efdbbe4047791dfa865d2897c63681fb6b41b9c6..262818be32ffd3d0338799e2b861e2aa68ad7966 100755
--- a/tests/system-test/fulltest-query.sh
+++ b/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
diff --git a/tests/test-all.sh b/tests/test-all.sh
index bfd2b04f027084d348f65a2d858427c3389c0774..78fcfc681b1c7477301ecf182836eb3a05a3ce92 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -348,7 +348,18 @@ if [ "$2" != "sim" ] && [ "$2" != "jdbc" ] && [ "$2" != "unit" ] && [ "$2" != "
runPyCaseOneByOne regressiontest.sh
elif [ "$1" == "full" ]; then
echo "### run Python full test ###"
- runPyCaseOneByOne fulltest.sh
+ 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 ###"
runPyCaseOneByOne fulltest.sh