Move *Selector from re_chunk_store to re_sorbet (#9851)

### Related

* Part of #9837

### What

Move `{Column|ComponentColumn|TimelineColumn}Selector` to `re_sorbet`
where they belong (alongside the `*Descriptor` crowd).

Author: abey79

Cargo.lock

@@ -7845,6 +7845,7 @@ dependencies = [
  "re_log",
  "re_log_types",
  "re_renderer",
+ "re_sorbet",
  "re_tracing",
  "re_types",
  "re_types_core",

crates/store/re_chunk_store/src/dataframe.rs

@@ -14,175 +14,14 @@ use itertools::Itertools as _;
 use re_chunk::{LatestAtQuery, RangeQuery, TimelineName};
 use re_log_types::{EntityPath, ResolvedTimeRange, TimeInt, Timeline};
 use re_sorbet::{
-    ColumnDescriptor, ComponentColumnDescriptor, IndexColumnDescriptor, SorbetColumnDescriptors,
+    ColumnDescriptor, ColumnSelector, ComponentColumnDescriptor, ComponentColumnSelector,
+    IndexColumnDescriptor, SorbetColumnDescriptors, TimeColumnSelector,
 };
 use re_types_core::ComponentName;
 use tap::Tap as _;
 
 use crate::{ChunkStore, ColumnMetadata};
 
-// --- Selectors ---
-
-/// Describes a column selection to return as part of a query.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ColumnSelector {
-    Time(TimeColumnSelector),
-    Component(ComponentColumnSelector),
-    //TODO(jleibs): Add support for archetype-based component selection.
-    //ArchetypeField(ArchetypeFieldColumnSelector),
-}
-
-impl From<ColumnDescriptor> for ColumnSelector {
-    #[inline]
-    fn from(desc: ColumnDescriptor) -> Self {
-        match desc {
-            ColumnDescriptor::Time(desc) => Self::Time(desc.into()),
-            ColumnDescriptor::Component(desc) => Self::Component(desc.into()),
-        }
-    }
-}
-
-impl From<TimeColumnSelector> for ColumnSelector {
-    #[inline]
-    fn from(desc: TimeColumnSelector) -> Self {
-        Self::Time(desc)
-    }
-}
-
-impl From<ComponentColumnSelector> for ColumnSelector {
-    #[inline]
-    fn from(desc: ComponentColumnSelector) -> Self {
-        Self::Component(desc)
-    }
-}
-
-/// Select a time column.
-//
-// TODO(cmc): This shouldn't be specific to time, this should be an `IndexColumnSelector` or smth.
-// Particularly unfortunate that this one already leaks into the public API…
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TimeColumnSelector {
-    /// The name of the timeline.
-    pub timeline: TimelineName,
-}
-
-impl From<TimelineName> for TimeColumnSelector {
-    #[inline]
-    fn from(timeline: TimelineName) -> Self {
-        Self { timeline }
-    }
-}
-
-impl From<Timeline> for TimeColumnSelector {
-    #[inline]
-    fn from(timeline: Timeline) -> Self {
-        Self {
-            timeline: *timeline.name(),
-        }
-    }
-}
-
-impl From<&str> for TimeColumnSelector {
-    #[inline]
-    fn from(timeline: &str) -> Self {
-        Self {
-            timeline: timeline.into(),
-        }
-    }
-}
-
-impl From<String> for TimeColumnSelector {
-    #[inline]
-    fn from(timeline: String) -> Self {
-        Self {
-            timeline: timeline.into(),
-        }
-    }
-}
-
-impl From<IndexColumnDescriptor> for TimeColumnSelector {
-    #[inline]
-    fn from(desc: IndexColumnDescriptor) -> Self {
-        Self {
-            timeline: desc.timeline_name(),
-        }
-    }
-}
-
-/// Select a component based on its `EntityPath` and `ComponentName`.
-///
-/// Note, that in the future when Rerun supports duplicate tagged components
-/// on the same entity, this selector may be ambiguous. In this case, the
-/// query result will return an Error if it cannot determine a single selected
-/// component.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ComponentColumnSelector {
-    /// The path of the entity.
-    pub entity_path: EntityPath,
-
-    /// Semantic name associated with this data.
-    ///
-    /// This string will be flexibly matched against the available component names.
-    /// Valid matches are case invariant matches of either the full name or the short name.
-    pub component_name: String,
-}
-
-impl From<ComponentColumnDescriptor> for ComponentColumnSelector {
-    #[inline]
-    fn from(desc: ComponentColumnDescriptor) -> Self {
-        Self {
-            entity_path: desc.entity_path.clone(),
-            component_name: desc.component_name.short_name().to_owned(),
-        }
-    }
-}
-
-impl ComponentColumnSelector {
-    /// Select a component of a given type, based on its  [`EntityPath`]
-    #[inline]
-    pub fn new<C: re_types_core::Component>(entity_path: EntityPath) -> Self {
-        Self {
-            entity_path,
-            component_name: C::name().short_name().to_owned(),
-        }
-    }
-
-    /// Select a component based on its [`EntityPath`] and [`ComponentName`].
-    #[inline]
-    pub fn new_for_component_name(entity_path: EntityPath, component_name: ComponentName) -> Self {
-        Self {
-            entity_path,
-            component_name: component_name.short_name().to_owned(),
-        }
-    }
-}
-
-impl std::fmt::Display for ComponentColumnSelector {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let Self {
-            entity_path,
-            component_name,
-        } = self;
-
-        f.write_fmt(format_args!("{entity_path}:{component_name}"))
-    }
-}
-
-// TODO(jleibs): Add support for archetype-based column selection.
-/*
-/// Select a component based on its `Archetype` and field.
-pub struct ArchetypeFieldColumnSelector {
-    /// The path of the entity.
-    entity_path: EntityPath,
-
-    /// Name of the `Archetype` associated with this data.
-    archetype: ArchetypeName,
-
-    /// The field within the `Archetype` associated with this data.
-    field: String,
-}
-*/
-
 // --- Queries v2 ---
 
 /// Specifies how null values should be filled in the returned dataframe.

crates/store/re_chunk_store/src/lib.rs

@@ -26,8 +26,7 @@ mod writes;
 
 pub use self::{
     dataframe::{
-        ColumnSelector, ComponentColumnSelector, Index, IndexRange, IndexValue, QueryExpression,
-        SparseFillStrategy, TimeColumnSelector, ViewContentsSelector,
+        Index, IndexRange, IndexValue, QueryExpression, SparseFillStrategy, ViewContentsSelector,
     },
     events::{ChunkCompactionReport, ChunkStoreDiff, ChunkStoreDiffKind, ChunkStoreEvent},
     gc::{GarbageCollectionOptions, GarbageCollectionTarget},

crates/store/re_dataframe/src/lib.rs

@@ -8,8 +8,8 @@ pub use self::query::QueryHandle;
 
 #[doc(no_inline)]
 pub use self::external::re_chunk_store::{
-    ChunkStoreConfig, ChunkStoreHandle, ColumnSelector, ComponentColumnSelector, Index, IndexRange,
-    IndexValue, QueryExpression, SparseFillStrategy, TimeColumnSelector, ViewContentsSelector,
+    ChunkStoreConfig, ChunkStoreHandle, Index, IndexRange, IndexValue, QueryExpression,
+    SparseFillStrategy, ViewContentsSelector,
 };
 #[doc(no_inline)]
 pub use self::external::re_log_types::{

crates/store/re_dataframe/src/query.rs

@@ -26,13 +26,14 @@ use re_chunk::{
     TimelineName, UnitChunkShared,
 };
 use re_chunk_store::{
-    ChunkStore, ColumnDescriptor, ColumnSelector, ComponentColumnDescriptor,
-    ComponentColumnSelector, Index, IndexColumnDescriptor, IndexValue, QueryExpression,
-    SparseFillStrategy, TimeColumnSelector,
+    ChunkStore, ColumnDescriptor, ComponentColumnDescriptor, Index, IndexColumnDescriptor,
+    IndexValue, QueryExpression, SparseFillStrategy,
 };
 use re_log_types::ResolvedTimeRange;
 use re_query::{QueryCache, StorageEngineLike};
-use re_sorbet::SorbetColumnDescriptors;
+use re_sorbet::{
+    ColumnSelector, ComponentColumnSelector, SorbetColumnDescriptors, TimeColumnSelector,
+};
 use re_types_core::{components::ClearIsRecursive, ComponentDescriptor};
 
 // ---

crates/store/re_sorbet/src/lib.rs

@@ -27,6 +27,7 @@ mod ipc;
 mod metadata;
 mod migration;
 mod row_id_column_descriptor;
+mod selectors;
 mod sorbet_batch;
 mod sorbet_columns;
 mod sorbet_schema;
@@ -47,6 +48,7 @@ pub use self::{
     },
     migration::migrate_record_batch,
     row_id_column_descriptor::{RowIdColumnDescriptor, WrongDatatypeError},
+    selectors::{ColumnSelector, ComponentColumnSelector, TimeColumnSelector},
     sorbet_batch::SorbetBatch,
     sorbet_columns::SorbetColumnDescriptors,
     sorbet_schema::SorbetSchema,