From f4fe360d37200cfc03cedc63ec77dc3ab079ae29 Mon Sep 17 00:00:00 2001 From: Tpt Date: Wed, 22 Mar 2023 19:39:37 +0100 Subject: [PATCH] Bulk loader: fixes the progress indicator display --- lib/src/storage/mod.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/src/storage/mod.rs b/lib/src/storage/mod.rs index 2539f35e..fe24fa12 100644 --- a/lib/src/storage/mod.rs +++ b/lib/src/storage/mod.rs @@ -1309,14 +1309,13 @@ impl StorageBulkLoader { threads.push_back(spawn(move || { FileBulkLoader::new(storage, batch_size).load(buffer_to_load, &done_counter_clone) })); - self.on_possible_progress(done_counter, done_and_displayed_counter); Ok(()) } fn on_possible_progress(&self, done: &AtomicU64, done_and_displayed: &mut u64) { - let new_counter = done.fetch_max(*done_and_displayed, Ordering::Relaxed); + let new_counter = done.load(Ordering::Relaxed); let display_step = u64::try_from(DEFAULT_BULK_LOAD_BATCH_SIZE).unwrap(); - if new_counter % display_step > *done_and_displayed % display_step { + if new_counter / display_step > *done_and_displayed / display_step { for hook in &self.hooks { hook(new_counter); }