Use weaker version of ComponentDescriptor for indicators

crates/build/re_types_builder/src/codegen/rust/api.rs

@@ -1131,7 +1131,6 @@ fn quote_trait_impls_for_archetype(reporter: &Reporter, obj: &Object) -> TokenSt
             }
         })
         .chain(std::iter::once({
-            let archetype_name = &obj.fqname;
             let indicator_component_name = format!(
                 "{}Indicator",
                 obj.fqname.replace("archetypes", "components")
@@ -1144,7 +1143,7 @@ fn quote_trait_impls_for_archetype(reporter: &Reporter, obj: &Object) -> TokenSt
                 #[inline]
                 pub fn descriptor_indicator() -> ComponentDescriptor {
                     ComponentDescriptor {
-                        archetype_name: Some(#archetype_name.into()),
+                        archetype_name: None,
                         component_name: #indicator_component_name.into(),
                         archetype_field_name: None,
                     }

crates/store/re_chunk/src/migration.rs

@@ -9,6 +9,29 @@ use re_types_core::arrow_helpers::as_array_ref;
 use crate::Chunk;
 
 impl Chunk {
+    /// We look for indicator component descriptors that have an archetype name and strip it.
+    ///
+    /// It turns out that too narrow indicator descriptors cause problems while querying.
+    /// More information: <https://github.com/rerun-io/rerun/pull/9938#issuecomment-2888808593>
+    #[inline]
+    pub fn patched_weak_indicator_descriptor_023_compat(&self) -> Self {
+        let mut chunk = self.clone();
+
+        chunk.components = chunk
+            .components
+            .0
+            .drain()
+            .map(|(mut descriptor, list_array)| {
+                if descriptor.component_name.is_indicator_component() {
+                    descriptor.archetype_name = None;
+                }
+                (descriptor, list_array)
+            })
+            .collect();
+
+        chunk
+    }
+
     /// A temporary migration kernel for blueprint data.
     ///
     /// Deals with all the space-view terminology breaking changes (`SpaceView`->`View`, `space_view`->`view`, etc).

crates/store/re_chunk_store/src/writes.rs

@@ -51,6 +51,16 @@ impl ChunkStore {
 
         let mut chunk = Arc::clone(chunk);
 
+        // TODO(#6889): This is bad for performance, but indicators should go away all together soon anyways?
+        if chunk
+            .components()
+            .keys()
+            .any(|descr| descr.component_name.is_indicator_component())
+        {
+            let patched = chunk.patched_weak_indicator_descriptor_023_compat();
+            chunk = Arc::new(patched);
+        }
+
         if self.id.kind == re_log_types::StoreKind::Blueprint {
             let patched = chunk.patched_for_blueprint_021_compat();
             chunk = Arc::new(patched);