From b3a065610ed3bebbe463581cac79b3cf3b4f60ed Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Wed, 10 Jul 2024 22:00:11 -0400 Subject: [PATCH] Minor lints --- docs/src/config-file.md | 1 - mbtiles/src/bindiff.rs | 4 +++- tests/test.sh | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/src/config-file.md b/docs/src/config-file.md index 2468893a4..fcdcf7b1f 100644 --- a/docs/src/config-file.md +++ b/docs/src/config-file.md @@ -26,7 +26,6 @@ keep_alive: 75 # The socket address to bind [default: 0.0.0.0:3000] listen_addresses: '0.0.0.0:3000' - # Set TileJSON URL path prefix, ignoring X-Rewrite-URL header. Must begin with a `/` base_path: /tiles diff --git a/mbtiles/src/bindiff.rs b/mbtiles/src/bindiff.rs index 0ba3f33b7..2526484b4 100644 --- a/mbtiles/src/bindiff.rs +++ b/mbtiles/src/bindiff.rs @@ -133,7 +133,9 @@ fn start_processor_threads, has_errors: Arc, ) { - (0..num_cpus::get()).for_each(|_| { + let cpus = num_cpus::get(); + info!("Processing bindiff patches using {cpus} threads..."); + (0..cpus).for_each(|_| { let rx_wrk = rx_wrk.clone(); let tx_ins = tx_ins.clone(); let has_errors = has_errors.clone(); diff --git a/tests/test.sh b/tests/test.sh index 5e8f66c54..1675918fd 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -470,11 +470,15 @@ if [[ "$MBTILES_BIN" != "-" ]]; then "$TEST_TEMP_DIR/world_cities_bindiff.mbtiles" \ --patch-type bin-diff-gz \ 2>&1 | tee "$TEST_OUT_DIR/copy_bindiff.txt" + test_log_has_str "$TEST_OUT_DIR/copy_bindiff.txt" '.*Processing bindiff patches using .* threads...' + $MBTILES_BIN copy \ ./tests/fixtures/mbtiles/world_cities.mbtiles \ --apply-patch "$TEST_TEMP_DIR/world_cities_bindiff.mbtiles" \ "$TEST_TEMP_DIR/world_cities_modified2.mbtiles" \ 2>&1 | tee "$TEST_OUT_DIR/copy_bindiff2.txt" + test_log_has_str "$TEST_OUT_DIR/copy_bindiff2.txt" '.*Processing bindiff patches using .* threads...' + # Ensure that world_cities_modified and world_cities_modified2 are identical (regular diff is empty) $MBTILES_BIN copy \ ./tests/fixtures/mbtiles/world_cities_modified.mbtiles \