post-merge craziness

Author: teh-cmc

crates/re_query_cache/src/range.rs

@@ -72,7 +72,7 @@ macro_rules! impl_query_archetype_range {
             };
 
             fn upsert_results<'a, A, $($pov,)+ $($comp,)*>(
-                arch_views: impl Iterator<Item = (Option<TimeInt>, re_query::ArchetypeView<A>)>,
+                arch_views: impl Iterator<Item = re_query::ArchetypeView<A>>,
                 bucket: &mut crate::CacheBucket,
             ) -> crate::Result<u64>
             where
@@ -87,8 +87,8 @@ macro_rules! impl_query_archetype_range {
                 let mut added_entries = 0u64;
                 let mut added_size_bytes = 0u64;
 
-                for (data_time, arch_view) in arch_views {
-                    let data_time = data_time.unwrap_or(TimeInt::MIN); // TODO(cmc): timeless
+                for arch_view in arch_views {
+                    let data_time = arch_view.data_time().unwrap_or(TimeInt::MIN); // TODO(cmc): timeless
 
                     if bucket.contains_data_row(data_time, arch_view.primary_row_id()) {
                         continue;

crates/re_query_cache/tests/range.rs

@@ -355,8 +355,8 @@ fn query_and_compare(store: &DataStore, query: &RangeQuery, ent_path: &EntityPat
         let expected = re_query::range_archetype::<MyPoints, { MyPoints::NUM_COMPONENTS }>(
             store, query, ent_path,
         );
-        for (data_time, arch_view) in expected {
-            expected_data_times.push(data_time);
+        for arch_view in expected {
+            expected_data_times.push(arch_view.data_time());
             expected_instance_keys.push(arch_view.iter_instance_keys().collect_vec());
             expected_positions.push(
                 arch_view