From dba7c68de10e9b92a2aadd93cb2474a4d423c8c3 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Tue, 22 Aug 2023 15:41:04 +0800 Subject: [PATCH 1/3] test: add test cases for timeline function used for select * union query --- tests/system-test/2-query/union.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/system-test/2-query/union.py b/tests/system-test/2-query/union.py index 82dcfe12e6..96c29a2222 100644 --- a/tests/system-test/2-query/union.py +++ b/tests/system-test/2-query/union.py @@ -231,6 +231,31 @@ class TDTestCase: tdSql.execute(f"{sqls[j+i]} union {sqls[i]}") else: tdSql.error(f"{sqls[i]} union {sqls[j+i]}") + # check union with timeline function + tdSql.query(f"select first(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 9) + tdSql.query(f"select last(c1) from (select * from t1 union select * from t1 order by ts desc)") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 2147450880) + tdSql.query(f"select irate(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 9.102222222222222) + tdSql.query(f"select elapsed(ts) from (select * from t1 union select * from t1 order by ts)") + tdSql.checkRows(1) + tdSql.checkData(0, 0, 46800000.000000000000000) + tdSql.query(f"select diff(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.checkRows(14) + tdSql.query(f"select derivative(c1, 1s, 0) from (select * from t1 union select * from t1 order by ts)") + tdSql.checkRows(11) + + tdSql.error(f"select first(c1) from (select * from t1 union select * from t1)") + tdSql.error(f"select last(c1) from (select * from t1 union select * from t1)") + tdSql.error(f"select irate(c1) from (select * from t1 union select * from t1)") + tdSql.error(f"select elapsed(ts) from (select * from t1 union select * from t1)") + tdSql.error(f"select diff(c1) from (select * from t1 union select * from t1)") + tdSql.error(f"select derivative(c1, 1s, 0) from (select * from t1 union select * from t1)") + def __test_error(self, dbname="db"): From 502788215b07ba0e0c7d016ecfe3e04c675a6d78 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Tue, 22 Aug 2023 17:32:36 +0800 Subject: [PATCH 2/3] fix error --- tests/system-test/2-query/union.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/system-test/2-query/union.py b/tests/system-test/2-query/union.py index 96c29a2222..e359164a4f 100644 --- a/tests/system-test/2-query/union.py +++ b/tests/system-test/2-query/union.py @@ -231,30 +231,31 @@ class TDTestCase: tdSql.execute(f"{sqls[j+i]} union {sqls[i]}") else: tdSql.error(f"{sqls[i]} union {sqls[j+i]}") + # check union with timeline function - tdSql.query(f"select first(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.query(f"select first(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts)") tdSql.checkRows(1) tdSql.checkData(0, 0, 9) - tdSql.query(f"select last(c1) from (select * from t1 union select * from t1 order by ts desc)") + tdSql.query(f"select last(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts desc)") tdSql.checkRows(1) tdSql.checkData(0, 0, 2147450880) - tdSql.query(f"select irate(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.query(f"select irate(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts)") tdSql.checkRows(1) tdSql.checkData(0, 0, 9.102222222222222) - tdSql.query(f"select elapsed(ts) from (select * from t1 union select * from t1 order by ts)") + tdSql.query(f"select elapsed(ts) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts)") tdSql.checkRows(1) tdSql.checkData(0, 0, 46800000.000000000000000) - tdSql.query(f"select diff(c1) from (select * from t1 union select * from t1 order by ts)") + tdSql.query(f"select diff(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts)") tdSql.checkRows(14) - tdSql.query(f"select derivative(c1, 1s, 0) from (select * from t1 union select * from t1 order by ts)") + tdSql.query(f"select derivative(c1, 1s, 0) from (select * from {dbname}.t1 union select * from {dbname}.t1 order by ts)") tdSql.checkRows(11) - tdSql.error(f"select first(c1) from (select * from t1 union select * from t1)") - tdSql.error(f"select last(c1) from (select * from t1 union select * from t1)") - tdSql.error(f"select irate(c1) from (select * from t1 union select * from t1)") - tdSql.error(f"select elapsed(ts) from (select * from t1 union select * from t1)") - tdSql.error(f"select diff(c1) from (select * from t1 union select * from t1)") - tdSql.error(f"select derivative(c1, 1s, 0) from (select * from t1 union select * from t1)") + tdSql.error(f"select first(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1)") + tdSql.error(f"select last(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1)") + tdSql.error(f"select irate(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1)") + tdSql.error(f"select elapsed(ts) from (select * from {dbname}.t1 union select * from {dbname}.t1)") + tdSql.error(f"select diff(c1) from (select * from {dbname}.t1 union select * from {dbname}.t1)") + tdSql.error(f"select derivative(c1, 1s, 0) from (select * from {dbname}.t1 union select * from {dbname}.t1)") def __test_error(self, dbname="db"): From bae7bee3896fa04587c8250331dbd64e55bb690d Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 23 Aug 2023 23:59:24 +0800 Subject: [PATCH 3/3] fix error --- tests/system-test/2-query/union.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/2-query/union.py b/tests/system-test/2-query/union.py index e359164a4f..9086d7754d 100644 --- a/tests/system-test/2-query/union.py +++ b/tests/system-test/2-query/union.py @@ -191,7 +191,7 @@ class TDTestCase: if tdSql.cursor.istype(col, "BIGINT UNSIGNED"): return "BIGINT UNSIGNED" - def union_check(self): + def union_check(self, dbname = "db"): sqls = self.sql_list() for i in range(len(sqls)): tdSql.query(sqls[i])