dealing with all cases of reliance on uncomputed sizes

rerun-io · May 3, 2023 · d0cd877 · d0cd877
1 parent f8e74e9
commit d0cd877
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/crates/re_arrow_store/tests/internals.rs b/crates/re_arrow_store/tests/internals.rs
@@ -52,22 +52,24 @@ fn pathological_bucket_topology() {
 
         let timepoint = TimePoint::from([build_frame_nr(frame_nr.into())]);
         for _ in 0..num {
-            let row = DataRow::from_cells1(
+            let mut row = DataRow::from_cells1(
                 RowId::random(),
                 ent_path.clone(),
                 timepoint.clone(),
                 num_instances,
                 build_some_instances(num_instances as _),
             );
+            row.compute_all_size_bytes();
             store_forward.insert_row(&row).unwrap();
 
-            let row = DataRow::from_cells1(
+            let mut row = DataRow::from_cells1(
                 RowId::random(),
                 ent_path.clone(),
                 timepoint.clone(),
                 num_instances,
                 build_some_instances(num_instances as _),
             );
+            row.compute_all_size_bytes();
             store_backward.insert_row(&row).unwrap();
         }
     }
@@ -83,13 +85,15 @@ fn pathological_bucket_topology() {
         let rows = range
             .map(|frame_nr| {
                 let timepoint = TimePoint::from([build_frame_nr(frame_nr.into())]);
-                DataRow::from_cells1(
+                let mut row = DataRow::from_cells1(
                     RowId::random(),
                     ent_path.clone(),
                     timepoint,
                     num_instances,
                     build_some_instances(num_instances as _),
-                )
+                );
+                row.compute_all_size_bytes();
+                row
             })
             .collect::<Vec<_>>();
 

diff --git a/crates/re_log_types/src/data_cell.rs b/crates/re_log_types/src/data_cell.rs
@@ -591,7 +591,7 @@ fn data_cell_sizes() {
     use arrow2::array::UInt64Array;
 
     // not computed
-    {
+    if !cfg!(debug_assertions) {
         let cell = DataCell::from_arrow(InstanceKey::name(), UInt64Array::from_vec(vec![]).boxed());
         assert_eq!(0, cell.heap_size_bytes());
         assert_eq!(0, cell.heap_size_bytes());

diff --git a/crates/re_log_types/src/data_table_batcher.rs b/crates/re_log_types/src/data_table_batcher.rs
@@ -473,7 +473,8 @@ mod tests {
         let batcher = DataTableBatcher::new(DataTableBatcherConfig::NEVER).unwrap();
         let tables = batcher.tables();
 
-        let expected = create_table();
+        let mut expected = create_table();
+        expected.compute_all_size_bytes();
 
         for _ in 0..3 {
             assert_eq!(Err(TryRecvError::Empty), tables.try_recv());
@@ -507,7 +508,9 @@ mod tests {
         let batcher = DataTableBatcher::new(DataTableBatcherConfig::NEVER).unwrap();
         let tables = batcher.tables();
 
-        let rows = create_table().to_rows().collect_vec();
+        let mut table = create_table();
+        table.compute_all_size_bytes();
+        let rows = table.to_rows().collect_vec();
 
         for _ in 0..3 {
             assert_eq!(Err(TryRecvError::Empty), tables.try_recv());
@@ -608,7 +611,8 @@ mod tests {
 
     #[test]
     fn num_rows_trigger() {
-        let table = create_table();
+        let mut table = create_table();
+        table.compute_all_size_bytes();
 
         let rows = table.to_rows().collect_vec();
         let flush_duration = std::time::Duration::from_millis(50);
@@ -667,7 +671,8 @@ mod tests {
 
     #[test]
     fn duration_trigger() {
-        let table = create_table();
+        let mut table = create_table();
+        table.compute_all_size_bytes();
         let rows = table.to_rows().collect_vec();
 
         let flush_duration = Duration::from_millis(50);