propagate changes, lints, etc

rerun-io · Nov 12, 2023 · 092b7e0 · 092b7e0
1 parent 442eccf
commit 092b7e0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git 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/correctness.rs b/crates/re_arrow_store/tests/correctness.rs
@@ -537,7 +537,11 @@ fn entity_min_time_correct() -> anyhow::Result<()> {
     init_logs();
 
     for config in re_arrow_store::test_util::all_configs() {
-        let mut store = DataStore::new(InstanceKey::name(), config.clone());
+        let mut store = DataStore::new(
+            re_log_types::StoreId::random(re_log_types::StoreKind::Recording),
+            InstanceKey::name(),
+            config.clone(),
+        );
         entity_min_time_correct_impl(&mut store)?;
     }
 

diff --git 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
@@ -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
@@ -96,12 +96,13 @@ fn pathological_bucket_topology() {
             })
             .collect::<Vec<_>>();
 
-        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);