From b22ce4c9fe10274304b3c267d42614311c02c0dd Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Tue, 26 Apr 2022 14:48:33 +0800 Subject: [PATCH 1/8] update --- tests/system-test/2-query/Now.py | 11 +++++++++++ tests/system-test/2-query/timezone.py | 1 + 2 files changed, 12 insertions(+) diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index 7f0e173439..7ad8a22720 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -122,6 +122,17 @@ class TDTestCase: tdSql.checkRows(0) tdSql.query("select now() from ntb where ts=today()") tdSql.checkRows(1) + tdSql.query("select now()+1 from ntb") + tdSql.checkRows(3) + tdSql.query("select now()+9223372036854775807 from ntb") + tdSql.checkRows(3) + tdSql.query("select now()+1.5 from ntb") + tdSql.checkRows(3) + + + tdSql.error("select now()+'abc' from ntb") + tdSql.error("select now()+abc from ntb") + # stable tdSql.query("select now() from stb") diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index a273b1c0f8..36045fac5e 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -73,6 +73,7 @@ class TDTestCase: tdSql.checkRows(2) tdSql.query("select timezone()+1 from ntb") tdSql.checkRows(2) + tdSql.query("select timezone()+1.5 from ntb") def stop(self): tdSql.close() From 24ac70fc4122ee3ddaf98a29a8ceef1f5ce13f5e Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 27 Apr 2022 08:31:11 +0800 Subject: [PATCH 2/8] update --- tests/pytest/util/sql.py | 2 + tests/system-test/2-query/Now.py | 75 ++++++++++++++++++++++++++- tests/system-test/2-query/timezone.py | 2 + 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py index 4a3ccff08a..19a5d3ecc1 100644 --- a/tests/pytest/util/sql.py +++ b/tests/pytest/util/sql.py @@ -16,6 +16,7 @@ import os import time import datetime import inspect +import traceback import psutil import shutil import pandas as pd @@ -88,6 +89,7 @@ class TDSql: caller = inspect.getframeinfo(inspect.stack()[1][0]) args = (caller.filename, caller.lineno, sql, repr(e)) tdLog.notice("%s(%d) failed: sql:%s, %s" % args) + traceback.print_exc() raise Exception(repr(e)) if row_tag: return self.queryResult diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index 7ad8a22720..f5c9027707 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -1,5 +1,6 @@ +import traceback from util.dnodes import * from util.log import * from util.sql import * @@ -111,32 +112,66 @@ class TDTestCase: tdSql.query("select * from ntb where ts=now()") tdSql.checkRows(0) + tdSql.query("select * from db.ntb where ts>=now()") + tdSql.checkRows(0) tdSql.query("select * from ntb where ts>now()") tdSql.checkRows(0) + tdSql.query("select * from db.ntb where ts>now()") + tdSql.checkRows(0) tdSql.query("select now() from ntb where ts=today()") tdSql.checkRows(1) + tdSql.query("select now() from db.ntb where ts=today()") + tdSql.checkRows(1) tdSql.query("select now()+1 from ntb") tdSql.checkRows(3) - tdSql.query("select now()+9223372036854775807 from ntb") + tdSql.query("select now()+1 from db.ntb") tdSql.checkRows(3) + # tdSql.query("select now()+9223372036854775807 from ntb") + # tdSql.checkRows(3) + tdSql.query("select now()+1.5 from ntb") tdSql.checkRows(3) + tdSql.query("select now()+1.5 from db.ntb") + tdSql.checkRows(3) tdSql.error("select now()+'abc' from ntb") + tdSql.error("select now()+'abc' from db.ntb") tdSql.error("select now()+abc from ntb") + tdSql.error("select now()+abc from db.ntb") + tdSql.error("select now()+! from ntb") + tdSql.error("select now()+! from db.ntb") + # tdSql.error("select now()+null from ntb") + # tdSql.error("select now()+null from db.ntb") + # tdSql.error("select now()-null from ntb") + # tdSql.error("select now()-null from db.ntb") + # tdSql.error("select now()*null from ntb") + # tdSql.error("select now()*null from db.ntb") + # tdSql.error("select now()/null from ntb") + # tdSql.error("select now()/null from db.ntb") + tdSql.error("select now() +today() from ntb") + tdSql.error("select now() +today() from db.ntb") - # stable tdSql.query("select now() from stb") tdSql.checkRows(3) + tdSql.query("select now() from db.stb") + tdSql.checkRows(3) tdSql.query("select now() +1w from stb") tdSql.checkRows(3) tdSql.query("select now() +1w from db.stb") @@ -209,16 +244,33 @@ class TDTestCase: # tdSql.checkData(2,1,1) tdSql.query("select c1 from stb where ts=now()") tdSql.checkRows(0) + tdSql.query("select c1 from db.stb where ts=now()") + tdSql.checkRows(0) # tdSql.query("select * from stb where ts>=now()") # tdSql.checkRows(0) # tdSql.query("select * from stb where ts>now()") # tdSql.checkRows(0) tdSql.query("select now() from stb where ts=today()") tdSql.checkRows(1) + tdSql.query("select now() from db.stb where ts=today()") + tdSql.checkRows(1) + tdSql.query("select now() +1 from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1 from db.stb") + tdSql.checkRows(3) + + tdSql.error("select now() +'abc' from stb") + tdSql.error("select now() +'abc' from db.stb") + tdSql.error("select now() + ! from stb") + tdSql.error("select now() + ! from db.stb") + tdSql.error("select now() + today() from stb") + tdSql.error("select now() + today() from db.stb") # table tdSql.query("select now() from stb_1") tdSql.checkRows(3) + tdSql.query("select now() from db.stb_1") + tdSql.checkRows(3) tdSql.query("select now() +1w from stb_1") tdSql.checkRows(3) tdSql.query("select now() +1w from db.stb_1") @@ -286,15 +338,27 @@ class TDTestCase: tdSql.query("select * from stb_1 where ts=now()") tdSql.checkRows(0) + tdSql.query("select * from db.stb_1 where ts>=now()") + tdSql.checkRows(0) tdSql.query("select * from stb_1 where ts>now()") tdSql.checkRows(0) + tdSql.query("select * from db.stb_1 where ts>now()") + tdSql.checkRows(0) # tdSql.query("select * from stb_1 where ts Date: Wed, 27 Apr 2022 10:41:50 +0800 Subject: [PATCH 3/8] update testcase --- tests/system-test/2-query/Now.py | 65 +++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index f5c9027707..3bdf468136 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -1,6 +1,4 @@ - -import traceback from util.dnodes import * from util.log import * from util.sql import * @@ -156,14 +154,24 @@ class TDTestCase: tdSql.error("select now()+abc from db.ntb") tdSql.error("select now()+! from ntb") tdSql.error("select now()+! from db.ntb") - # tdSql.error("select now()+null from ntb") - # tdSql.error("select now()+null from db.ntb") - # tdSql.error("select now()-null from ntb") - # tdSql.error("select now()-null from db.ntb") - # tdSql.error("select now()*null from ntb") - # tdSql.error("select now()*null from db.ntb") - # tdSql.error("select now()/null from ntb") - # tdSql.error("select now()/null from db.ntb") + + tdSql.query("select now()+null from ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()+null from db.ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from db.ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from db.ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from ntb") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from db.ntb") + tdSql.checkData(0,0,None) + tdSql.error("select now() +today() from ntb") tdSql.error("select now() +today() from db.ntb") @@ -265,6 +273,25 @@ class TDTestCase: tdSql.error("select now() + ! from db.stb") tdSql.error("select now() + today() from stb") tdSql.error("select now() + today() from db.stb") + tdSql.error("select now() -today() from stb") + tdSql.error("select now() - today() from db.stb") + + tdSql.query("select now()+null from stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()+null from db.stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from db.stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from db.stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from stb") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from db.stb") + tdSql.checkData(0,0,None) # table tdSql.query("select now() from stb_1") @@ -382,7 +409,25 @@ class TDTestCase: tdSql.error("select now() + ! from db.stb_1") tdSql.error("select now() + today() from stb_1") tdSql.error("select now() + today() from db.stb_1") + tdSql.error("select now() - today() from stb_1") + tdSql.error("select now()-today() from db.stb_1") + tdSql.query("select now()+null from stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()+null from db.stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()-null from db.stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()*null from db.stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from stb_1") + tdSql.checkData(0,0,None) + tdSql.query("select now()/null from db.stb_1") + tdSql.checkData(0,0,None) def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") From 3810e5e0c02abc8ad3c4c6311d821bb143f07422 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 27 Apr 2022 14:52:01 +0800 Subject: [PATCH 4/8] update --- tests/system-test/2-query/timezone.py | 55 ++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index e35ac1390d..32b27ade65 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -45,20 +45,15 @@ class TDTestCase: tdSql.query("select timezone() from ntb") tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) - - - tdSql.query("select timezone() from db.ntb") tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) - tdSql.query("select timezone() from stb") tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) tdSql.query("select timezone() from db.stb") tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) - tdSql.query("select timezone() from stb_1") tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) @@ -66,17 +61,65 @@ class TDTestCase: tdSql.checkRows(2) tdSql.checkData(0, 0, time_zone) + tdSql.error("select timezone(1) from stb") + tdSql.error("select timezone(1) from db.stb") tdSql.error("select timezone(1) from ntb") + tdSql.error("select timezone(1) from db.ntb") + tdSql.error("select timezone(1) from stb_1") + tdSql.error("select timezone(1) from db.stb_1") tdSql.error("select timezone(now()) from stb") + tdSql.error("select timezone(now()) from db.stb") tdSql.query(f"select * from ntb where timezone()='{time_zone}'") tdSql.checkRows(2) tdSql.query("select timezone()+1 from ntb") tdSql.checkRows(2) tdSql.query("select timezone()+1.5 from ntb") + tdSql.checkRows(2) + tdSql.query("select timezone()-100 from ntb") + tdSql.checkRows(2) + tdSql.query("select timezone()*100 from ntb") + tdSql.checkRows(2) + tdSql.query("select timezone()/10 from ntb") + + tdSql.query("select timezone()+null from ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()-null from ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()*null from ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()/null from ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) # tdSql.query("select timezone()") - + tdSql.query("select timezone()+null from stb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()-null from stb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()*null from stb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()/null from stb") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()+null from stb_1") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()-null from stb_1") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()*null from stb_1") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) + tdSql.query("select timezone()/null from stb_1") + tdSql.checkRows(2) + tdSql.checkData(0,0,None) def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") From f09dfc1d837c65e70e22ce1405cd76e283d1d2dc Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 27 Apr 2022 17:34:20 +0800 Subject: [PATCH 5/8] update --- tests/system-test/2-query/To_iso8061.py | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/tests/system-test/2-query/To_iso8061.py b/tests/system-test/2-query/To_iso8061.py index fca53572ca..86322ed076 100644 --- a/tests/system-test/2-query/To_iso8061.py +++ b/tests/system-test/2-query/To_iso8061.py @@ -67,6 +67,75 @@ class TDTestCase: tdSql.error("select to_iso8601(timezone()) from ntb") tdSql.error("select to_iso8601('abc') from ntb") + tdSql.query("select to_iso8601(today()) *null from ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) +null from ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) -null from ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) /null from ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + + tdSql.query("select to_iso8601(today()) *null from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) +null from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) -null from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) /null from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + + + + + tdSql.query("select to_iso8601(now) from stb") + tdSql.query("select to_iso8601(now()) from stb") + tdSql.checkRows(3) + for i in range(1,10): + tdSql.query("select to_iso8601(1) from stb") + tdSql.checkData(0,0,"1970-01-01T08:00:01+0800") + i+=1 + sleep(0.2) + tdSql.checkRows(3) + tdSql.query("select to_iso8601(ts) from stb") + tdSql.checkRows(3) + tdSql.query("select to_iso8601(ts)+1 from stb") + tdSql.checkRows(3) + tdSql.query("select to_iso8601(ts)+'a' from stb ") + tdSql.checkRows(3) + # tdSql.query() + tdSql.query("select to_iso8601(today()) *null from stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) +null from stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) -null from stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) /null from stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) *null from db.stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) +null from db.stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) -null from db.stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) + tdSql.query("select to_iso8601(today()) /null from db.stb") + tdSql.checkRows(3) + tdSql.checkData(0,0,None) From f27766331fba9128c24d79a88160c4b5a5f7264d Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Thu, 28 Apr 2022 08:40:50 +0800 Subject: [PATCH 6/8] update --- tests/system-test/2-query/timezone.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 32b27ade65..cc03dac74c 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -74,13 +74,26 @@ class TDTestCase: tdSql.checkRows(2) tdSql.query("select timezone()+1 from ntb") tdSql.checkRows(2) + tdSql.query("select timezone()+1 from db.ntb") + tdSql.checkRows(2) + tdSql.query("select timezone()+1 from stb") + tdSql.checkRows(2) + tdSql.query("select timezone()+1 from db.stb") + tdSql.checkRows(2) + tdSql.query("select timezone()+1 from stb_1") + tdSql.checkRows(2) + tdSql.query("select timezone()+1 from db.stb_1") + tdSql.checkRows(2) tdSql.query("select timezone()+1.5 from ntb") tdSql.checkRows(2) + tdSql.query("select timezone()+1.5 from db.ntb") + tdSql.checkRows(2) tdSql.query("select timezone()-100 from ntb") tdSql.checkRows(2) tdSql.query("select timezone()*100 from ntb") tdSql.checkRows(2) tdSql.query("select timezone()/10 from ntb") + tdSql.query("select timezone()/0 from ntb") tdSql.query("select timezone()+null from ntb") From 9632993e4e766ba1764809127f3f311cef348902 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Thu, 28 Apr 2022 09:18:38 +0800 Subject: [PATCH 7/8] update test case for now --- tests/system-test/2-query/Now.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index 3bdf468136..a6635b5fe5 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -142,10 +142,10 @@ class TDTestCase: # tdSql.query("select now()+9223372036854775807 from ntb") # tdSql.checkRows(3) - tdSql.query("select now()+1.5 from ntb") - tdSql.checkRows(3) - tdSql.query("select now()+1.5 from db.ntb") - tdSql.checkRows(3) + tdSql.error("select now()+1.5 from ntb") + + tdSql.error("select now()+1.5 from db.ntb") + tdSql.error("select now()+'abc' from ntb") From 98ced775ca8ef6050075f101064ac633bbe54f1f Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Thu, 28 Apr 2022 09:27:49 +0800 Subject: [PATCH 8/8] update testcase --- tests/system-test/2-query/Now.py | 4 ---- tests/system-test/2-query/timezone.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index a6635b5fe5..99fca2e88d 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -143,11 +143,7 @@ class TDTestCase: # tdSql.checkRows(3) tdSql.error("select now()+1.5 from ntb") - tdSql.error("select now()+1.5 from db.ntb") - - - tdSql.error("select now()+'abc' from ntb") tdSql.error("select now()+'abc' from db.ntb") tdSql.error("select now()+abc from ntb") diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index cc03dac74c..1f3dac90c6 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -93,7 +93,7 @@ class TDTestCase: tdSql.query("select timezone()*100 from ntb") tdSql.checkRows(2) tdSql.query("select timezone()/10 from ntb") - tdSql.query("select timezone()/0 from ntb") + # tdSql.query("select timezone()/0 from ntb") tdSql.query("select timezone()+null from ntb")