From 5480cc3edec05dd0ef133d25022e6960b8c5be2f Mon Sep 17 00:00:00 2001
From: Clement Rey <cr.rey.clement@gmail.com>
Date: Mon, 15 Jan 2024 13:42:10 +0100
Subject: [PATCH] post-merge craziness

---
 crates/re_query_cache/src/range.rs   | 6 +++---
 crates/re_query_cache/tests/range.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/re_query_cache/src/range.rs b/crates/re_query_cache/src/range.rs
index 7ddb467cd787d..a21e6b5902078 100644
--- a/crates/re_query_cache/src/range.rs
+++ b/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;
diff --git a/crates/re_query_cache/tests/range.rs b/crates/re_query_cache/tests/range.rs
index ccb9e2c4c393a..e551e46a4418d 100644
--- a/crates/re_query_cache/tests/range.rs
+++ b/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