xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shuduo Sang 2023-01-28 14:23:58 +08:00 committed by GitHub
parent a4f5a60ab5
commit 32ea09f9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/taostools_CMakeLists.txt.in
View File

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

18
tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
View File

@ -37,7 +37,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -62,7 +62,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -87,7 +87,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -112,7 +112,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -137,7 +137,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -162,7 +162,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -187,7 +187,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -212,7 +212,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,
@ -237,7 +237,7 @@
"line_protocol": "json", "line_protocol": "json",
"childtable_limit": 0, "childtable_limit": 0,
"childtable_offset": 0, "childtable_offset": 0,
"insert_rows": 20, "insert_rows": 10,
"insert_interval": 0, "insert_interval": 0,
"interlace_rows": 0, "interlace_rows": 0,
"disorder_ratio": 0, "disorder_ratio": 0,

18
tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
View File

@ -78,23 +78,23 @@ class TDTestCase:
tdSql.checkData(1, 1, "NCHAR") tdSql.checkData(1, 1, "NCHAR")
tdSql.checkData(1, 2, 16) tdSql.checkData(1, 2, 16)
tdSql.query("select count(*) from db.stb1") 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.query("select count(*) from db.stb2")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 80)
tdSql.query("select count(*) from db.stb3") 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.query("select count(*) from db.stb4")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 80)
tdSql.query("select count(*) from db.stb5") 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.query("select count(*) from db.stb6")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 80)
tdSql.query("select count(*) from db.stb7") 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.query("select count(*) from db.stb8")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 80)
tdSql.query("select count(*) from db.stb9") tdSql.query("select count(*) from db.stb9")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 80)
def stop(self): def stop(self):
tdSql.close() tdSql.close()