Store indicator component mapping as part of Visualizer's store subscription

crates/re_space_view_spatial/src/parts/boxes2d.rs

@@ -1,15 +1,15 @@
-use re_arrow_store::LatestAtQuery;
+use nohash_hasher::IntSet;
 use re_data_store::{EntityPath, InstancePathHash};
+use re_log_types::EntityPathHash;
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
     archetypes::Boxes2D,
     components::{HalfSizes2D, Position2D, Text},
     Archetype, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, HeuristicFilterContext, IdentifiedViewSystem,
-    ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
-    ViewQuery, ViewerContext,
+    HeuristicFilterContext, IdentifiedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -181,13 +181,11 @@ impl ViewPartSystem for Boxes2DPart {
 
     fn heuristic_filter(
         &self,
-        _store: &re_arrow_store::DataStore,
-        _ent_path: &EntityPath,
+        entities_with_matching_indicator: &IntSet<EntityPathHash>,
+        ent_path: &EntityPath,
         ctx: HeuristicFilterContext,
-        _query: &LatestAtQuery,
-        entity_components: &ComponentNameSet,
     ) -> bool {
-        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+        if !entities_with_matching_indicator.contains(&ent_path.hash()) {
             return false;
         }
 

crates/re_space_view_spatial/src/parts/images.rs

@@ -4,7 +4,6 @@ use egui::NumExt;
 use itertools::Itertools as _;
 use nohash_hasher::IntSet;
 
-use re_arrow_store::LatestAtQuery;
 use re_data_store::{EntityPath, EntityProperties};
 use re_log_types::{EntityPathHash, RowId};
 use re_query::{ArchetypeView, QueryError};
@@ -20,7 +19,7 @@ use re_types::{
     Archetype as _, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, gpu_bridge, DefaultColor, HeuristicFilterContext, SpaceViewClass,
+    gpu_bridge, DefaultColor, HeuristicFilterContext, SpaceViewClass,
     SpaceViewSystemExecutionError, TensorDecodeCache, TensorStatsCache, ViewPartSystem, ViewQuery,
     ViewerContext, VisualizerAdditionalApplicabilityFilter,
 };
@@ -694,13 +693,11 @@ impl ViewPartSystem for ImagesPart {
 
     fn heuristic_filter(
         &self,
-        _store: &re_arrow_store::DataStore,
-        _ent_path: &EntityPath,
+        entities_with_matching_indicator: &IntSet<EntityPathHash>,
+        ent_path: &EntityPath,
         ctx: HeuristicFilterContext,
-        _query: &LatestAtQuery,
-        entity_components: &ComponentNameSet,
     ) -> bool {
-        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+        if !entities_with_matching_indicator.contains(&ent_path.hash()) {
             return false;
         }
 

crates/re_space_view_spatial/src/parts/lines2d.rs

@@ -1,15 +1,15 @@
-use re_arrow_store::LatestAtQuery;
+use nohash_hasher::IntSet;
 use re_data_store::{EntityPath, InstancePathHash};
+use re_log_types::EntityPathHash;
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
     archetypes::LineStrips2D,
     components::{LineStrip2D, Text},
     Archetype as _, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, HeuristicFilterContext, IdentifiedViewSystem,
-    ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
-    ViewQuery, ViewerContext,
+    HeuristicFilterContext, IdentifiedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -176,13 +176,11 @@ impl ViewPartSystem for Lines2DPart {
 
     fn heuristic_filter(
         &self,
-        _store: &re_arrow_store::DataStore,
-        _ent_path: &EntityPath,
+        entities_with_matching_indicator: &IntSet<EntityPathHash>,
+        ent_path: &EntityPath,
         ctx: HeuristicFilterContext,
-        _query: &LatestAtQuery,
-        entity_components: &ComponentNameSet,
     ) -> bool {
-        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+        if !entities_with_matching_indicator.contains(&ent_path.hash()) {
             return false;
         }
 

crates/re_space_view_spatial/src/parts/points2d.rs

@@ -1,15 +1,15 @@
-use re_arrow_store::LatestAtQuery;
+use nohash_hasher::IntSet;
 use re_data_store::{EntityPath, InstancePathHash};
+use re_log_types::EntityPathHash;
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
     archetypes::Points2D,
     components::{Position2D, Text},
     Archetype, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, HeuristicFilterContext, IdentifiedViewSystem,
-    ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
-    ViewQuery, ViewerContext,
+    HeuristicFilterContext, IdentifiedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -203,13 +203,11 @@ impl ViewPartSystem for Points2DPart {
 
     fn heuristic_filter(
         &self,
-        _store: &re_arrow_store::DataStore,
-        _ent_path: &EntityPath,
+        entities_with_matching_indicator: &IntSet<EntityPathHash>,
+        ent_path: &EntityPath,
         ctx: HeuristicFilterContext,
-        _query: &LatestAtQuery,
-        entity_components: &ComponentNameSet,
     ) -> bool {
-        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+        if !entities_with_matching_indicator.contains(&ent_path.hash()) {
             return false;
         }
 

crates/re_viewer/src/app_state.rs

@@ -133,10 +133,14 @@ impl AppState {
         let rec_cfg =
             recording_config_entry(recording_configs, store_db.store_id().clone(), store_db);
 
+        // Gather all entities that have a matching indicator for a visualizer.
+        let entities_with_matching_indicator_per_visualizer = space_view_class_registry
+            .entities_with_matching_indicator_per_visualizer(store_db.store_id());
+
         let entities_per_system_per_class = identify_entities_per_system_per_class(
+            &entities_with_matching_indicator_per_visualizer,
             space_view_class_registry,
             store_db,
-            &rec_cfg.time_ctrl.get_mut().current_query(),
         );
 
         // Execute the queries for every `SpaceView`
@@ -169,6 +173,8 @@ impl AppState {
             store_db,
             store_context,
             entities_per_system_per_class: &entities_per_system_per_class,
+            entities_with_matching_indicator_per_visualizer:
+                &entities_with_matching_indicator_per_visualizer,
             query_results: &query_results,
             rec_cfg,
             re_ui,
@@ -206,6 +212,8 @@ impl AppState {
             store_db,
             store_context,
             entities_per_system_per_class: &entities_per_system_per_class,
+            entities_with_matching_indicator_per_visualizer:
+                &entities_with_matching_indicator_per_visualizer,
             query_results: &query_results,
             rec_cfg,
             re_ui,

crates/re_viewer_context/src/lib.rs

@@ -41,11 +41,11 @@ pub use selection_state::{
     Selection, SelectionHighlight,
 };
 pub use space_view::{
-    default_heuristic_filter, AutoSpawnHeuristic, DataResult, DynSpaceViewClass,
-    HeuristicFilterContext, IdentifiedViewSystem, PerSystemDataResults, PerSystemEntities,
-    PropertyOverrides, SpaceViewClass, SpaceViewClassIdentifier, SpaceViewClassLayoutPriority,
-    SpaceViewClassRegistry, SpaceViewClassRegistryError, SpaceViewEntityHighlight,
-    SpaceViewHighlights, SpaceViewOutlineMasks, SpaceViewState, SpaceViewSystemExecutionError,
+    AutoSpawnHeuristic, DataResult, DynSpaceViewClass, HeuristicFilterContext,
+    IdentifiedViewSystem, PerSystemDataResults, PerSystemEntities, PropertyOverrides,
+    SpaceViewClass, SpaceViewClassIdentifier, SpaceViewClassLayoutPriority, SpaceViewClassRegistry,
+    SpaceViewClassRegistryError, SpaceViewEntityHighlight, SpaceViewHighlights,
+    SpaceViewOutlineMasks, SpaceViewState, SpaceViewSystemExecutionError,
     SpaceViewSystemRegistrator, SystemExecutionOutput, ViewContextCollection, ViewContextSystem,
     ViewPartCollection, ViewPartSystem, ViewQuery, ViewSystemIdentifier,
     VisualizerAdditionalApplicabilityFilter,

crates/re_viewer_context/src/space_view/mod.rs

@@ -29,9 +29,7 @@ pub use space_view_class_registry::{
 };
 pub use system_execution_output::SystemExecutionOutput;
 pub use view_context_system::{ViewContextCollection, ViewContextSystem};
-pub use view_part_system::{
-    default_heuristic_filter, HeuristicFilterContext, ViewPartCollection, ViewPartSystem,
-};
+pub use view_part_system::{HeuristicFilterContext, ViewPartCollection, ViewPartSystem};
 pub use view_query::{DataResult, PerSystemDataResults, PropertyOverrides, ViewQuery};
 pub use visualizer_entity_subscriber::VisualizerAdditionalApplicabilityFilter;
 

crates/re_viewer_context/src/space_view/space_view_class_registry.rs

@@ -1,7 +1,7 @@
 use ahash::{HashMap, HashSet};
-use nohash_hasher::IntSet;
+use nohash_hasher::{IntMap, IntSet};
 use re_arrow_store::DataStore;
-use re_log_types::EntityPath;
+use re_log_types::{EntityPath, EntityPathHash};
 
 use crate::{
     DynSpaceViewClass, IdentifiedViewSystem, SpaceViewClassIdentifier, ViewContextCollection,
@@ -284,17 +284,42 @@ impl SpaceViewClassRegistry {
     pub fn applicable_entities_for_visualizer_system(
         &self,
         visualizer: ViewSystemIdentifier,
-        store: &re_log_types::StoreId,
+        store_id: &re_log_types::StoreId,
     ) -> Option<IntSet<EntityPath>> {
         self.visualizers.get(&visualizer).and_then(|entry| {
             DataStore::with_subscriber::<VisualizerEntitySubscriber, _, _>(
                 entry.entity_subscriber_handle,
-                |subscriber| subscriber.entities(store).cloned(),
+                |subscriber| subscriber.applicable_entities(store_id).cloned(),
             )
             .flatten()
         })
     }
 
+    /// For each visualizer, the set of entities that have at least one matching indicator component.
+    pub fn entities_with_matching_indicator_per_visualizer(
+        &self,
+        store_id: &re_log_types::StoreId,
+    ) -> IntMap<ViewSystemIdentifier, IntSet<EntityPathHash>> {
+        self.visualizers
+            .iter()
+            .map(|(id, entry)| {
+                (
+                    *id,
+                    DataStore::with_subscriber::<VisualizerEntitySubscriber, _, _>(
+                        entry.entity_subscriber_handle,
+                        |subscriber| {
+                            subscriber
+                                .entities_with_matching_indicator(store_id)
+                                .cloned()
+                        },
+                    )
+                    .flatten()
+                    .unwrap_or_default(),
+                )
+            })
+            .collect()
+    }
+
     pub fn new_context_collection(
         &self,
         space_view_class_identifier: SpaceViewClassIdentifier,

crates/re_viewer_context/src/space_view/view_part_system.rs

@@ -1,7 +1,7 @@
 use ahash::HashMap;
 
-use re_arrow_store::LatestAtQuery;
-use re_log_types::EntityPath;
+use nohash_hasher::IntSet;
+use re_log_types::{EntityPath, EntityPathHash};
 use re_types::ComponentNameSet;
 
 use crate::{
@@ -62,24 +62,16 @@ pub trait ViewPartSystem: Send + Sync + 'static {
     /// the minimal set of required components), this method applies an arbitrary filter to determine whether
     /// or not the system should be instantiated by default.
     ///
-    /// The passed-in set of `entity_components` corresponds to all the different components that have ever
-    /// been logged on the entity path.
-    ///
-    /// By default, this returns true if eiher [`Self::indicator_components`] is empty or
-    /// `entity_components` contains at least one of these indicator components.
-    ///
     /// Override this method only if a more detailed condition is required to inform heuristics whether or not
     /// the given entity is relevant for this system.
     #[inline]
     fn heuristic_filter(
         &self,
-        _store: &re_arrow_store::DataStore,
-        _ent_path: &EntityPath,
+        entities_with_matching_indicator: &IntSet<EntityPathHash>,
+        ent_path: &EntityPath,
         _ctx: HeuristicFilterContext,
-        _query: &LatestAtQuery,
-        entity_components: &ComponentNameSet,
     ) -> bool {
-        default_heuristic_filter(entity_components, &self.indicator_components())
+        entities_with_matching_indicator.contains(&ent_path.hash())
     }
 
     /// Additional filter for applicability.
@@ -115,25 +107,6 @@ pub trait ViewPartSystem: Send + Sync + 'static {
     fn as_any(&self) -> &dyn std::any::Any;
 }
 
-/// The default implementation for [`ViewPartSystem::heuristic_filter`].
-///
-/// Returns true if either `indicator_components` is empty or `entity_components` contains at least one
-/// of these indicator components.
-///
-/// Exported as a standalone function to simplify the implementation of custom filters.
-#[inline]
-pub fn default_heuristic_filter(
-    entity_components: &ComponentNameSet,
-    indicator_components: &ComponentNameSet,
-) -> bool {
-    if indicator_components.is_empty() {
-        true // if there are no indicator components, then show anything with the required compoonents
-    } else {
-        // do we have at least one of the indicator components?
-        entity_components.intersection(indicator_components).count() > 0
-    }
-}
-
 pub struct ViewPartCollection {
     pub systems: HashMap<ViewSystemIdentifier, Box<dyn ViewPartSystem>>,
 }