Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor lints #1412

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Minor lints #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/src/config-file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion mbtiles/src/bindiff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ fn start_processor_threads<S: Send + 'static, T: Send + 'static, P: BinDiffer<S,
tx_ins: Sender<T>,
has_errors: Arc<AtomicBool>,
) {
(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();
Expand Down
4 changes: 4 additions & 0 deletions tests/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading