diff --git a/tests/pytest/table/create_db_from_normal_db.py b/tests/pytest/table/create_db_from_normal_db.py index 8b5182c3b16ca31b2bbf966df294e2c4e4c12ff3..ad21ebfac27c099e3b3f3013b47e52d8bf93af15 100644 --- a/tests/pytest/table/create_db_from_normal_db.py +++ b/tests/pytest/table/create_db_from_normal_db.py @@ -34,7 +34,26 @@ class TDTestCase: tdSql.execute("drop table if exists db.state2;") tdSql.execute("create table db.state2 (ts timestamp, c1 int) tags (t binary(20));") tdSql.query("create table db.test2 using db.state2 tags('tt');") - tdSql.error("create table db.test22 using db.test2 tags('tt');") + tdSql.error("create table db.test22 using db.test2 tags('tt');") + + # test case for TS-1289 + tdSql.execute("create database test") + tdSql.execute("use test") + tdSql.execute("create table `metrics` (`ts` TIMESTAMP,`value` DOUBLE) TAGS (`labels` JSON)") + tdSql.execute('''CREATE TABLE `t_eb22c740776471c56ed97eff4951eb41` USING `metrics` TAGS ('{"__name__":"node_exporter:memory:used:percent","datacenter":"cvte + ","hostname":"p-tdengine-s-002","instance":"10.21.46.53:9100","ipaddress":"10.21.46.53","job":"node","product":"Prometheus","productline":"INFRA + "}');''') + + tdSql.query("show create table t_eb22c740776471c56ed97eff4951eb41") + sql = tdSql.getData(0, 1) + tdSql.execute("drop table t_eb22c740776471c56ed97eff4951eb41") + tdSql.query("show tables") + tdSql.checkRows(0) + + tdSql.execute(sql) + tdSql.query("show tables") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 't_eb22c740776471c56ed97eff4951eb41') def stop(self): tdSql.close() diff --git a/tests/pytest/tools/taosdumpTest2.py b/tests/pytest/tools/taosdumpTest2.py index 6258024de8729d799690515a7133c5d9aa04330e..c82b776e7a1a42e6458f240210933fff9362ce5e 100644 --- a/tests/pytest/tools/taosdumpTest2.py +++ b/tests/pytest/tools/taosdumpTest2.py @@ -11,15 +11,19 @@ # -*- coding: utf-8 -*- +from logging.config import dictConfig import sys import os from util.log import * from util.cases import * from util.sql import * from util.dnodes import * +import string +import random -class TDTestCase: +class TDTestCase: + def init(self, conn, logSql): tdLog.debug("start to execute %s" % __file__) tdSql.init(conn.cursor(), logSql) @@ -44,6 +48,13 @@ class TDTestCase: break return buildPath + def generateString(self, length): + chars = string.ascii_uppercase + string.ascii_lowercase + v = "" + for i in range(length): + v += random.choice(chars) + return v + def run(self): tdSql.prepare() @@ -70,14 +81,14 @@ class TDTestCase: os.system("rm /tmp/*.sql") os.system("rm /tmp/*.avro*") os.system( - "%staosdump --databases db -o /tmp -B 16384" % + "%staosdump --databases db -o /tmp -B 16384 -y" % binPath) tdSql.execute("drop database db") tdSql.query("show databases") tdSql.checkRows(0) - os.system("%staosdump -i /tmp" % binPath) + os.system("%staosdump -i /tmp -y" % binPath) tdSql.query("show databases") tdSql.checkRows(1) @@ -89,7 +100,33 @@ class TDTestCase: tdSql.checkData(0, 0, 'st') tdSql.query("select count(*) from t1") - tdSql.checkData(0, 0, self.numberOfRecords) + tdSql.checkData(0, 0, self.numberOfRecords) + + # test case for TS-1225 + tdSql.execute("create database test") + tdSql.execute("use test") + tdSql.execute("create table stb(ts timestamp, c1 binary(16374), c2 binary(16374), c3 binary(16374)) tags(t1 nchar(256))") + tdSql.execute("insert into t1 using stb tags('t1') values(now, '%s', '%s', '%s')" % (self.generateString(16374), self.generateString(16374), self.generateString(16374))) + + os.system("rm /tmp/*.sql") + os.system("rm /tmp/*.avro*") + os.system("%staosdump -D test -o /tmp -y" % binPath) + + tdSql.execute("drop database test") + tdSql.query("show databases") + tdSql.checkRows(1) + + os.system("%staosdump -i /tmp -y" % binPath) + + tdSql.execute("use test") + tdSql.error("show vnodes '' ") + tdSql.query("show stables") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 'stb') + + tdSql.query("select * from stb") + tdSql.checkRows(1) + os.system("rm -rf dump_result.txt") def stop(self): tdSql.close()