From b2933ea244338348132cd1a46d8c867ef829d7f8 Mon Sep 17 00:00:00 2001
From: cpwu <cpwu@taosdata.com>
Date: Wed, 13 Jul 2022 09:52:03 +0800
Subject: [PATCH] fix case

---
 tests/system-test/1-insert/time_range_wise.py | 13 ++++------
 tests/system-test/2-query/join.py             |  2 +-
 tests/system-test/test.py                     | 24 +++++++++----------
 tools/taosws-rs                               |  2 +-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/tests/system-test/1-insert/time_range_wise.py b/tests/system-test/1-insert/time_range_wise.py
index f5df168af4..f945bafe3b 100644
--- a/tests/system-test/1-insert/time_range_wise.py
+++ b/tests/system-test/1-insert/time_range_wise.py
@@ -624,14 +624,11 @@ class TDTestCase:
         self.__insert_data()
         self.all_test()
 
-        #tdLog.printNoPrefix("==========step2:create table in rollup database")
-        #tdSql.execute("create database db3 retentions 1s:4m,2s:8m,3s:12m")
-        #tdSql.execute("use db3")
-        # self.__create_tb()
-        #tdSql.execute(f"create stable stb1 ({PRIMARY_COL} timestamp, {INT_COL} int) tags (tag1 int) rollup(first) watermark 5s max_delay 1m sma({INT_COL}) ")
-        #self.all_test()
-
-        # self.__insert_data()
+        tdLog.printNoPrefix("==========step2:create table in rollup database")
+        tdSql.execute("create database db3 retentions 1s:4m,2s:8m,3s:12m")
+        tdSql.execute("use db3")
+        tdSql.execute(f"create stable stb1 ({PRIMARY_COL} timestamp, {INT_COL} int) tags (tag1 int) rollup(first) watermark 5s max_delay 1m sma({INT_COL}) ")
+        self.all_test()
 
         tdSql.execute("drop database if exists db1 ")
         tdSql.execute("drop database if exists db2 ")
diff --git a/tests/system-test/2-query/join.py b/tests/system-test/2-query/join.py
index dae6a9219e..76a2f2fdd9 100644
--- a/tests/system-test/2-query/join.py
+++ b/tests/system-test/2-query/join.py
@@ -65,7 +65,7 @@ class TDTestCase:
 
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
-        tdSql.init(conn.cursor(), True)
+        tdSql.init(conn.cursor(), False)
 
     def __query_condition(self,tbname):
         query_condition = []
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index 0a891759d0..7fb26f1953 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -49,7 +49,7 @@ def checkRunTimeError():
             os.system("TASKKILL /F /IM taosd.exe")
 
 if __name__ == "__main__":
-    
+
     fileName = "all"
     deployPath = ""
     masterIp = ""
@@ -86,11 +86,11 @@ if __name__ == "__main__":
             tdLog.printNoPrefix('-M create mnode numbers in clusters')
             tdLog.printNoPrefix('-Q set queryPolicy in one dnode')
             tdLog.printNoPrefix('-C create Dnode Numbers in one cluster')
-            
+
 
             sys.exit(0)
 
-        if key in ['-r', '--restart']: 
+        if key in ['-r', '--restart']:
             restart = True
 
         if key in ['-f', '--file']:
@@ -184,7 +184,7 @@ if __name__ == "__main__":
             time.sleep(2)
 
         tdLog.info('stop All dnodes')
-    
+
     if masterIp == "":
         host = socket.gethostname()
     else:
@@ -298,7 +298,7 @@ if __name__ == "__main__":
                 config=tdDnodes.getSimCfgPath())
                 tdSql.init(conn.cursor())
                 tdSql.execute("create qnode on dnode 1")
-                tdSql.execute('alter local "queryPolicy" "%d"'%queryPolicy)     
+                tdSql.execute('alter local "queryPolicy" "%d"'%queryPolicy)
                 tdSql.query("show local variables;")
                 for i in range(tdSql.queryRows):
                     if tdSql.queryResult[i][0] == "queryPolicy" :
@@ -306,7 +306,7 @@ if __name__ == "__main__":
                             tdLog.success('alter queryPolicy to %d successfully'%queryPolicy)
                         else :
                             tdLog.debug(tdSql.queryResult)
-                            tdLog.exit("alter queryPolicy to  %d failed"%queryPolicy)      
+                            tdLog.exit("alter queryPolicy to  %d failed"%queryPolicy)
         else :
             tdLog.debug("create an cluster  with %s nodes and make %s dnode as independent mnode"%(dnodeNums,mnodeNums))
             dnodeslist = cluster.configure_cluster(dnodeNums=dnodeNums,mnodeNums=mnodeNums)
@@ -334,8 +334,8 @@ if __name__ == "__main__":
                     print("check dnode ready")
             except Exception as r:
                 print(r)
-            
-            
+
+
         if testCluster:
             tdLog.info("Procedures for testing cluster")
             if fileName == "all":
@@ -347,21 +347,21 @@ if __name__ == "__main__":
             conn = taos.connect(
                 host,
                 config=tdDnodes.getSimCfgPath())
-                
+
             if fileName == "all":
                 tdCases.runAllLinux(conn)
             else:
                 tdCases.runOneLinux(conn, fileName)
-            
+
         if restart:
             if fileName == "all":
                 tdLog.info("not need to query ")
-            else:    
+            else:
                 sp = fileName.rsplit(".", 1)
                 if len(sp) == 2 and sp[1] == "py":
                     tdDnodes.stopAll()
                     tdDnodes.start(1)
-                    time.sleep(1)            
+                    time.sleep(1)
                     conn = taos.connect( host, config=tdDnodes.getSimCfgPath())
                     tdLog.info("Procedures for tdengine deployed in %s" % (host))
                     tdLog.info("query test after taosd restart")
diff --git a/tools/taosws-rs b/tools/taosws-rs
index 6dccac192a..7a94ffab45 160000
--- a/tools/taosws-rs
+++ b/tools/taosws-rs
@@ -1 +1 @@
-Subproject commit 6dccac192a2ae7dd78718ab926201aab5419327a
+Subproject commit 7a94ffab45f08e16f09b3f430fe75d717054adb6