From 32ea09f9dd60569c42ad15f5e26308eb2ff2ee92 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 28 Jan 2023 14:23:58 +0800
Subject: [PATCH] fix: taosbenchmark ignore drop failure for cloud (#19670)

* fix: taosbenchmark ignore drop db failure for cloud

* fix: update taos-tools 678b1df

* fix: update taos-tools 78986f1

* test: update taos-tools acfa7e3

* test: update taos-tools ada5bdd

* test: update taos-tools 11c057f

* fix: update taos-tools 7a2b109

* test: update taos-tools b35037a

* test: update taos-tools 4ba0939

* fix: update taos-tools 9e406e5

* fix: update taos-tools 39f5d2e

* test: update taos-tools 6976d0b

* fix: update taos-tools 3dcc6da

* fix: update taos-tools eed30f5

* test: reduce insert rows to avoid exceed sql length

* fix: taos-tools 71724aa

* fix: update taos-tools b1844bf

* test: update taos-tools 8d8b649

* fix: update taos-tools 0cd564a
---
 cmake/taostools_CMakeLists.txt.in              |  2 +-
 .../taosbenchmark/json/sml_json_alltypes.json  | 18 +++++++++---------
 .../taosbenchmark/sml_json_alltypes.py         | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
index a69e1578c0..13a81f88ea 100644
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/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 7d24ed5
+        GIT_TAG 0cd564a
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
index 5a373888a6..62ec0ff9bf 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
@@ -37,7 +37,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -62,7 +62,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -87,7 +87,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -112,7 +112,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -137,7 +137,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -162,7 +162,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -187,7 +187,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -212,7 +212,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
@@ -237,7 +237,7 @@
       "line_protocol": "json",
       "childtable_limit": 0,
       "childtable_offset": 0,
-      "insert_rows": 20,
+      "insert_rows": 10,
       "insert_interval": 0,
       "interlace_rows": 0,
       "disorder_ratio": 0,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py b/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
index 2c6d09b0f5..789a0ce0a2 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
@@ -78,23 +78,23 @@ class TDTestCase:
         tdSql.checkData(1, 1, "NCHAR")
         tdSql.checkData(1, 2, 16)
         tdSql.query("select count(*) from db.stb1")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb2")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb3")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb4")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb5")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb6")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb7")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb8")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
         tdSql.query("select count(*) from db.stb9")
-        tdSql.checkData(0, 0, 160)
+        tdSql.checkData(0, 0, 80)
 
     def stop(self):
         tdSql.close()
-- 
GitLab