From 6be0d88e264878bc9e7667618d121729b01570f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 09:36:45 +0800 Subject: [PATCH 1/2] chore(deps): bump h2 from 0.3.16 to 0.3.17 (#841) Bumps [h2](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/h2/compare/v0.3.16...v0.3.17) --- updated-dependencies: - dependency-name: h2 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9e28c9197..3cfe0512ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2620,9 +2620,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" dependencies = [ "bytes 1.4.0", "fnv", From b3996ace39d634f743e090fb0fe00c6348513f57 Mon Sep 17 00:00:00 2001 From: WEI Xikai Date: Fri, 14 Apr 2023 10:18:47 +0800 Subject: [PATCH 2/2] feat: tsbs support more write options (#839) --- scripts/run-tsbs.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/run-tsbs.sh b/scripts/run-tsbs.sh index b19f230f75..c2952b7578 100755 --- a/scripts/run-tsbs.sh +++ b/scripts/run-tsbs.sh @@ -6,6 +6,8 @@ # - LOG_DIR # - CERESDB_CONFIG_FILE # - CERESDB_ADDR +# - WRITE_WORKER_NUM +# - WRITE_BATCH_SIZE export CURR_DIR=$(pwd) export DEFAULT_RESULT_FILE=${CURR_DIR}/tsbs/result.md @@ -14,6 +16,8 @@ export CERESDB_CONFIG_FILE=${CERESDB_CONFIG_FILE:-docs/minimal.toml} export LOG_DIR=${LOG_DIR:-${CURR_DIR}/logs} export CERESDB_ADDR=${CERESDB_ADDR:-127.0.0.1:8831} export CERESDB_PID_FILE=${CURR_DIR}/ceresdb-server.pid +export WRITE_WORKER_NUM=${WRITE_WORKER_NUM:-36} +export WRITE_BATCH_SIZE=${WRITE_BATCH_SIZE:500} # Where generated data stored export DATA_FILE=${DATA_FILE:-data.out} # How many values in host tag @@ -83,7 +87,7 @@ fi # Write data to ceresdb -./tsbs_load_ceresdb --ceresdb-addr=${CERESDB_ADDR} --file ${DATA_FILE} | tee ${LOG_DIR}/write.log +./tsbs_load_ceresdb --ceresdb-addr=${CERESDB_ADDR} --file ${DATA_FILE} --batch-size ${WRITE_BATH_SIZE} --workers ${WRITE_WORKER_NUM} | tee ${LOG_DIR}/write.log # Generate queries for query