From 5f607ed5379dbaf0f9f7e117ed108911aebeb470 Mon Sep 17 00:00:00 2001 From: "xikai.wxk" Date: Mon, 17 Apr 2023 20:56:43 +0800 Subject: [PATCH 1/2] fix: wrong default write batch size for run_tsbs --- scripts/run-tsbs.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/run-tsbs.sh b/scripts/run-tsbs.sh index c2952b7578..415e7e2322 100755 --- a/scripts/run-tsbs.sh +++ b/scripts/run-tsbs.sh @@ -17,7 +17,7 @@ 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} +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 @@ -87,8 +87,7 @@ fi # Write data to ceresdb -./tsbs_load_ceresdb --ceresdb-addr=${CERESDB_ADDR} --file ${DATA_FILE} --batch-size ${WRITE_BATH_SIZE} --workers ${WRITE_WORKER_NUM} | tee ${LOG_DIR}/write.log - +./tsbs_load_ceresdb --ceresdb-addr=${CERESDB_ADDR} --file ${DATA_FILE} --batch-size ${WRITE_BATCH_SIZE} --workers ${WRITE_WORKER_NUM} | tee ${LOG_DIR}/write.log # Generate queries for query ./scripts/generate_queries.sh From 4944d879adf8627d8f09d42100fbccec6122e54b Mon Sep 17 00:00:00 2001 From: "xikai.wxk" Date: Tue, 18 Apr 2023 10:13:40 +0800 Subject: [PATCH 2/2] fix: clippy error --- analytic_engine/src/table/data.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/analytic_engine/src/table/data.rs b/analytic_engine/src/table/data.rs index 977dbe9d11..fc56e44264 100644 --- a/analytic_engine/src/table/data.rs +++ b/analytic_engine/src/table/data.rs @@ -181,10 +181,7 @@ fn compute_mutable_limit( write_buffer_size: u32, mutable_limit_write_buffer_size_ratio: f32, ) -> u32 { - assert!( - mutable_limit_write_buffer_size_ratio >= 0.0 - && mutable_limit_write_buffer_size_ratio <= 1.0 - ); + assert!((0.0..=1.0).contains(&mutable_limit_write_buffer_size_ratio)); let limit = write_buffer_size as f32 * mutable_limit_write_buffer_size_ratio; // This is safe because the limit won't be larger than the write_buffer_size.