From 70571cd1d5d430fc001abdb3a9d329b3880398d8 Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Sun, 12 Nov 2023 17:54:17 +0100 Subject: [PATCH] propagate changes, lints, etc --- crates/re_arrow_store/src/lib.rs | 2 +- crates/re_arrow_store/tests/data_store.rs | 3 +-- crates/re_arrow_store/tests/dump.rs | 5 +---- crates/re_arrow_store/tests/internals.rs | 11 ++++++----- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/crates/re_arrow_store/src/lib.rs b/crates/re_arrow_store/src/lib.rs index 20e5b8a9d2c9..50b80e9a9544 100644 --- a/crates/re_arrow_store/src/lib.rs +++ b/crates/re_arrow_store/src/lib.rs @@ -39,7 +39,7 @@ pub mod test_util; pub use self::arrow_util::ArrayExt; pub use self::store::{DataStore, DataStoreConfig, StoreGeneration}; pub use self::store_event::{StoreDiff, StoreDiffKind, StoreEvent}; -pub use self::store_gc::{GarbageCollectionOptions, GarbageCollectionTarget}; +pub use self::store_gc::{Deleted, GarbageCollectionOptions, GarbageCollectionTarget}; pub use self::store_helpers::VersionedComponent; pub use self::store_read::{LatestAtQuery, RangeQuery}; pub use self::store_stats::{DataStoreRowStats, DataStoreStats, EntityStats}; diff --git a/crates/re_arrow_store/tests/data_store.rs b/crates/re_arrow_store/tests/data_store.rs index 39d77941b2f2..3c118a7be2b2 100644 --- a/crates/re_arrow_store/tests/data_store.rs +++ b/crates/re_arrow_store/tests/data_store.rs @@ -40,7 +40,7 @@ fn insert_table_with_retries(store: &mut DataStore, table: &DataTable) { Err(WriteError::ReusedRowId(_)) => { row.row_id = row.row_id.next(); } - err @ Err(_) => err.unwrap(), + err @ Err(_) => err.map(|_| ()).unwrap(), } } } @@ -493,7 +493,6 @@ fn range_impl(store: &mut DataStore) { for table in store.to_data_tables(None) { insert_table_with_retries(&mut store2, &table); } - store2.wipe_timeless_data(); store2.gc(GarbageCollectionOptions::gc_everything()); for table in store.to_data_tables(None) { insert_table_with_retries(&mut store2, &table); diff --git a/crates/re_arrow_store/tests/dump.rs b/crates/re_arrow_store/tests/dump.rs index f50f93b9174e..094caf807130 100644 --- a/crates/re_arrow_store/tests/dump.rs +++ b/crates/re_arrow_store/tests/dump.rs @@ -25,7 +25,7 @@ fn insert_table_with_retries(store: &mut DataStore, table: &DataTable) { Err(WriteError::ReusedRowId(_)) => { row.row_id = row.row_id.next(); } - err @ Err(_) => err.unwrap(), + err @ Err(_) => err.map(|_| ()).unwrap(), } } } @@ -60,11 +60,8 @@ fn data_store_dump() { data_store_dump_impl(&mut store1, &mut store2, &mut store3); // stress-test GC impl - store1.wipe_timeless_data(); store1.gc(GarbageCollectionOptions::gc_everything()); - store2.wipe_timeless_data(); store2.gc(GarbageCollectionOptions::gc_everything()); - store3.wipe_timeless_data(); store3.gc(GarbageCollectionOptions::gc_everything()); data_store_dump_impl(&mut store1, &mut store2, &mut store3); diff --git a/crates/re_arrow_store/tests/internals.rs b/crates/re_arrow_store/tests/internals.rs index d2945d397932..345946a49efd 100644 --- a/crates/re_arrow_store/tests/internals.rs +++ b/crates/re_arrow_store/tests/internals.rs @@ -96,12 +96,13 @@ fn pathological_bucket_topology() { }) .collect::>(); - rows.iter() - .for_each(|row| store_forward.insert_row(row).unwrap()); + for row in &rows { + store_forward.insert_row(row).unwrap(); + } - rows.iter() - .rev() - .for_each(|row| store_backward.insert_row(row).unwrap()); + rows.iter().rev().for_each(|row| { + store_backward.insert_row(row).unwrap(); + }); } store_repeated_frame(1000, 10, &mut store_forward, &mut store_backward);