toggle latest-at and/or range queries as a whole

crates/re_query_cache/src/query.rs

@@ -189,9 +189,11 @@ seq!(NUM_COMP in 0..10 {
 /// and no optional components.
 ///
 /// Alias for [`query_archetype_with_history_pov1_comp0`].
+#[allow(clippy::too_many_arguments)]
 #[inline]
 pub fn query_archetype_with_history_pov1<'a, A, R1, F>(
-    cached: bool,
+    cached_latest_at: bool,
+    cached_range: bool,
     store: &'a DataStore,
     timeline: &'a Timeline,
     time: &'a TimeInt,
@@ -211,7 +213,14 @@ where
     ),
 {
     query_archetype_with_history_pov1_comp0::<A, R1, F>(
-        cached, store, timeline, time, history, ent_path, f,
+        cached_latest_at,
+        cached_range,
+        store,
+        timeline,
+        time,
+        history,
+        ent_path,
+        f,
     )
 }
 
@@ -221,8 +230,10 @@ macro_rules! impl_query_archetype_with_history {
     (for N=$N:expr, M=$M:expr => povs=[$($pov:ident)+] comps=[$($comp:ident)*]) => { paste! {
         #[doc = "Cached implementation of [`re_query::query_archetype_with_history`] for `" $N "` point-of-view"]
         #[doc = "components and `" $M "` optional components."]
+        #[allow(clippy::too_many_arguments)]
         pub fn [<query_archetype_with_history_pov$N _comp$M>]<'a, A, $($pov,)+ $($comp,)* F>(
-            cached: bool,
+            cached_latest_at: bool,
+            cached_range: bool,
             store: &'a DataStore,
             timeline: &'a Timeline,
             time: &'a TimeInt,
@@ -243,32 +254,39 @@ macro_rules! impl_query_archetype_with_history {
                 ),
             ),
         {
-            // NOTE: not `profile_function!` because we want them merged together.
-            re_tracing::profile_scope!(
-                "query_archetype_with_history",
-                format!("cached={cached} arch={} pov={} comp={}", A::name(), $N, $M)
-            );
 
             let visible_history = match timeline.typ() {
                 re_log_types::TimeType::Time => history.nanos,
                 re_log_types::TimeType::Sequence => history.sequences,
             };
 
             if !history.enabled || visible_history == VisibleHistory::OFF {
+                // NOTE: not `profile_function!` because we want them merged together.
+                re_tracing::profile_scope!(
+                    "query_archetype_with_history",
+                    format!("cached={cached_latest_at} arch={} pov={} comp={}", A::name(), $N, $M)
+                );
+
                 let query = LatestAtQuery::new(*timeline, *time);
                 $crate::[<query_archetype_pov$N _comp$M>]::<A, $($pov,)+ $($comp,)* _>(
-                    cached,
+                    cached_latest_at,
                     store,
                     &query.clone().into(),
                     ent_path,
                     f,
                 )
             } else {
+                // NOTE: not `profile_function!` because we want them merged together.
+                re_tracing::profile_scope!(
+                    "query_archetype_with_history",
+                    format!("cached={cached_range} arch={} pov={} comp={}", A::name(), $N, $M)
+                );
+
                 let min_time = visible_history.from(*time);
                 let max_time = visible_history.to(*time);
                 let query = RangeQuery::new(*timeline, TimeRange::new(min_time, max_time));
                 $crate::[<query_archetype_pov$N _comp$M>]::<A, $($pov,)+ $($comp,)* _>(
-                    cached,
+                    cached_range,
                     store,
                     &query.clone().into(),
                     ent_path,

crates/re_space_view_spatial/src/visualizers/entity_iterator.rs

@@ -124,7 +124,6 @@ macro_rules! impl_process_archetype {
             query: &ViewQuery<'_>,
             view_ctx: &ViewContextCollection,
             default_depth_offset: DepthOffset,
-            cached: bool,
             mut f: F,
         ) -> Result<(), SpaceViewSystemExecutionError>
         where
@@ -146,7 +145,7 @@ macro_rules! impl_process_archetype {
             // NOTE: not `profile_function!` because we want them merged together.
             re_tracing::profile_scope!(
                 "process_archetype",
-                format!("cached={cached} arch={} pov={} comp={}", A::name(), $N, $M)
+                format!("arch={} pov={} comp={}", A::name(), $N, $M)
             );
 
             let transforms = view_ctx.get::<TransformContext>()?;
@@ -185,7 +184,8 @@ macro_rules! impl_process_archetype {
                 };
 
                 ::re_query_cache::[<query_archetype_with_history_pov$N _comp$M>]::<A, $($pov,)+ $($comp,)* _>(
-                    cached,
+                    ctx.app_options.experimental_primary_caching_latest_at,
+                    ctx.app_options.experimental_primary_caching_range,
                     ctx.entity_db.store(),
                     &query.timeline,
                     &query.latest_at,

crates/re_space_view_spatial/src/visualizers/points2d.rs

@@ -272,7 +272,6 @@ impl VisualizerSystem for Points2DVisualizer {
             query,
             view_ctx,
             view_ctx.get::<EntityDepthOffsets>()?.points,
-            ctx.app_options.experimental_primary_caching_point_clouds,
             |_ctx,
              ent_path,
              _ent_props,

crates/re_space_view_spatial/src/visualizers/points3d.rs

@@ -204,7 +204,6 @@ impl VisualizerSystem for Points3DVisualizer {
             query,
             view_ctx,
             view_ctx.get::<EntityDepthOffsets>()?.points,
-            ctx.app_options.experimental_primary_caching_point_clouds,
             |_ctx,
              ent_path,
              _ent_props,

crates/re_space_view_text_log/src/visualizer_system.rs

@@ -68,7 +68,7 @@ impl VisualizerSystem for TextLogSystem {
                 re_data_store::RangeQuery::new(query.timeline, TimeRange::EVERYTHING);
 
             re_query_cache::query_archetype_pov1_comp2::<TextLog, Text, TextLogLevel, Color, _>(
-                ctx.app_options.experimental_primary_caching_series,
+                ctx.app_options.experimental_primary_caching_range,
                 store,
                 &timeline_query.clone().into(),
                 &data_result.entity_path,

crates/re_space_view_time_series/src/visualizer_system.rs

@@ -167,7 +167,7 @@ impl TimeSeriesSystem {
                     Text,
                     _,
                 >(
-                    ctx.app_options.experimental_primary_caching_series,
+                    ctx.app_options.experimental_primary_caching_range,
                     store,
                     &query.clone().into(),
                     &data_result.entity_path,

crates/re_viewer/src/ui/rerun_menu.rs

@@ -294,18 +294,18 @@ fn experimental_feature_ui(
     re_ui
         .checkbox(
             ui,
-            &mut app_options.experimental_primary_caching_point_clouds,
-            "Primary caching: 2D & 3D point clouds",
+            &mut app_options.experimental_primary_caching_latest_at,
+            "Primary caching: latest-at queries",
         )
-        .on_hover_text("Toggle primary caching for the 2D & 3D point cloud space views.");
+        .on_hover_text("Toggle primary caching for latest-at queries.\nApplies to the 2D/3D point cloud, text log and time series space views.");
 
     re_ui
         .checkbox(
             ui,
-            &mut app_options.experimental_primary_caching_series,
-            "Primary caching: TextLogs & TimeSeries",
+            &mut app_options.experimental_primary_caching_range,
+            "Primary caching: range queries",
         )
-        .on_hover_text("Toggle primary caching for the time series & text logs space views.");
+        .on_hover_text("Toggle primary caching for range queries.\nApplies to the 2D/3D point cloud, text log and time series space views.");
 
     re_ui
         .checkbox(

crates/re_viewer_context/src/app_options.rs

@@ -25,11 +25,15 @@ pub struct AppOptions {
     /// Enable the experimental support for the container addition workflow.
     pub experimental_additive_workflow: bool,
 
-    /// Toggle primary caching for the 2D & 3D point cloud space views.
-    pub experimental_primary_caching_point_clouds: bool,
+    /// Toggle primary caching for latest-at queries.
+    ///
+    /// Applies to the 2D/3D point cloud, text log and time series space views.
+    pub experimental_primary_caching_latest_at: bool,
 
-    /// Toggle primary caching for the time series & text logs space views.
-    pub experimental_primary_caching_series: bool,
+    /// Toggle primary caching for range queries.
+    ///
+    /// Applies to the 2D/3D point cloud, text log and time series space views.
+    pub experimental_primary_caching_range: bool,
 
     /// Displays an overlay for debugging picking.
     pub show_picking_debug_overlay: bool,
@@ -60,8 +64,8 @@ impl Default for AppOptions {
 
             experimental_additive_workflow: cfg!(debug_assertions),
 
-            experimental_primary_caching_point_clouds: true,
-            experimental_primary_caching_series: true,
+            experimental_primary_caching_latest_at: true,
+            experimental_primary_caching_range: false,
 
             show_picking_debug_overlay: false,