fix: taosbenchmark sub on 2.6 for main (#20409)

* fix: taosbenchmark sub on 2.6 for main

* fix: upgrade taospy to 2.7.6 and fix unstable test case

Jenkinsfile2

@@ -314,7 +314,7 @@ def pre_test_build_win() {
         cd %WIN_CONNECTOR_ROOT%
         python.exe -m pip install --upgrade pip
         python -m pip uninstall taospy -y 
-        python -m pip install taospy==2.7.3
+        python -m pip install taospy==2.7.6
         xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
     '''
     return 1

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 41d4f95
+        GIT_TAG d9ec91d
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py

@@ -108,49 +108,49 @@ class TDTestCase:
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.stb2)")
+        tdSql.query("select count(*) from (select distinct(tbname) from stmt_db.stb2)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.stb2")
+        tdSql.query("select count(*) from stmt_db.stb2")
         tdSql.checkData(0, 0, 160)
-        tdSql.query("select * from information_schema.ins_databases")
-        tdSql.checkData(2, 14, "us")
+        tdSql.query("select * from information_schema.ins_databases where name='stmt_db'")
+        tdSql.checkData(0, 14, "us")
 
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.`stb2-2`)")
+        tdSql.query("select count(*) from (select distinct(tbname) from stmt_db.`stb2-2`)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.`stb2-2`")
+        tdSql.query("select count(*) from stmt_db.`stb2-2`")
         tdSql.checkData(0, 0, 160)
 
         cmd = "%s -f ./5-taos-tools/taosbenchmark/json/rest_auto_create_table.json" %binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.stb3)")
+        tdSql.query("select count(*) from (select distinct(tbname) from rest_db.stb3)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.stb3")
+        tdSql.query("select count(*) from rest_db.stb3")
         tdSql.checkData(0, 0, 160)
-        tdSql.query("select * from information_schema.ins_databases")
-        tdSql.checkData(2, 14, "ns")
+        tdSql.query("select * from information_schema.ins_databases where name='rest_db'")
+        tdSql.checkData(0, 14, "ns")
 
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.`stb3-2`)")
+        tdSql.query("select count(*) from (select distinct(tbname) from rest_db.`stb3-2`)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.`stb3-2`")
+        tdSql.query("select count(*) from rest_db.`stb3-2`")
         tdSql.checkData(0, 0, 160)
 
         cmd = "%s -f ./5-taos-tools/taosbenchmark/json/sml_auto_create_table.json" %binPath
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.stb4)")
+        tdSql.query("select count(*) from (select distinct(tbname) from sml_db.stb4)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.stb4")
+        tdSql.query("select count(*) from sml_db.stb4")
         tdSql.checkData(0, 0, 160)
 
         tdSql.execute("reset query cache")
-        tdSql.query("select count(*) from (select distinct(tbname) from db.`stb4-2`)")
+        tdSql.query("select count(*) from (select distinct(tbname) from sml_db.`stb4-2`)")
         tdSql.checkData(0, 0, 8)
-        tdSql.query("select count(*) from db.`stb4-2`")
+        tdSql.query("select count(*) from sml_db.`stb4-2`")
         tdSql.checkData(0, 0, 160)
 
         tAdapter.stop()

tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json

@@ -15,7 +15,7 @@
   "num_of_records_per_req": 10,
   "databases": [{
     "dbinfo": {
-      "name": "db",
+      "name": "rest_db",
       "drop": "yes",
       "replica": 1,
       "precision": "ns",

tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json

@@ -15,7 +15,7 @@
   "num_of_records_per_req": 10,
   "databases": [{
     "dbinfo": {
-      "name": "db",
+      "name": "sml_db",
       "drop": "yes",
       "replica": 1,
       "precision": "ms",

tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json

@@ -15,7 +15,7 @@
   "num_of_records_per_req": 10,
   "databases": [{
     "dbinfo": {
-      "name": "db",
+      "name": "stmt_db",
       "drop": "yes",
       "replica": 1,
       "precision": "us",

tests/parallel_test/run_case.sh

@@ -70,10 +70,10 @@ ulimit -c unlimited
 md5sum /usr/lib/libtaos.so.1
 md5sum /home/TDinternal/debug/build/lib/libtaos.so
 
-#define taospy 2.7.3
+#define taospy 2.7.6
 pip3 list|grep taospy
 pip3 uninstall taospy -y
-pip3 install taospy==2.7.3
+pip3 install taospy==2.7.6
 
 $TIMEOUT_CMD $cmd
 RET=$?