fix formatting and parsing of component paths in links (#11364)

Author: IsseW

crates/store/re_chunk_store/src/query.rs

@@ -6,9 +6,7 @@ use std::{
 use itertools::{Either, Itertools as _};
 use nohash_hasher::IntSet;
 
-use re_chunk::{
-    ArchetypeName, Chunk, ComponentIdentifier, LatestAtQuery, RangeQuery, TimelineName,
-};
+use re_chunk::{Chunk, ComponentIdentifier, LatestAtQuery, RangeQuery, TimelineName};
 use re_log_types::AbsoluteTimeRange;
 use re_log_types::{EntityPath, TimeInt, Timeline};
 use re_types_core::{
@@ -282,12 +280,9 @@ impl ChunkStore {
     pub fn entity_component_descriptor(
         &self,
         entity_path: &EntityPath,
-        archetype_name: Option<ArchetypeName>,
         identifier: ComponentIdentifier,
     ) -> Option<ComponentDescriptor> {
-        let matches = |descr: &&ComponentDescriptor| {
-            descr.component == identifier && descr.archetype == archetype_name
-        };
+        let matches = |descr: &&ComponentDescriptor| descr.component == identifier;
 
         let static_chunks = self.static_chunk_ids_per_entity.get(entity_path);
         let static_components_descr =

crates/store/re_dataframe/src/query.rs

@@ -346,11 +346,7 @@ impl<E: StorageEngineLike> QueryHandle<E> {
                             re_chunk::LatestAtQuery::new(TimelineName::new(""), TimeInt::STATIC);
 
                         let component_descriptor = store
-                            .entity_component_descriptor(
-                                &descr.entity_path,
-                                descr.archetype,
-                                descr.component,
-                            )
+                            .entity_component_descriptor(&descr.entity_path, descr.component)
                             .into_iter()
                             .next()?;
 
@@ -1067,11 +1063,7 @@ impl<E: StorageEngineLike> QueryHandle<E> {
                         re_chunk::LatestAtQuery::new(state.filtered_index, *cur_index_value);
 
                     let component_descriptor = store
-                        .entity_component_descriptor(
-                            &descr.entity_path,
-                            descr.archetype,
-                            descr.component,
-                        )
+                        .entity_component_descriptor(&descr.entity_path, descr.component)
                         .into_iter()
                         .next()?;
 

crates/store/re_entity_db/src/instance_path.rs

@@ -100,13 +100,11 @@ impl FromStr for InstancePath {
         let DataPath {
             entity_path,
             instance,
-            component_descriptor,
+            component,
         } = DataPath::from_str(s)?;
 
-        if let Some(component_descriptor) = component_descriptor {
-            return Err(PathParseError::UnexpectedComponentDescriptor(
-                component_descriptor.into(),
-            ));
+        if let Some(component) = component {
+            return Err(PathParseError::UnexpectedComponent(component));
         }
 
         let instance = instance.unwrap_or(Instance::ALL);

crates/store/re_log_types/src/path/component_path.rs

@@ -1,8 +1,8 @@
-use re_types_core::ComponentDescriptor;
+use re_types_core::ComponentIdentifier;
 
 use crate::path::EntityPath;
 
-/// A [`EntityPath`] plus a [`ComponentDescriptor`].
+/// A [`EntityPath`] plus a [`ComponentIdentifier`].
 ///
 /// Example: `camera/left/points:Points3D:color`
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -12,15 +12,15 @@ pub struct ComponentPath {
     pub entity_path: EntityPath,
 
     /// e.g. `Points3D:color`
-    pub component_descriptor: ComponentDescriptor,
+    pub component: ComponentIdentifier,
 }
 
 impl ComponentPath {
     #[inline]
-    pub fn new(entity_path: EntityPath, component_descriptor: ComponentDescriptor) -> Self {
+    pub fn new(entity_path: EntityPath, component: ComponentIdentifier) -> Self {
         Self {
             entity_path,
-            component_descriptor,
+            component,
         }
     }
 
@@ -30,16 +30,16 @@ impl ComponentPath {
     }
 
     #[inline]
-    pub fn component_descriptor(&self) -> &ComponentDescriptor {
-        &self.component_descriptor
+    pub fn component(&self) -> &ComponentIdentifier {
+        &self.component
     }
 }
 
 impl std::fmt::Display for ComponentPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.entity_path.fmt(f)?;
         f.write_str(":")?;
-        self.component_descriptor.fmt(f)?;
+        self.component.fmt(f)?;
         Ok(())
     }
 }

crates/store/re_log_types/src/path/data_path.rs

@@ -1,11 +1,11 @@
-use re_types_core::ComponentDescriptor;
+use re_types_core::ComponentIdentifier;
 
 use crate::{EntityPath, Instance};
 
 /// A general path to some data.
 ///
 /// This always starts with an [`EntityPath`], followed by an optional instance index,
-/// followed by an optional [`ComponentDescriptor`].
+/// followed by an optional [`ComponentIdentifier`].
 ///
 /// For instance:
 ///
@@ -17,7 +17,7 @@ use crate::{EntityPath, Instance};
 pub struct DataPath {
     pub entity_path: EntityPath,
     pub instance: Option<Instance>,
-    pub component_descriptor: Option<ComponentDescriptor>,
+    pub component: Option<ComponentIdentifier>,
 }
 
 impl std::fmt::Display for DataPath {
@@ -28,8 +28,9 @@ impl std::fmt::Display for DataPath {
         {
             write!(f, "[#{instance}]")?;
         }
-        if let Some(component_descriptor) = &self.component_descriptor {
-            write!(f, ":{component_descriptor:?}")?;
+        if let Some(component) = &self.component {
+            f.write_str(":")?;
+            component.fmt(f)?;
         }
         Ok(())
     }