diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py
index bc12bb45c505d646d8329531cf075a685e24290b..723256be7d2b49485039447a31eb3896da4244b4 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(1)
-        # tdSql.checkData(0,0,3)
-        # tdSql.query("select ts from stb where ts<=today()")
-        # tdSql.checkRows(2)
-        # # for bug
-        # # tdSql.query("select * from ntb where ts<today()")
-        # # tdSql.checkRows(1)
         # tdSql.query("select * 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 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(3)
+        tdSql.query("select c4 from stb where c4=today()")
+        tdSql.checkRows(1)
+        tdSql.query("select today() from stb where ts<now()")
+        tdSql.checkRows(3)
 
         # table
         tdSql.query("select today() from stb_1")
@@ -388,86 +387,86 @@ class TDTestCase:
         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.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(3)
-        # tdSql.query("select now() -1b from db.stb")
+        # tdSql.checkData(1,1,3)
+        # tdSql.query("select * from stb where ts<=now()")
         # tdSql.checkRows(3)
-        # # tdSql.query("select * from stb where ts<now()")
-        # # tdSql.checkRows(3)
-        # # tdSql.checkData(1,1,3)
-        # # tdSql.query("select * from stb where ts<=now()")
-        # # tdSql.checkRows(3)
-        # # tdSql.checkData(2,1,1)
-        # tdSql.query("select c1 from stb where ts=now()")
+        # tdSql.checkData(2,1,1)
+        tdSql.query("select c1 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 * 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(3)
-        tdSql.checkData(1, 1, 3)
-        tdSql.query("select * from stb_1 where ts<=now")
-        tdSql.checkRows(3)
-        tdSql.checkData(2, 1, 1)
-        tdSql.query("select c1 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(3)
+        # tdSql.checkData(1, 1, 3)
+        # tdSql.query("select * from stb_1 where ts<=now")
+        # tdSql.checkRows(3)
+        # tdSql.checkData(2, 1, 1)
+        # tdSql.query("select c1 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)