From 8a732b363ab34fe11a4492c60188b45d5cf51df8 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sat, 7 May 2022 15:15:36 +0800 Subject: [PATCH 1/5] add case for diff --- tests/system-test/2-query/diff.py | 150 ++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 tests/system-test/2-query/diff.py diff --git a/tests/system-test/2-query/diff.py b/tests/system-test/2-query/diff.py new file mode 100644 index 0000000000..696366428b --- /dev/null +++ b/tests/system-test/2-query/diff.py @@ -0,0 +1,150 @@ +from util.log import * +from util.cases import * +from util.sql import * +import numpy as np + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + self.rowNum = 10 + self.ts = 1537146000000 + self.perfix = 'dev' + self.tables = 10 + + def insertData(self): + print("==============step1") + tdSql.execute( + "create table if not exists st (ts timestamp, col int) tags(dev nchar(50))") + + for i in range(self.tables): + tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i)) + rows = 15 + i + for j in range(rows): + tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, self.ts + i * 20 * 10000 + j * 10000, j)) + + def run(self): + tdSql.prepare() + + tdSql.execute('''create table stb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, + col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''') + tdSql.execute("create table stb_1 using stb tags('beijing')") + # tdSql.execute("insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1)) + + # # diff verifacation + # tdSql.query("select diff(col1) from stb_1") + # tdSql.checkRows(0) + + # tdSql.query("select diff(col2) from stb_1") + # tdSql.checkRows(0) + + # tdSql.query("select diff(col3) from stb_1") + # tdSql.checkRows(0) + + # tdSql.query("select diff(col4) from stb_1") + # tdSql.checkRows(0) + + # tdSql.query("select diff(col5) from stb_1") + # tdSql.checkRows(0) + + # tdSql.query("select diff(col6) from stb_1") + # tdSql.checkRows(0) + + for i in range(self.rowNum): + tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" + % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1)) + + tdSql.error("select diff(ts) from stb") + tdSql.error("select diff(ts) from stb_1") + tdSql.error("select diff(col1) from stb") + tdSql.error("select diff(col2) from stb") + tdSql.error("select diff(col3) from stb") + tdSql.error("select diff(col4) from stb") + tdSql.error("select diff(col5) from stb") + tdSql.error("select diff(col6) from stb") + tdSql.error("select diff(col7) from stb") + tdSql.error("select diff(col7) from stb_1") + tdSql.error("select diff(col8) from stb") + tdSql.error("select diff(col8) from stb_1") + tdSql.error("select diff(col9) from stb") + tdSql.error("select diff(col9) from stb_1") + tdSql.error("select diff(col11) from stb_1") + tdSql.error("select diff(col12) from stb_1") + tdSql.error("select diff(col13) from stb_1") + tdSql.error("select diff(col14) from stb_1") + tdSql.error("select diff(col11) from stb") + tdSql.error("select diff(col12) from stb") + tdSql.error("select diff(col13) from stb") + tdSql.error("select diff(col14) from stb") + + tdSql.query("select ts,diff(col1),ts from stb_1") + tdSql.checkRows(10) + tdSql.checkData(0, 0, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 1, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 3, "2018-09-17 09:00:00.000") + tdSql.checkData(9, 0, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 1, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 3, "2018-09-17 09:00:00.009") + + tdSql.query("select ts,diff(col1),ts from stb group by tbname") + tdSql.checkRows(10) + tdSql.checkData(0, 0, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 1, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 3, "2018-09-17 09:00:00.000") + tdSql.checkData(9, 0, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 1, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 3, "2018-09-17 09:00:00.009") + + tdSql.query("select ts,diff(col1),ts from stb_1") + tdSql.checkRows(10) + tdSql.checkData(0, 0, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 1, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 3, "2018-09-17 09:00:00.000") + tdSql.checkData(9, 0, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 1, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 3, "2018-09-17 09:00:00.009") + + tdSql.query("select ts,diff(col1),ts from stb group by tbname") + tdSql.checkRows(10) + tdSql.checkData(0, 0, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 1, "2018-09-17 09:00:00.000") + tdSql.checkData(0, 3, "2018-09-17 09:00:00.000") + tdSql.checkData(9, 0, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 1, "2018-09-17 09:00:00.009") + tdSql.checkData(9, 3, "2018-09-17 09:00:00.009") + + tdSql.query("select diff(col1) from stb_1") + tdSql.checkRows(10) + + tdSql.query("select diff(col2) from stb_1") + tdSql.checkRows(10) + + tdSql.query("select diff(col3) from stb_1") + tdSql.checkRows(10) + + tdSql.query("select diff(col4) from stb_1") + tdSql.checkRows(10) + + tdSql.query("select diff(col5) from stb_1") + tdSql.checkRows(10) + + tdSql.query("select diff(col6) from stb_1") + tdSql.checkRows(10) + + self.insertData() + + tdSql.query("select diff(col) from st group by tbname") + tdSql.checkRows(185) + + tdSql.error("select diff(col) from st group by dev") + + tdSql.error("select diff(col) from st group by col") + + 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 From 00c0f455f326dee9b083eb4886725b5cec187267 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sat, 7 May 2022 16:22:11 +0800 Subject: [PATCH 2/5] update --- tests/system-test/2-query/diff.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/system-test/2-query/diff.py b/tests/system-test/2-query/diff.py index 696366428b..82c450771f 100644 --- a/tests/system-test/2-query/diff.py +++ b/tests/system-test/2-query/diff.py @@ -31,26 +31,26 @@ class TDTestCase: tdSql.execute('''create table stb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''') tdSql.execute("create table stb_1 using stb tags('beijing')") - # tdSql.execute("insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1)) + tdSql.execute("insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1)) - # # diff verifacation - # tdSql.query("select diff(col1) from stb_1") - # tdSql.checkRows(0) + # diff verifacation + tdSql.query("select diff(col1) from stb_1") + tdSql.checkRows(0) - # tdSql.query("select diff(col2) from stb_1") - # tdSql.checkRows(0) + tdSql.query("select diff(col2) from stb_1") + tdSql.checkRows(0) - # tdSql.query("select diff(col3) from stb_1") - # tdSql.checkRows(0) + tdSql.query("select diff(col3) from stb_1") + tdSql.checkRows(0) - # tdSql.query("select diff(col4) from stb_1") - # tdSql.checkRows(0) + tdSql.query("select diff(col4) from stb_1") + tdSql.checkRows(0) - # tdSql.query("select diff(col5) from stb_1") - # tdSql.checkRows(0) + tdSql.query("select diff(col5) from stb_1") + tdSql.checkRows(0) - # tdSql.query("select diff(col6) from stb_1") - # tdSql.checkRows(0) + tdSql.query("select diff(col6) from stb_1") + tdSql.checkRows(0) for i in range(self.rowNum): tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" From 714ab7b5aa940160369ac7bcb6d55338bcfc8664 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sat, 7 May 2022 16:28:09 +0800 Subject: [PATCH 3/5] update test case --- tests/system-test/2-query/Timediff.py | 11 ++++++++++- tests/system-test/fulltest.sh | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/system-test/2-query/Timediff.py b/tests/system-test/2-query/Timediff.py index 2824fea5a2..ad64d29007 100644 --- a/tests/system-test/2-query/Timediff.py +++ b/tests/system-test/2-query/Timediff.py @@ -181,7 +181,16 @@ class TDTestCase: tdSql.error("select timediff(10,1,1.5) from stb") # tdSql.error("select timediff(10,1,2s) from stb") # tdSql.error("select timedifff(10,1,c1) from stb") - + tdSql.error("select timediff(1.5,1.5) from stb_1") + tdSql.error("select timediff(1) from stb_1") + tdSql.error("select timediff(10,1,1.5) from stb_1") + # tdSql.error("select timediff(10,1,2s) from stb_1") + # tdSql.error("select timedifff(10,1,c1) from stb_1") + tdSql.error("select timediff(1.5,1.5) from ntb") + tdSql.error("select timediff(1) from ntb") + tdSql.error("select timediff(10,1,1.5) from ntb") + # tdSql.error("select timediff(10,1,2s) from ntb") + # tdSql.error("select timedifff(10,1,c1) from ntb") diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 22dc59365a..cb9d472116 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -23,7 +23,8 @@ python3 ./test.py -f 2-query/last.py python3 ./test.py -f 2-query/To_unixtimestamp.py python3 ./test.py -f 2-query/timetruncate.py -# python3 ./test.py -f 2-query/Timediff.py +python3 ./test.py -f 2-query/Timediff.py +# python3 ./test.py -f 2-query/diff.py #python3 ./test.py -f 2-query/cast.py From 47b8027ac196377b3cf89fc3dc626d34c514d114 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sat, 7 May 2022 16:31:58 +0800 Subject: [PATCH 4/5] update last.py --- tests/system-test/2-query/last.py | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/system-test/2-query/last.py b/tests/system-test/2-query/last.py index b5c0498e40..531afd0117 100644 --- a/tests/system-test/2-query/last.py +++ b/tests/system-test/2-query/last.py @@ -21,12 +21,12 @@ class TDTestCase: tdSql.execute("insert into stb_1(ts) values(%d)" % (self.ts - 1)) # last verifacation - # tdSql.query("select last(*) from stb_1") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, None) - # tdSql.query("select last(*) from db.stb_1") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, None) + tdSql.query("select last(*) from stb_1") + tdSql.checkRows(1) + tdSql.checkData(0, 1, None) + tdSql.query("select last(*) from db.stb_1") + tdSql.checkRows(1) + tdSql.checkData(0, 1, None) tdSql.query("select last(col1) from stb_1") tdSql.checkRows(0) tdSql.query("select last(col1) from db.stb_1") @@ -86,12 +86,12 @@ class TDTestCase: tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1)) - # tdSql.query("select last(*) from stb_1") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, 10) - # tdSql.query("select last(*) from db.stb_1") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, 10) + tdSql.query("select last(*) from stb_1") + tdSql.checkRows(1) + tdSql.checkData(0, 1, 10) + tdSql.query("select last(*) from db.stb_1") + tdSql.checkRows(1) + tdSql.checkData(0, 1, 10) tdSql.query("select last(col1) from stb_1") tdSql.checkRows(1) tdSql.checkData(0, 0, 10) @@ -175,12 +175,12 @@ class TDTestCase: tdSql.execute('''create table ntb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned)''') tdSql.execute("insert into ntb(ts) values(%d)" % (self.ts - 1)) - # tdSql.query("select last(*) from ntb") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, None) - # tdSql.query("select last(*) from db.ntb") - # tdSql.checkRows(1) - # tdSql.checkData(0, 1, None) + tdSql.query("select last(*) from ntb") + tdSql.checkRows(1) + tdSql.checkData(0, 1, None) + tdSql.query("select last(*) from db.ntb") + tdSql.checkRows(1) + tdSql.checkData(0, 1, None) tdSql.query("select last(col1) from ntb") tdSql.checkRows(0) tdSql.query("select last(col1) from db.ntb") From bb6a7855fbe199fe709aaddf291b1f70d2c4b159 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sat, 7 May 2022 16:32:44 +0800 Subject: [PATCH 5/5] update --- tests/system-test/2-query/last.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/system-test/2-query/last.py b/tests/system-test/2-query/last.py index 531afd0117..b491679c62 100644 --- a/tests/system-test/2-query/last.py +++ b/tests/system-test/2-query/last.py @@ -316,12 +316,12 @@ class TDTestCase: tdSql.query("select last(col8) from db.ntb") tdSql.checkRows(1) tdSql.checkData(0, 0, 'taosdata10') - # tdSql.query("select last(col9) from ntb") - # tdSql.checkRows(1) - # tdSql.checkData(0, 0, '涛思数据10') - # tdSql.query("select last(col9) from db.ntb") - # tdSql.checkRows(1) - # tdSql.checkData(0, 0, '涛思数据10') + tdSql.query("select last(col9) from ntb") + tdSql.checkRows(1) + tdSql.checkData(0, 0, '涛思数据10') + tdSql.query("select last(col9) from db.ntb") + tdSql.checkRows(1) + tdSql.checkData(0, 0, '涛思数据10') def stop(self): tdSql.close()