Merge pull request #21888 from taosdata/fix/TS-3584-2.6

enh: update latest taos-tools

taos-tools @ ca597201

-Subproject commit 43787023f9816d2f148defaec36faff600ddaab1
+Subproject commit ca5972018e750ca69ad3edb1e0d34e1fe8b80a3a

tests/pytest/tools/taosdumpTest.py

@@ -94,9 +94,9 @@ class TDTestCase:
         else:
             tdLog.info("taosdump found: %s" % binPath)
 
-        os.system("%s -y --databases db -o ./taosdumptest/tmp1" % binPath)
+        os.system("%s  --databases db -o ./taosdumptest/tmp1" % binPath)
         os.system(
-            "%s -y --databases db1 -o ./taosdumptest/tmp2" %
+            "%s  --databases db1 -o ./taosdumptest/tmp2" %
             binPath)
 
         tdSql.execute("drop database db")
@@ -177,7 +177,7 @@ class TDTestCase:
         tdSql.query("show stables")
         tdSql.checkRows(2)
         os.system(
-            "%s -y --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
+            "%s  --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
             binPath)
         tdSql.execute("drop database db12312313231231321312312312_323")
         os.system("%s -i ./taosdumptest/tmp1" % binPath)

tests/pytest/tools/taosdumpTest2.py

@@ -97,7 +97,7 @@ class TDTestCase:
         tdSql.query("show databases")
         tdSql.checkRows(0)
 
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp " % binPath)
 
         tdSql.query("show databases")
         tdSql.checkRows(1)
@@ -125,13 +125,13 @@ class TDTestCase:
         os.system("rm ./taosdumptest/tmp/*.sql")
         os.system("rm ./taosdumptest/tmp/*.avro*")
         os.system("rm -rf ./taosdumptest/tmp/taosdump.*")
-        os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -D test -o ./taosdumptest/tmp " % binPath)
 
         tdSql.execute("drop database test")
         tdSql.query("show databases")
         tdSql.checkRows(1)
 
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp " % binPath)
 
         tdSql.execute("use test")
         tdSql.error("show vnodes '' ")

tests/pytest/tools/taosdumpTestNanoSupport.py

@@ -134,15 +134,15 @@ class TDTestCase:
         # dump all data
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s  -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         # dump part data with -S  -E
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s  -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s  -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         tdSql.execute("drop database timedb1")
@@ -200,14 +200,14 @@ class TDTestCase:
         self.createdb(precision="us")
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s  -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s  -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s  -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         os.system("%s -i ./taosdumptest/dumptmp1" % binPath)
@@ -269,14 +269,14 @@ class TDTestCase:
         self.createdb(precision="ms")
 
         os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s  -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
             binPath)
 
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
+            '%s  -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
             binPath)
         os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
+            '%s  -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
             binPath)
 
         os.system("%s -i ./taosdumptest/dumptmp1" % binPath)

tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJson-illegalData.py

@@ -124,9 +124,9 @@ class TDTestCase:
         os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/insertMaxNumPerReq.json -y " % binPath)
         tdSql.execute("use db")
         tdSql.query("select count(*) from stb0")
-        tdSql.checkRows(0)
+        tdSql.checkData(0, 0, 5000000)
         tdSql.query("select count(*) from stb1")
-        tdSql.checkRows(0)
+        tdSql.checkData(0, 0, 5000000)
 
 
 

tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py

@@ -94,7 +94,8 @@ class TDTestCase:
         tdSql.execute("drop database if exists db1") 
         tdSql.execute("drop database if exists db") 
         os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insertNumOfrecordPerReq0-sml.json -y " % binPath)   
-        tdSql.error("select count(*) from db.stb0") 
+        tdSql.query("select count(*) from db.stb0") 
+        tdSql.checkData(0, 0, 1)
         # # has a core dumped
         # tdSql.execute("drop database if exists db") 
         # os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insertNumOfrecordPerReqless0-sml.json -y " % binPath)   

tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py

@@ -116,9 +116,9 @@ class TDTestCase:
         tdSql.query("select count (tbname) from stb1")
         tdSql.checkData(0, 0, 6)
         tdSql.query("select count (tbname) from stb2")
-        tdSql.checkData(0, 0, 4)
+        tdSql.checkData(0, 0, 7)
         tdSql.query("select count (tbname) from stb3")
-        tdSql.checkData(0, 0, 2)
+        tdSql.checkData(0, 0, 8)
         os.system(
             "%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-renewdb-sml.json -y"
             % binPath
@@ -129,9 +129,9 @@ class TDTestCase:
         tdSql.query("select count(*) from stb1")
         tdSql.checkData(0, 0, 120)
         tdSql.query("select count(*) from stb2")
-        tdSql.checkData(0, 0, 80)
+        tdSql.checkData(0, 0, 140)
         tdSql.query("select count(*) from stb3")
-        tdSql.checkData(0, 0, 40)
+        tdSql.checkData(0, 0, 160)
         tdSql.query("select count(*) from stb4")
         tdSql.checkData(0, 0, 160)
 

tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonStmt-illegalData.py

@@ -91,7 +91,8 @@ class TDTestCase:
         tdSql.error("select * from db.stb2")
         tdSql.execute("drop database if exists db") 
         os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/stmt/insertNumOfrecordPerReq0-stmt.json -y " % binPath)   
-        tdSql.error("select count(*) from db.stb0") 
+        tdSql.query("select count(*) from db.stb0") 
+        tdSql.checkData(0, 0, 1)
         # # it has a core dumped
         # tdSql.execute("drop database if exists db") 
         # os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/stmt/insertNumOfrecordPerReqless0-stmt.json -y " % binPath)