diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in index a69e1578c0acee7fe4bfa526743f8a234c0a27c3..13a81f88eab42c64be7ea0cf759da21ddce7a456 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 5a373888a6cdfe2ee8a4880863459e91c87a8fa2..62ec0ff9bfff3d847e785b285b102ae5fecf8c2f 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 2c6d09b0f5b4782c692dab2af7e790a864a405bf..789a0ce0a2aaf195665f3ab483428cbca346b1b0 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()