From af8d8bd330e2f6a902f5acf7faae3e376fec88b1 Mon Sep 17 00:00:00 2001 From: zhaoyanggh Date: Wed, 20 Apr 2022 08:38:01 +0800 Subject: [PATCH 01/23] add timezong.py --- tests/system-test/2-query/timezone.py | 109 ++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 tests/system-test/2-query/timezone.py diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py new file mode 100644 index 0000000000..24b4855f4d --- /dev/null +++ b/tests/system-test/2-query/timezone.py @@ -0,0 +1,109 @@ +from tarfile import SYMTYPE +from time import sleep +from tkinter import E +import taos +import sys + +from util.log import * +from util.sql import * +from util.cases import * + + + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + + def run(self): # sourcery skip: extract-duplicate-method + tdSql.prepare() + + tdLog.printNoPrefix("==========step1:create normal table") + tdSql.execute( + '''create table if not exists normaltb + (ts timestamp, c1 int, c2 float,c3 double) + ''' + ) + tdLog.printNoPrefix("==========step2:insert data") + + tdSql.execute("insert into normaltb values(now,1,1.55,100.555555)") + tdSql.query("select timezone() from normaltb") + tdSql.checkRows(1) + + tdSql.execute("insert into normaltb values(now(),2,2.222,222.222222)") + tdSql.query("select timezone() from normaltb") + tdSql.checkRows(2) + + tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") + + tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") + tdSql.query("select * from normaltb where ts=today()") + tdSql.checkRows(1) + tdSql.checkData(0,1,3) + for i in range(0,50): + tdSql.query("select timezone() from db.normaltb") + tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + i+=1 + sleep(0.5) + + + tdSql.query("select now() from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1h from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1m from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1s from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1a from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1u from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1b from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from normaltb") + tdSql.checkRows(3) + + tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") + tdSql.execute("create table stb_1 using stb tags(1)") + tdSql.execute("insert into stb_1 values(now(),1000)") + + # tdSql.query("select timezone() from stb") + # tdSql.checkRows(1) + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + + + + + + + + + # tdSql.execute() + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) From 725f345890abaf0f733dd34b2096ca810ede90a4 Mon Sep 17 00:00:00 2001 From: zhaoyanggh Date: Wed, 20 Apr 2022 09:58:21 +0800 Subject: [PATCH 02/23] test --- tests/system-test/2-query/timezone.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 24b4855f4d..6fc5135c03 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -26,7 +26,6 @@ class TDTestCase: ''' ) tdLog.printNoPrefix("==========step2:insert data") - tdSql.execute("insert into normaltb values(now,1,1.55,100.555555)") tdSql.query("select timezone() from normaltb") tdSql.checkRows(1) @@ -35,18 +34,18 @@ class TDTestCase: tdSql.query("select timezone() from normaltb") tdSql.checkRows(2) - tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + # tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") tdSql.query("select * from normaltb where ts=today()") tdSql.checkRows(1) tdSql.checkData(0,1,3) - for i in range(0,50): - tdSql.query("select timezone() from db.normaltb") - tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - i+=1 - sleep(0.5) + # for i in range(0,50): + # tdSql.query("select timezone() from db.normaltb") + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + # i+=1 + # sleep(0.5) tdSql.query("select now() from db.normaltb") From f6c3c5d4f1d6208e55882648fc0c33daec643141 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 20 Apr 2022 10:01:50 +0800 Subject: [PATCH 03/23] test --- tests/system-test/2-query/timezone.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 6fc5135c03..c39a122854 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -34,8 +34,8 @@ class TDTestCase: tdSql.query("select timezone() from normaltb") tdSql.checkRows(2) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") + tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") tdSql.query("select * from normaltb where ts=today()") From e14570f66ff7e2ec4d6058be5794a9af5888d77f Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 20 Apr 2022 10:06:03 +0800 Subject: [PATCH 04/23] update timezone.py --- tests/system-test/2-query/timezone.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index c39a122854..dcabd4231d 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -41,11 +41,11 @@ class TDTestCase: tdSql.query("select * from normaltb where ts=today()") tdSql.checkRows(1) tdSql.checkData(0,1,3) - # for i in range(0,50): - # tdSql.query("select timezone() from db.normaltb") - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # i+=1 - # sleep(0.5) + for i in range(0,50): + tdSql.query("select timezone() from db.normaltb") + tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + i+=1 + sleep(0.5) tdSql.query("select now() from db.normaltb") From 19f0780829818319c0e5e0888b5bcc5d9668537a Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 20 Apr 2022 11:16:51 +0800 Subject: [PATCH 05/23] [TD-14487]:add test case --- tests/system-test/2-query/timezone.py | 179 ++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 12 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index dcabd4231d..71ec83a10f 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -19,13 +19,13 @@ class TDTestCase: def run(self): # sourcery skip: extract-duplicate-method tdSql.prepare() - tdLog.printNoPrefix("==========step1:create normal table") + tdLog.printNoPrefix("==========step1:create normal table==========") tdSql.execute( '''create table if not exists normaltb (ts timestamp, c1 int, c2 float,c3 double) ''' ) - tdLog.printNoPrefix("==========step2:insert data") + tdLog.printNoPrefix("==========step2:insert data==========") tdSql.execute("insert into normaltb values(now,1,1.55,100.555555)") tdSql.query("select timezone() from normaltb") tdSql.checkRows(1) @@ -34,25 +34,39 @@ class TDTestCase: tdSql.query("select timezone() from normaltb") tdSql.checkRows(2) - tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + # tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") tdSql.query("select * from normaltb where ts=today()") tdSql.checkRows(1) tdSql.checkData(0,1,3) - for i in range(0,50): - tdSql.query("select timezone() from db.normaltb") - tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - i+=1 - sleep(0.5) + # for i in range(0,50): + # tdSql.query("select timezone() from db.normaltb") + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + # i+=1 + # sleep(0.5) + tdSql.query("select today() from normaltb") + tdSql.checkRows(3) + tdSql.query("select today() from db.normaltb") + tdSql.checkRows(3) tdSql.query("select now() from db.normaltb") tdSql.checkRows(3) tdSql.query("select now() from normaltb") tdSql.checkRows(3) + tdSql.query("select now() +1w from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() +1d from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from normaltb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from db.normaltb") tdSql.checkRows(3) tdSql.query("select now() +1h from normaltb") @@ -83,14 +97,155 @@ class TDTestCase: tdSql.query("select now() +1b from normaltb") tdSql.checkRows(3) - tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") - tdSql.execute("create table stb_1 using stb tags(1)") - tdSql.execute("insert into stb_1 values(now(),1000)") + tdSql.query("select now() -1w from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1h from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1m from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1s from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1a from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1u from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from normaltb") + tdSql.checkRows(3) + + tdSql.query("select now() -1b from db.normaltb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from normaltb") + tdSql.checkRows(3) + + + + # tdLog.printNoPrefix("==========step3:create super table==========") + # tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") + # tdSql.execute("create table stb_1 using stb tags(1)") + # tdSql.execute("create table stb_2 using stb tags(2)") + + # tdLog.printNoPrefix("==========step4:insert data==========") + # tdSql.execute("insert into stb_1 values(now(),1000)") # tdSql.query("select timezone() from stb") # tdSql.checkRows(1) # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + # tdSql.execute("insert into stb_1 values(now(),1000)") + # tdSql.query("select timezone() from stb") + # tdSql.checkRows(1) + # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + + # tdSql.execute("insert into stb_2 values(now,1000)") + # tdSql.query("select timezone() from stb") + # tdSql.checkRows(2) + + # tdSql.query("select now() from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1w from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1w from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1d from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1d from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1h from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1h from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1m from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1m from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1s from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1s from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1a from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1a from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1u from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1u from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() +1b from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1b from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1w from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1w from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1d from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1d from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1h from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1h from sltb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1m from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1m from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1s from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1s from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1a from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1a from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1u from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1u from stb") + # tdSql.checkRows(3) + + # tdSql.query("select now() -1b from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1b from stb") + # tdSql.checkRows(3) + + # tdSql.execute("insert into stb_1 values(today(),100)") + # tdSql.query("select * from stb_1 where ts=today()") + # tdSql.checkRows(1) + # tdSql.checkData(0,0,100) From 496637e6d8c3260b5c1bb2706af2b340fd081e9c Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 20 Apr 2022 15:54:35 +0800 Subject: [PATCH 06/23] update timezone.py --- tests/system-test/2-query/timezone.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 71ec83a10f..a3bc3b5d6b 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -137,6 +137,12 @@ class TDTestCase: tdSql.query("select now() -1b from normaltb") tdSql.checkRows(3) + tdSql.query("select timezone() from normaltb where ts=today()") + tdSql.checkRows(1) + + # tdSql.query("select timezone() from normaltb where ts=now()") + # tdSql.checkRows(0) + # tdLog.printNoPrefix("==========step3:create super table==========") @@ -248,13 +254,6 @@ class TDTestCase: # tdSql.checkData(0,0,100) - - - - - - # tdSql.execute() - def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") From a2e0d74646cae69e504d466ed5e227f5a2e8682f Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 20 Apr 2022 17:23:50 +0800 Subject: [PATCH 07/23] update --- tests/system-test/2-query/timezone.py | 191 +++++++++++++++----------- 1 file changed, 110 insertions(+), 81 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index a3bc3b5d6b..a93ecc90c4 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -41,6 +41,7 @@ class TDTestCase: tdSql.query("select * from normaltb where ts=today()") tdSql.checkRows(1) tdSql.checkData(0,1,3) + # for bug TD-14905 # for i in range(0,50): # tdSql.query("select timezone() from db.normaltb") # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") @@ -140,118 +141,146 @@ class TDTestCase: tdSql.query("select timezone() from normaltb where ts=today()") tdSql.checkRows(1) + tdSql.query("select timezone() from normaltb where tsnow()") + # tdSql.checkRows(0) + # tdSql.query("select timezone() from normaltb where ts >=now()") + # tdSql.checkRows(0) - # tdLog.printNoPrefix("==========step3:create super table==========") - # tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") - # tdSql.execute("create table stb_1 using stb tags(1)") - # tdSql.execute("create table stb_2 using stb tags(2)") + tdLog.printNoPrefix("==========step3:create super table==========") + tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") + tdSql.execute("create table stb_1 using stb tags(1)") + # tdSql.execute("create table stb_2 using stb tags(1)") - # tdLog.printNoPrefix("==========step4:insert data==========") - # tdSql.execute("insert into stb_1 values(now(),1000)") - # tdSql.query("select timezone() from stb") - # tdSql.checkRows(1) + tdLog.printNoPrefix("==========step4:insert data==========") + tdSql.execute("insert into stb_1 values(now(),1000)") + tdSql.query("select timezone() from stb") + tdSql.checkRows(1) # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # tdSql.execute("insert into stb_1 values(now(),1000)") + tdSql.query("select timezone() from stb where ts<=now()") + tdSql.checkRows(1) + tdSql.query("select timezone() from stb where ts=now()") + # tdSql.checkRows(0) + # tdSql.query("select timezone() from stb where ts>now()") + # tdSql.checkRows(0) + + tdSql.execute("insert into stb_1 values(now(),1000)") # tdSql.query("select timezone() from stb") - # tdSql.checkRows(1) + # tdSql.checkRows(2) # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") # tdSql.execute("insert into stb_2 values(now,1000)") # tdSql.query("select timezone() from stb") - # tdSql.checkRows(2) - - # tdSql.query("select now() from stb") # tdSql.checkRows(3) - # tdSql.query("select now() +1w from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1w from stb") - # tdSql.checkRows(3) + tdSql.query("select now() from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1d from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1d from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1h from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1h from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1m from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1m from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1s from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1s from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1a from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1a from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1u from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1u from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from stb") + tdSql.checkRows(3) - # tdSql.query("select now() +1b from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() +1b from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1w from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1w from stb") - # tdSql.checkRows(3) + tdSql.query("select now() +1b from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1d from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1d from stb") - # tdSql.checkRows(3) + tdSql.query("select now() -1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1h from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1h from sltb") - # tdSql.checkRows(3) + tdSql.query("select now() -1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1m from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1m from stb") - # tdSql.checkRows(3) + tdSql.query("select now() -1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1s from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1s from stb") - # tdSql.checkRows(3) + tdSql.query("select now() -1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from stb") + tdSql.checkRows(3) - # tdSql.query("select now() -1a from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1a from stb") - # tdSql.checkRows(3) + tdSql.query("select now() -1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from stb") + tdSql.checkRows(3) + + tdSql.query("select now() -1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from stb") + tdSql.checkRows(3) + + tdSql.query("select now() -1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from stb") + tdSql.checkRows(3) + + tdSql.query("select now() -1b from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from stb") + tdSql.checkRows(3) + + tdSql.execute("insert into stb_1 values(today(),100)") + tdSql.query("select * from stb_1 where ts=today()") + tdSql.checkRows(1) + tdSql.checkData(0,1,100) + + # tdSql.execute() - # tdSql.query("select now() -1u from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1u from stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1b from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select now() -1b from stb") - # tdSql.checkRows(3) - # tdSql.execute("insert into stb_1 values(today(),100)") - # tdSql.query("select * from stb_1 where ts=today()") - # tdSql.checkRows(1) - # tdSql.checkData(0,0,100) def stop(self): From 5d5b2f2a361bd480c327a748d9e6f6cb059cbc72 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Thu, 21 Apr 2022 17:34:37 +0800 Subject: [PATCH 08/23] update cases --- tests/system-test/2-query/NowandToday.py | 560 +++++++++++++++++++++++ tests/system-test/2-query/timezone.py | 275 ++--------- 2 files changed, 587 insertions(+), 248 deletions(-) create mode 100644 tests/system-test/2-query/NowandToday.py diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py new file mode 100644 index 0000000000..8265243646 --- /dev/null +++ b/tests/system-test/2-query/NowandToday.py @@ -0,0 +1,560 @@ +from tarfile import SYMTYPE +from time import sleep +from tkinter import E +import taos +import sys + +from util.log import * +from util.sql import * +from util.cases import * + + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + + def run(self): # sourcery skip: extract-duplicate-method + # for func now() , today(), timezone() + tdSql.prepare() + today_date = datetime.datetime.strptime( + datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d") + + tdLog.printNoPrefix("==========step1:create tables==========") + tdSql.execute( + '''create table if not exists ntb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) + ''' + ) + tdSql.execute( + '''create table if not exists stb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int) + ''' + ) + tdSql.execute( + '''create table if not exists stb_1 using stb tags(100) + ''' + ) + tdLog.printNoPrefix("==========step2:insert data into ntb==========") + tdSql.execute( + 'insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdSql.execute( + 'insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdLog.printNoPrefix("==========step2:query test of ntb ==========") + + # test function today() + # normal table + tdSql.query("select today() from ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() +1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(1) + tdSql.checkData(0, 1, 3) + tdSql.query("select * from ntb where ts<=today()") + tdSql.checkRows(2) + # for bug + # tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(2) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from ntb where c4=today()") + tdSql.checkRows(1) + tdSql.query("select today() from ntb where ts=today()") + # tdSql.checkRows(2) + # # tdSql.query("select * from ntb where ts>today()") + # # tdSql.checkRows(1) + # tdSql.query("select c4 from stb where c4=today()") + # tdSql.checkRows(1) + # tdSql.query("select today() from stb where ts=today()") + tdSql.checkRows(2) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from stb_1 where c4=today()") + tdSql.checkRows(1) + tdSql.query("select today() from stb_1 where ts=now()") + tdSql.checkRows(0) + tdSql.query("select * from ntb where ts>now()") + tdSql.checkRows(0) + tdSql.query("select now() from ntb where ts=today()") + tdSql.checkRows(1) + + # stable + # tdSql.query("select now() from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1w from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1w from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1d from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1d from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1h from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1h from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1m from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1m from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1s from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1s from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1a from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1a from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1u from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1u from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1b from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() +1b from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1w from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1w from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1d from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1d from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1h from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1h from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1m from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1m from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1s from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1s from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1a from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1a from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1u from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1u from db.stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1b from stb") + # tdSql.checkRows(3) + # tdSql.query("select now() -1b from db.stb") + # tdSql.checkRows(3) + # # 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) + + # table + tdSql.query("select now() from 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") + tdSql.checkRows(3) + tdSql.query("select now() +1d from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1d from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1h from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1h from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1m from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1m from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1s from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1s from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1a from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1a from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1u from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1u from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1b from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1b 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") + tdSql.checkRows(3) + tdSql.query("select now() -1d from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1d from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1h from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1h from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1m from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1m from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1s from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1s from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1a from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1a from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1u from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1u from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1b from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1b from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select * from stb_1 where ts=now()") + tdSql.checkRows(0) + tdSql.query("select * from stb_1 where ts>now()") + tdSql.checkRows(0) + tdSql.query("select now() from stb_1 where ts=today()") + tdSql.checkRows(1) + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index a93ecc90c4..8c24996336 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -17,266 +17,45 @@ class TDTestCase: tdSql.init(conn.cursor()) def run(self): # sourcery skip: extract-duplicate-method + # for func now() , today(), timezone() tdSql.prepare() - tdLog.printNoPrefix("==========step1:create normal table==========") + tdLog.printNoPrefix("==========step1:create tables==========") tdSql.execute( - '''create table if not exists normaltb + '''create table if not exists ntb (ts timestamp, c1 int, c2 float,c3 double) ''' ) - tdLog.printNoPrefix("==========step2:insert data==========") - tdSql.execute("insert into normaltb values(now,1,1.55,100.555555)") - tdSql.query("select timezone() from normaltb") - tdSql.checkRows(1) + tdSql.execute( + '''create table if not exists stb + (ts timestamp, c1 int, c2 float,c3 double) tags(t0 int) + ''' + ) + tdSql.execute( + '''create table if not exists stb_1 using stb tags(100) + ''' + ) - tdSql.execute("insert into normaltb values(now(),2,2.222,222.222222)") - tdSql.query("select timezone() from normaltb") + tdLog.printNoPrefix("==========step2:insert data==========") + tdSql.execute("insert into ntb values(now,10,99.99,11.111111)(today(),100,11.111,22.222222)") + tdSql.execute("insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)") + + tdLog.printNoPrefix("==========step3:query data==========") + tdSql.query("select timezone() from ntb") + tdSql.checkRows(2) + tdSql.query("select timezone() from db.ntb") tdSql.checkRows(2) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") - - tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") - tdSql.query("select * from normaltb where ts=today()") - tdSql.checkRows(1) - tdSql.checkData(0,1,3) - # for bug TD-14905 - # for i in range(0,50): - # tdSql.query("select timezone() from db.normaltb") - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # i+=1 - # sleep(0.5) - - tdSql.query("select today() from normaltb") - tdSql.checkRows(3) - tdSql.query("select today() from db.normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1w from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1d from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1h from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1m from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1s from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1a from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1u from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1b from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1w from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1d from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1h from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1m from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1s from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1a from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1u from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1b from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from normaltb") - tdSql.checkRows(3) - - tdSql.query("select timezone() from normaltb where ts=today()") - tdSql.checkRows(1) - - tdSql.query("select timezone() from normaltb where tsnow()") - # tdSql.checkRows(0) - # tdSql.query("select timezone() from normaltb where ts >=now()") - # tdSql.checkRows(0) - - - - tdLog.printNoPrefix("==========step3:create super table==========") - tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") - tdSql.execute("create table stb_1 using stb tags(1)") - # tdSql.execute("create table stb_2 using stb tags(1)") - - tdLog.printNoPrefix("==========step4:insert data==========") - tdSql.execute("insert into stb_1 values(now(),1000)") tdSql.query("select timezone() from stb") - tdSql.checkRows(1) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + tdSql.checkRows(2) + tdSql.query("select timezone() from db.stb") + tdSql.checkRows(2) - tdSql.query("select timezone() from stb where ts<=now()") - tdSql.checkRows(1) - tdSql.query("select timezone() from stb where ts=now()") - # tdSql.checkRows(0) - # tdSql.query("select timezone() from stb where ts>now()") - # tdSql.checkRows(0) - - tdSql.execute("insert into stb_1 values(now(),1000)") - # tdSql.query("select timezone() from stb") - # tdSql.checkRows(2) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - - # tdSql.execute("insert into stb_2 values(now,1000)") - # tdSql.query("select timezone() from stb") - # tdSql.checkRows(3) - - tdSql.query("select now() from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1b from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1b from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from stb") - tdSql.checkRows(3) - - tdSql.execute("insert into stb_1 values(today(),100)") - tdSql.query("select * from stb_1 where ts=today()") - tdSql.checkRows(1) - tdSql.checkData(0,1,100) - # tdSql.execute() From 0c8c955268094e2345d0456fbac6c05c7ec5247d Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Fri, 22 Apr 2022 09:19:22 +0800 Subject: [PATCH 09/23] update --- tests/system-test/2-query/NowandToday.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py index 8265243646..bc12bb45c5 100644 --- a/tests/system-test/2-query/NowandToday.py +++ b/tests/system-test/2-query/NowandToday.py @@ -3,7 +3,7 @@ from time import sleep from tkinter import E import taos import sys - +from util.dnodes import * from util.log import * from util.sql import * from util.cases import * @@ -548,6 +548,20 @@ class TDTestCase: tdSql.checkRows(0) tdSql.query("select * from stb_1 where ts>now()") tdSql.checkRows(0) + + tdSql.query("select * from stb_1 where ts=now") + tdSql.checkRows(0) + tdSql.query("select * from stb_1 where ts>now") + tdSql.checkRows(0) + tdSql.query("select now() from stb_1 where ts=today()") tdSql.checkRows(1) From 7710d88ff2bb5f5c483c9418e2fc9c0660624fbe Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Fri, 22 Apr 2022 14:10:25 +0800 Subject: [PATCH 10/23] update --- tests/system-test/2-query/NowandToday.py | 333 +++++++++++------------ 1 file changed, 166 insertions(+), 167 deletions(-) diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py index bc12bb45c5..723256be7d 100644 --- a/tests/system-test/2-query/NowandToday.py +++ b/tests/system-test/2-query/NowandToday.py @@ -134,88 +134,87 @@ class TDTestCase: tdSql.checkData(0, 0, str(today_date)) # stable - # tdSql.query("select today() from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1w from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1w from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1d from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1d from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1h from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1h from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1m from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1m from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1s from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1s from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1a from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1a from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1u from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1u from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1b from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() +1b from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1w from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1w from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1d from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1d from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1h from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1h from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1m from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1m from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1s from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1s from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1a from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1a from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1u from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1u from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1b from stb") - # tdSql.checkRows(3) - # tdSql.query("select today() -1b from db.stb") - # tdSql.checkRows(3) - # tdSql.query("select ts from stb where ts=today()") + tdSql.query("select today() from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1w from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from stb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from stb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from db.stb") + tdSql.checkRows(3) + tdSql.query("select ts from stb where ts=today()") + tdSql.checkRows(1) + tdSql.query("select ts from stb where ts<=today()") + tdSql.checkRows(2) + # + # tdSql.query("select * from ntb where ts=today()") # tdSql.checkRows(2) - # # tdSql.query("select * from ntb where ts>today()") - # # tdSql.checkRows(1) - # tdSql.query("select c4 from stb where c4=today()") + # tdSql.query("select * from ntb where ts>today()") # tdSql.checkRows(1) - # tdSql.query("select today() from 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 * from stb where ts>now()") + # tdSql.checkRows(0) + tdSql.query("select now() from stb where ts=today()") + tdSql.checkRows(1) # table tdSql.query("select now() from stb_1") @@ -549,18 +548,18 @@ class TDTestCase: tdSql.query("select * from stb_1 where ts>now()") tdSql.checkRows(0) - tdSql.query("select * from stb_1 where ts=now") - tdSql.checkRows(0) - tdSql.query("select * from stb_1 where ts>now") - tdSql.checkRows(0) + # tdSql.query("select * from stb_1 where ts=now") + # tdSql.checkRows(0) + # tdSql.query("select * from stb_1 where ts>now") + # tdSql.checkRows(0) tdSql.query("select now() from stb_1 where ts=today()") tdSql.checkRows(1) From 98979cf7ced7bac9a89278a4cbfe1c279a88948d Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Fri, 22 Apr 2022 15:59:09 +0800 Subject: [PATCH 11/23] update timezone.py --- tests/system-test/2-query/timezone.py | 33 +++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 8c24996336..45544cb996 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -3,11 +3,13 @@ from time import sleep from tkinter import E import taos import sys - +import time +from tzlocal import get_localzone from util.log import * from util.sql import * from util.cases import * +import os class TDTestCase: @@ -17,9 +19,10 @@ class TDTestCase: tdSql.init(conn.cursor()) def run(self): # sourcery skip: extract-duplicate-method - # for func now() , today(), timezone() tdSql.prepare() - + # get system timezone + time_zone = os.popen('timedatectl | grep zone').read().strip().split(':')[1].lstrip() + tdLog.printNoPrefix("==========step1:create tables==========") tdSql.execute( '''create table if not exists ntb @@ -41,24 +44,30 @@ class TDTestCase: tdSql.execute("insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)") tdLog.printNoPrefix("==========step3:query data==========") - tdSql.query("select timezone() from ntb") - tdSql.checkRows(2) - tdSql.query("select timezone() from db.ntb") - tdSql.checkRows(2) - + for i in range(0,10): + tdSql.query("select timezone() from ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,time_zone) + i+=1 + + for i in range(0,10): + tdSql.query("select timezone() from db.ntb") + tdSql.checkRows(2) + tdSql.checkData(0,0,time_zone) + i+=1 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) tdSql.query("select timezone() from db.stb_1 ") tdSql.checkRows(2) - - # tdSql.execute() - - + tdSql.checkData(0,0,time_zone) From b931168c8c79ca79407fd1c703acd3a4b3db4320 Mon Sep 17 00:00:00 2001 From: Jason-Jia <714897623@qq.com> Date: Fri, 22 Apr 2022 16:31:18 +0800 Subject: [PATCH 12/23] Update fulltest.sh --- tests/system-test/fulltest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 65e4785b5d..fedd917430 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -5,3 +5,4 @@ set -e python3 ./test.py -f 2-query/distinct.py python3 ./test.py -f 2-query/varchar.py python3 ./test.py -f 2-query/cast.py +python3 ./test.py -f 2-query/timezone.py From b137b51b0976444fbd88814126e71e361f507afa Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sun, 24 Apr 2022 14:16:03 +0800 Subject: [PATCH 13/23] update test case --- tests/system-test/2-query/Now.py | 313 ++++++++++++++++++++++++++++ tests/system-test/2-query/Today.py | 321 +++++++++++++++++++++++++++++ 2 files changed, 634 insertions(+) create mode 100644 tests/system-test/2-query/Now.py create mode 100644 tests/system-test/2-query/Today.py diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py new file mode 100644 index 0000000000..b1aa7773a8 --- /dev/null +++ b/tests/system-test/2-query/Now.py @@ -0,0 +1,313 @@ +from tarfile import SYMTYPE +from time import sleep +from tkinter import E +import taos +import sys +from util.dnodes import * +from util.log import * +from util.sql import * +from util.cases import * + + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + + def run(self): # sourcery skip: extract-duplicate-method + # for func now() , today(), timezone() + tdSql.prepare() + today_date = datetime.datetime.strptime( + datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d") + + tdLog.printNoPrefix("==========step1:create tables==========") + tdSql.execute( + '''create table if not exists ntb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) + ''' + ) + tdSql.execute( + '''create table if not exists stb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int) + ''' + ) + tdSql.execute( + '''create table if not exists stb_1 using stb tags(100) + ''' + ) + tdLog.printNoPrefix("==========step2:insert data into ntb==========") + tdSql.execute( + 'insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdSql.execute( + 'insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdLog.printNoPrefix("==========step2:query test of ntb ==========") + + # test function now() + # ntable + tdSql.query("select now() from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from ntb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from ntb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select * from ntb where ts=now()") + tdSql.checkRows(0) + tdSql.query("select * from ntb where ts>now()") + tdSql.checkRows(0) + tdSql.query("select now() from ntb where ts=today()") + tdSql.checkRows(1) + + # stable + tdSql.query("select now() from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from stb") + tdSql.checkRows(3) + tdSql.query("select now() +1b from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1w from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1d from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1h from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1m from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1s from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1a from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1u from db.stb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from stb") + tdSql.checkRows(3) + tdSql.query("select now() -1b from db.stb") + tdSql.checkRows(3) + # 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) + + # table + tdSql.query("select now() from 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") + tdSql.checkRows(3) + tdSql.query("select now() +1d from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1d from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1h from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1h from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1m from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1m from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1s from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1s from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1a from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1a from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1u from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1u from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1b from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() +1b 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") + tdSql.checkRows(3) + tdSql.query("select now() -1d from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1d from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1h from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1h from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1m from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1m from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1s from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1s from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1a from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1a from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1u from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1u from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1b from stb_1") + tdSql.checkRows(3) + tdSql.query("select now() -1b from db.stb_1") + tdSql.checkRows(3) + tdSql.query("select * from stb_1 where ts=now()") + tdSql.checkRows(0) + tdSql.query("select * from stb_1 where ts>now()") + tdSql.checkRows(0) + + # tdSql.query("select * from stb_1 where ts=now") + # tdSql.checkRows(0) + # tdSql.query("select * from stb_1 where ts>now") + # tdSql.checkRows(0) + + tdSql.query("select now() from stb_1 where ts=today()") + tdSql.checkRows(1) + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) diff --git a/tests/system-test/2-query/Today.py b/tests/system-test/2-query/Today.py new file mode 100644 index 0000000000..0f72844676 --- /dev/null +++ b/tests/system-test/2-query/Today.py @@ -0,0 +1,321 @@ +from tarfile import SYMTYPE +from time import sleep +from tkinter import E +import taos +import sys +from util.dnodes import * +from util.log import * +from util.sql import * +from util.cases import * + + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + + def run(self): # sourcery skip: extract-duplicate-method + # for func now() , today(), timezone() + tdSql.prepare() + today_date = datetime.datetime.strptime( + datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d") + + tdLog.printNoPrefix("==========step1:create tables==========") + tdSql.execute( + '''create table if not exists ntb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) + ''' + ) + tdSql.execute( + '''create table if not exists stb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int) + ''' + ) + tdSql.execute( + '''create table if not exists stb_1 using stb tags(100) + ''' + ) + tdLog.printNoPrefix("==========step2:insert data into ntb==========") + tdSql.execute( + 'insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdSql.execute( + 'insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdLog.printNoPrefix("==========step2:query test of ntb ==========") + + # test function today() + # normal table + tdSql.query("select today() from ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() +1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(1) + tdSql.checkData(0, 1, 3) + tdSql.query("select * from ntb where ts<=today()") + tdSql.checkRows(2) + tdSql.checkData(0, 1, 10) + # for bug + # tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(2) + tdSql.checkData(0, 1, 3) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from ntb where c4=today()") + tdSql.checkRows(1) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() from ntb where ts=today()") + # tdSql.checkRows(2) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from stb where c4=today()") + tdSql.checkRows(1) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() from stb where ts=today()") + tdSql.checkRows(2) + tdSql.query("select * from ntb where ts>today()") + tdSql.checkRows(1) + tdSql.query("select c4 from stb_1 where c4=today()") + tdSql.checkRows(1) + tdSql.query("select today() from stb_1 where ts Date: Sun, 24 Apr 2022 14:27:01 +0800 Subject: [PATCH 14/23] update timezone.py --- tests/system-test/2-query/timezone.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 45544cb996..f00800f573 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -1,10 +1,4 @@ -from tarfile import SYMTYPE -from time import sleep -from tkinter import E import taos -import sys -import time -from tzlocal import get_localzone from util.log import * from util.sql import * from util.cases import * From f1287a9ae4922196932ca1c8e6b436e7e8949ccf Mon Sep 17 00:00:00 2001 From: Jason-Jia <714897623@qq.com> Date: Sun, 24 Apr 2022 14:29:32 +0800 Subject: [PATCH 15/23] Update fulltest.sh --- tests/system-test/fulltest.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index fedd917430..e20f48e515 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -6,3 +6,5 @@ python3 ./test.py -f 2-query/distinct.py python3 ./test.py -f 2-query/varchar.py python3 ./test.py -f 2-query/cast.py python3 ./test.py -f 2-query/timezone.py +python3 ./test.py -f 2-query/Now.py +python3 ./test.py -f 2-query/Today.py From fd8b50bbeb723c5af73c3595d911efee0f504501 Mon Sep 17 00:00:00 2001 From: Jason-Jia <714897623@qq.com> Date: Sun, 24 Apr 2022 14:45:32 +0800 Subject: [PATCH 16/23] Delete NowandToday.py --- tests/system-test/2-query/NowandToday.py | 573 ----------------------- 1 file changed, 573 deletions(-) delete mode 100644 tests/system-test/2-query/NowandToday.py diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py deleted file mode 100644 index 723256be7d..0000000000 --- a/tests/system-test/2-query/NowandToday.py +++ /dev/null @@ -1,573 +0,0 @@ -from tarfile import SYMTYPE -from time import sleep -from tkinter import E -import taos -import sys -from util.dnodes import * -from util.log import * -from util.sql import * -from util.cases import * - - -class TDTestCase: - - def init(self, conn, logSql): - tdLog.debug(f"start to excute {__file__}") - tdSql.init(conn.cursor()) - - def run(self): # sourcery skip: extract-duplicate-method - # for func now() , today(), timezone() - tdSql.prepare() - today_date = datetime.datetime.strptime( - datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d") - - tdLog.printNoPrefix("==========step1:create tables==========") - tdSql.execute( - '''create table if not exists ntb - (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) - ''' - ) - tdSql.execute( - '''create table if not exists stb - (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int) - ''' - ) - tdSql.execute( - '''create table if not exists stb_1 using stb tags(100) - ''' - ) - tdLog.printNoPrefix("==========step2:insert data into ntb==========") - tdSql.execute( - 'insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') - tdSql.execute( - 'insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') - tdLog.printNoPrefix("==========step2:query test of ntb ==========") - - # test function today() - # normal table - tdSql.query("select today() from ntb") - tdSql.checkRows(3) - tdSql.checkData(0, 0, str(today_date)) - tdSql.query("select today() from db.ntb") - tdSql.checkRows(3) - tdSql.checkData(0, 0, str(today_date)) - tdSql.query("select today() +1w from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1w from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1d from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1d from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1h from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1h from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1m from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1m from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1s from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1s from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1a from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1a from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1u from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1u from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1b from ntb") - tdSql.checkRows(3) - tdSql.query("select today() +1b from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1w from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1w from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1d from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1d from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1h from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1h from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1m from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1m from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1s from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1s from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1a from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1a from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1u from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1u from db.ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1b from ntb") - tdSql.checkRows(3) - tdSql.query("select today() -1b from db.ntb") - tdSql.checkRows(3) - tdSql.query("select * from ntb where ts=today()") - tdSql.checkRows(1) - tdSql.checkData(0, 1, 3) - tdSql.query("select * from ntb where ts<=today()") - tdSql.checkRows(2) - # for bug - # tdSql.query("select * from ntb where ts=today()") - tdSql.checkRows(2) - # tdSql.query("select * from ntb where ts>today()") - # tdSql.checkRows(1) - tdSql.query("select c4 from ntb where c4=today()") - tdSql.checkRows(1) - tdSql.query("select today() from ntb where ts=today()") - # tdSql.checkRows(2) - # tdSql.query("select * from ntb where ts>today()") - # tdSql.checkRows(1) - tdSql.query("select c4 from stb where c4=today()") - tdSql.checkRows(1) - tdSql.query("select today() from stb where ts=today()") - tdSql.checkRows(2) - # tdSql.query("select * from ntb where ts>today()") - # tdSql.checkRows(1) - tdSql.query("select c4 from stb_1 where c4=today()") - tdSql.checkRows(1) - tdSql.query("select today() from stb_1 where ts=now()") - tdSql.checkRows(0) - tdSql.query("select * from ntb where ts>now()") - tdSql.checkRows(0) - tdSql.query("select now() from ntb where ts=today()") - tdSql.checkRows(1) - - # stable - tdSql.query("select now() from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from stb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from stb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from db.stb") - tdSql.checkRows(3) - # 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) - - # table - tdSql.query("select now() from 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") - tdSql.checkRows(3) - tdSql.query("select now() +1d from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1d from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1h from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1h from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1m from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1m from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1s from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1s from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1a from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1a from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1u from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1u from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1b from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() +1b 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") - tdSql.checkRows(3) - tdSql.query("select now() -1d from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1d from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1h from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1h from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1m from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1m from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1s from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1s from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1a from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1a from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1u from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1u from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1b from stb_1") - tdSql.checkRows(3) - tdSql.query("select now() -1b from db.stb_1") - tdSql.checkRows(3) - tdSql.query("select * from stb_1 where ts=now()") - tdSql.checkRows(0) - tdSql.query("select * from stb_1 where ts>now()") - tdSql.checkRows(0) - - # tdSql.query("select * from stb_1 where ts=now") - # tdSql.checkRows(0) - # tdSql.query("select * from stb_1 where ts>now") - # tdSql.checkRows(0) - - tdSql.query("select now() from stb_1 where ts=today()") - tdSql.checkRows(1) - - def stop(self): - tdSql.close() - tdLog.success(f"{__file__} successfully executed") - - -tdCases.addLinux(__file__, TDTestCase()) -tdCases.addWindows(__file__, TDTestCase()) From a5daa3f4b83b676259092bd252ac0b7265b02fad Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Sun, 24 Apr 2022 19:15:32 +0800 Subject: [PATCH 17/23] timezone.py --- tests/system-test/2-query/timezone.py | 39 ++++++++++++++++----------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index f00800f573..d0a6f4ef88 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -1,3 +1,4 @@ +from pytz import timezone import taos from util.log import * from util.sql import * @@ -15,8 +16,9 @@ class TDTestCase: def run(self): # sourcery skip: extract-duplicate-method tdSql.prepare() # get system timezone - time_zone = os.popen('timedatectl | grep zone').read().strip().split(':')[1].lstrip() - + time_zone = os.popen('timedatectl | grep zone').read( + ).strip().split(':')[1].lstrip() + tdLog.printNoPrefix("==========step1:create tables==========") tdSql.execute( '''create table if not exists ntb @@ -34,40 +36,47 @@ class TDTestCase: ) tdLog.printNoPrefix("==========step2:insert data==========") - tdSql.execute("insert into ntb values(now,10,99.99,11.111111)(today(),100,11.111,22.222222)") - tdSql.execute("insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)") + tdSql.execute( + "insert into ntb values(now,10,99.99,11.111111)(today(),100,11.111,22.222222)") + tdSql.execute( + "insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)") tdLog.printNoPrefix("==========step3:query data==========") - for i in range(0,10): + for i in range(0, 10): tdSql.query("select timezone() from ntb") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) - i+=1 - - for i in range(0,10): + tdSql.checkData(0, 0, time_zone) + i += 1 + + for i in range(0, 10): tdSql.query("select timezone() from db.ntb") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) - i+=1 + tdSql.checkData(0, 0, time_zone) + i += 1 tdSql.query("select timezone() from stb") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) + tdSql.checkData(0, 0, time_zone) tdSql.query("select timezone() from db.stb") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) + tdSql.checkData(0, 0, time_zone) tdSql.query("select timezone() from stb_1") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) + tdSql.checkData(0, 0, time_zone) tdSql.query("select timezone() from db.stb_1 ") tdSql.checkRows(2) - tdSql.checkData(0,0,time_zone) + tdSql.checkData(0, 0, time_zone) + tdSql.error("select timezone(1) from ntb") + tdSql.error("select timezone(now()) from stb") + tdSql.query(f"select * from ntb where timezone()='{time_zone}'") + tdSql.checkRows(2) def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") + tdCases.addLinux(__file__, TDTestCase()) tdCases.addWindows(__file__, TDTestCase()) From 75b75694bde35988cd2b902c9dc958a2eae7c3c9 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Mon, 25 Apr 2022 10:46:25 +0800 Subject: [PATCH 18/23] update --- tests/system-test/2-query/To_iso8061.py | 75 +++++++++++++++++++++++++ tests/system-test/2-query/timezone.py | 1 + 2 files changed, 76 insertions(+) create mode 100644 tests/system-test/2-query/To_iso8061.py diff --git a/tests/system-test/2-query/To_iso8061.py b/tests/system-test/2-query/To_iso8061.py new file mode 100644 index 0000000000..f569023459 --- /dev/null +++ b/tests/system-test/2-query/To_iso8061.py @@ -0,0 +1,75 @@ +from time import sleep +import taos +from util.log import * +from util.sql import * +from util.cases import * + +import os + + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor()) + + def run(self): # sourcery skip: extract-duplicate-method + tdSql.prepare() + # get system timezone + today_date = datetime.datetime.strptime( + datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d") + + tdLog.printNoPrefix("==========step1:create tables==========") + tdSql.execute( + '''create table if not exists ntb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) + ''' + ) + tdSql.execute( + '''create table if not exists stb + (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int) + ''' + ) + tdSql.execute( + '''create table if not exists stb_1 using stb tags(100) + ''' + ) + + tdLog.printNoPrefix("==========step2:insert data==========") + tdSql.execute('insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + tdSql.execute('insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())') + + tdSql.query("select to_iso8601(ts) from ntb") + tdSql.checkRows(3) + tdSql.query("select c1 from ntb where to_iso8601(ts)='2020-01-01T00:00:00.000+0800'") + tdSql.checkRows(1) + tdSql.checkData(0,0,10) + tdSql.query("select * from ntb where to_iso8601(ts)='2020-01-01T00:00:00.000+0800'") + tdSql.checkRows(1) + tdSql.query("select to_iso8601(ts) from ntb where ts=today()") + tdSql.checkRows(1) + # for i in range(1,30): + # tdSql.query("select to_iso8601(1) from ntb") + # # tdSql.checkData(0,0,"1970-01-01T08:00:01+0800") + # # i+=1 + # # sleep(0.5) + # tdSql.checkRows(3) + tdSql.query("select to_iso8601(ts) from ntb") + tdSql.checkRows(3) + + tdSql.query("select to_iso8601(today()) from ntb") + tdSql.checkRows(3) + tdSql.query("select to_iso8601(now()) from ntb") + tdSql.checkRows(3) + + tdSql.error("select to_iso8601(timezone()) from ntb") + tdSql.error("select to_iso8601('abc') from ntb") + + + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index d0a6f4ef88..4470bfbf32 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -72,6 +72,7 @@ class TDTestCase: tdSql.query(f"select * from ntb where timezone()='{time_zone}'") tdSql.checkRows(2) + tdSql.error("select timezone()+1 from ntb") def stop(self): tdSql.close() From 06cb173bda5a0d1f17487c6e3888e86d20b49e93 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Mon, 25 Apr 2022 14:59:18 +0800 Subject: [PATCH 19/23] update --- tests/system-test/2-query/timezone.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 4470bfbf32..98a1c0a336 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -42,17 +42,17 @@ class TDTestCase: "insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)") tdLog.printNoPrefix("==========step3:query data==========") - for i in range(0, 10): - tdSql.query("select timezone() from ntb") - tdSql.checkRows(2) - tdSql.checkData(0, 0, time_zone) - i += 1 + + tdSql.query("select timezone() from ntb") + tdSql.checkRows(2) + tdSql.checkData(0, 0, time_zone) + - for i in range(0, 10): - tdSql.query("select timezone() from db.ntb") - tdSql.checkRows(2) - tdSql.checkData(0, 0, time_zone) - i += 1 + + 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) From 8405c99b896908e88fbf838c0201b0c10cf318a3 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Mon, 25 Apr 2022 17:57:53 +0800 Subject: [PATCH 20/23] update --- tests/system-test/2-query/To_iso8061.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/system-test/2-query/To_iso8061.py b/tests/system-test/2-query/To_iso8061.py index f569023459..c1d0567379 100644 --- a/tests/system-test/2-query/To_iso8061.py +++ b/tests/system-test/2-query/To_iso8061.py @@ -41,21 +41,23 @@ class TDTestCase: tdSql.query("select to_iso8601(ts) from ntb") tdSql.checkRows(3) - tdSql.query("select c1 from ntb where to_iso8601(ts)='2020-01-01T00:00:00.000+0800'") + tdSql.query("select c1 from ntb where ts = to_iso8601(1577808000000)") tdSql.checkRows(1) tdSql.checkData(0,0,10) - tdSql.query("select * from ntb where to_iso8601(ts)='2020-01-01T00:00:00.000+0800'") + tdSql.query("select * from ntb where ts = to_iso8601(1577808000000)") tdSql.checkRows(1) tdSql.query("select to_iso8601(ts) from ntb where ts=today()") tdSql.checkRows(1) - # for i in range(1,30): - # tdSql.query("select to_iso8601(1) from ntb") - # # tdSql.checkData(0,0,"1970-01-01T08:00:01+0800") - # # i+=1 - # # sleep(0.5) - # tdSql.checkRows(3) + tdSql.checkData(0,1,10) + for i in range(1,10): + tdSql.query("select to_iso8601(1) from ntb") + 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 ntb") tdSql.checkRows(3) + tdSql.query("select to_iso8601(ts) from db.ntb") tdSql.query("select to_iso8601(today()) from ntb") tdSql.checkRows(3) @@ -67,6 +69,7 @@ class TDTestCase: + def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed") From 90d8b571b5ecabe54bba90fa321a7571d5e8e2f3 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Mon, 25 Apr 2022 18:33:02 +0800 Subject: [PATCH 21/23] add test case --- tests/system-test/2-query/To_iso8061.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/2-query/To_iso8061.py b/tests/system-test/2-query/To_iso8061.py index c1d0567379..2cacca4616 100644 --- a/tests/system-test/2-query/To_iso8061.py +++ b/tests/system-test/2-query/To_iso8061.py @@ -48,7 +48,7 @@ class TDTestCase: tdSql.checkRows(1) tdSql.query("select to_iso8601(ts) from ntb where ts=today()") tdSql.checkRows(1) - tdSql.checkData(0,1,10) + # tdSql.checkData(0,0,10) for i in range(1,10): tdSql.query("select to_iso8601(1) from ntb") tdSql.checkData(0,0,"1970-01-01T08:00:01+0800") From 26f8512ff9e9d3a3fa686deebe97686d7d8ff17f Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Mon, 25 Apr 2022 18:50:52 +0800 Subject: [PATCH 22/23] update --- tests/system-test/2-query/timezone.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index 98a1c0a336..e3261c078d 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -72,7 +72,8 @@ class TDTestCase: tdSql.query(f"select * from ntb where timezone()='{time_zone}'") tdSql.checkRows(2) - tdSql.error("select timezone()+1 from ntb") + tdSql.query("select timezone()+1 from ntb") + tdSql.checkRows(2) def stop(self): tdSql.close() From d3111f914e5b3ed905fc48f54bcd576ab43715d4 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Tue, 26 Apr 2022 08:27:35 +0800 Subject: [PATCH 23/23] update --- tests/system-test/2-query/Now.py | 7 ++----- tests/system-test/2-query/To_iso8061.py | 4 ++-- tests/system-test/2-query/Today.py | 7 ++----- tests/system-test/2-query/timezone.py | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py index b1aa7773a8..7f0e173439 100644 --- a/tests/system-test/2-query/Now.py +++ b/tests/system-test/2-query/Now.py @@ -1,8 +1,5 @@ -from tarfile import SYMTYPE -from time import sleep -from tkinter import E -import taos -import sys + + from util.dnodes import * from util.log import * from util.sql import * diff --git a/tests/system-test/2-query/To_iso8061.py b/tests/system-test/2-query/To_iso8061.py index 2cacca4616..fca53572ca 100644 --- a/tests/system-test/2-query/To_iso8061.py +++ b/tests/system-test/2-query/To_iso8061.py @@ -1,10 +1,10 @@ from time import sleep -import taos + from util.log import * from util.sql import * from util.cases import * -import os + class TDTestCase: diff --git a/tests/system-test/2-query/Today.py b/tests/system-test/2-query/Today.py index 0f72844676..ad4e48bda5 100644 --- a/tests/system-test/2-query/Today.py +++ b/tests/system-test/2-query/Today.py @@ -1,8 +1,5 @@ -from tarfile import SYMTYPE -from time import sleep -from tkinter import E -import taos -import sys + + from util.dnodes import * from util.log import * from util.sql import * diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index e3261c078d..a273b1c0f8 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -1,5 +1,4 @@ -from pytz import timezone -import taos + from util.log import * from util.sql import * from util.cases import *