From f8b831f0c114f89a9a6900f5b1434b64adc65d28 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Sat, 30 Jul 2022 10:39:37 +0800 Subject: [PATCH] test: change taobenchmark json conf files (#15558) * test: change taobenchmark json conf file * fix: update taos-tools c529299 Co-authored-by: Shuduo Sang --- .../5-taos-tools/taosbenchmark/json/custom_col_tag.json | 3 +-- .../taosbenchmark/json/rest_auto_create_table.json | 3 +-- .../5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_auto_create_table.json | 3 +-- .../5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_interlace.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_json_alltypes.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_rest_json.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_rest_line.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_rest_telnet.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json | 1 - .../5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json | 1 - .../taosbenchmark/json/stmt_auto_create_table.json | 3 +-- .../5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json | 1 - .../taosbenchmark/json/taosc_auto_create_table.json | 1 - .../5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json | 1 - .../5-taos-tools/taosbenchmark/json/taosc_json_tag.json | 1 - .../5-taos-tools/taosbenchmark/json/taosc_limit_offset.json | 1 - .../taosbenchmark/json/taosc_only_create_table.json | 3 +-- .../5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json | 1 - 20 files changed, 5 insertions(+), 25 deletions(-) diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json index 8f652b9d73..6558212816 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/custom_col_tag.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, @@ -88,4 +87,4 @@ }] }] }] -} \ No newline at end of file +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json index a4706bf47d..cebabf95b6 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, @@ -84,4 +83,4 @@ "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}] }] }] -} \ No newline at end of file +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json index 01e3950502..0a10458283 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_insert_alltypes.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json index 62846bf2b6..5cbd67e154 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, @@ -84,4 +83,4 @@ "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}] }] }] -} \ No newline at end of file +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json index 8722d124d6..0cf1526041 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json index 1aa5b09348..a0eec1c9af 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_interlace.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, 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 8806b52a1e..4e7f6472f6 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 @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json index 1e9e28d4e8..2737f6e631 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json @@ -27,7 +27,6 @@ "minRows": 100, "maxRows": 4096, "comp": 2, - "walLevel": 1, "cachelast": 0, "quorum": 1, "fsync": 3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json index deef77fdef..f19f3734ef 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json @@ -27,7 +27,6 @@ "minRows": 100, "maxRows": 4096, "comp": 2, - "walLevel": 1, "cachelast": 0, "quorum": 1, "fsync": 3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json index 8893a73467..f083782c07 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json @@ -27,7 +27,6 @@ "minRows": 100, "maxRows": 4096, "comp": 2, - "walLevel": 1, "cachelast": 0, "quorum": 1, "fsync": 3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json index 0bf363e673..9c590ae83c 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json index 84419760c1..60af5dfe54 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json @@ -27,7 +27,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json index 2e5965c14b..5d74e960e2 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, @@ -84,4 +83,4 @@ "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}] }] }] -} \ No newline at end of file +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json index 48f4e23166..f7266ee71f 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_insert_alltypes.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json index 06c5be47bf..ba7660658f 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json index 1bb03b4fab..62685eb3c7 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json index 893b203aa8..ef0b1d2784 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_json_tag.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json index b0e903347d..546885db7d 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json index 4d42ed63fa..5869410c03 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_only_create_table.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":1, "quorum":1, "fsync":3000, @@ -59,4 +58,4 @@ "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR"}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY"}] }] }] -} \ No newline at end of file +} diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json index 22bd13d5be..d9eb17ea1f 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json +++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_sample_use_ts.json @@ -26,7 +26,6 @@ "minRows": 100, "maxRows": 4096, "comp":2, - "walLevel":1, "cachelast":0, "quorum":1, "fsync":3000, -- GitLab