Merge remote-tracking branch 'origin/fix/TD-20662' into fix/TD-20667

tests/parallel_test/cases.task

@@ -417,7 +417,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/user_control.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/fsync.py
 ,,n,system-test,python3 ./test.py -f 0-others/compatibility.py
-#,,,system-test,python3 ./test.py -f 1-insert/alter_database.py
+,,,system-test,python3 ./test.py -f 1-insert/alter_database.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/influxdb_line_taosc_insert.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/opentsdb_telnet_line_taosc_insert.py
 ,,,system-test,python3 ./test.py -f 1-insert/opentsdb_json_taosc_insert.py
@@ -561,8 +561,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sample.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sin.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sin.py -R
-,,,system-test,python3 ./test.py -f 2-query/smaTest.py
-,,,system-test,python3 ./test.py -f 2-query/smaTest.py -R
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/smaTest.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/smaTest.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/spread.py

tests/system-test/2-query/smaTest.py

@@ -44,8 +44,8 @@ class TDTestCase:
     def run(self):
         # insert data
         dbname = "db"
-        self.insert_data1(f"{dbname}.t1", self.ts, 1000*10000)
-        self.insert_data1(f"{dbname}.t4", self.ts, 1000*10000)
+        self.insert_data1(f"{dbname}.t1", self.ts, 10*10000)
+        self.insert_data1(f"{dbname}.t4", self.ts, 10*10000)
         # test base case
         # self.test_case1()
         tdLog.debug(" LIMIT test_case1 ............ [OK]")
@@ -53,7 +53,6 @@ class TDTestCase:
         # self.test_case2()
         tdLog.debug(" LIMIT test_case2 ............ [OK]")
 
-
     # stop
     def stop(self):
         tdSql.close()
@@ -77,15 +76,17 @@ class TDTestCase:
 
     # insert data1
     def insert_data(self, tbname, ts_start, count):
-        pre_insert = "insert into %s values"%tbname
+        pre_insert = "insert into %s values" % tbname
         sql = pre_insert
-        tdLog.debug("insert table %s rows=%d ..."%(tbname, count))
+        tdLog.debug("insert table %s rows=%d ..." % (tbname, count))
         for i in range(count):
-            sql += " (%d,%d)"%(ts_start + i*1000, i )
-            if i >0 and i%30000 == 0:
+            sql += " (%d,%d)" % (ts_start + i*1000, i)
+            if i > 0 and i % 20000 == 0:
+                tdLog.info("%d rows inserted" % i)
                 tdSql.execute(sql)
                 sql = pre_insert
         # end sql
+        tdLog.info("insert_data end")
         if sql != pre_insert:
             tdSql.execute(sql)
 
@@ -93,15 +94,17 @@ class TDTestCase:
         return
 
     def insert_data1(self, tbname, ts_start, count):
-        pre_insert = "insert into %s values"%tbname
+        pre_insert = "insert into %s values" % tbname
         sql = pre_insert
-        tdLog.debug("insert table %s rows=%d ..."%(tbname, count))
+        tdLog.debug("insert table %s rows=%d ..." % (tbname, count))
         for i in range(count):
-            sql += " (%d,%d,%d)"%(ts_start + i*1000, i , i+1)
-            if i >0 and i%30000 == 0:
+            sql += " (%d,%d,%d)" % (ts_start + i*1000, i, i+1)
+            if i > 0 and i % 20000 == 0:
+                tdLog.info("%d rows inserted" % i)
                 tdSql.execute(sql)
                 sql = pre_insert
         # end sql
+        tdLog.info("insert_data1 end")
         if sql != pre_insert:
             tdSql.execute(sql)