wip

crates/re_arrow_store/benches/data_store.rs

@@ -8,8 +8,8 @@ use re_arrow_store::{DataStore, DataStoreConfig, LatestAtQuery, RangeQuery, Time
 use re_log_types::{
     component_types::{InstanceKey, Rect2D},
     datagen::{build_frame_nr, build_some_instances, build_some_rects},
-    msg_bundle::{try_build_msg_bundle2, Component as _, MsgBundle},
-    ComponentName, EntityPath, MsgId, TimeType, Timeline,
+    msg_bundle::{try_build_msg_bundle2, MsgBundle},
+    Component as _, ComponentName, EntityPath, MsgId, TimeType, Timeline,
 };
 
 // ---

crates/re_arrow_store/examples/dump_dataframe.rs

@@ -11,8 +11,7 @@ use re_log_types::{
         build_frame_nr, build_log_time, build_some_instances, build_some_instances_from,
         build_some_point2d, build_some_rects,
     },
-    msg_bundle::Component as _,
-    EntityPath, Time,
+    Component as _, EntityPath, Time,
 };
 
 // ---

crates/re_arrow_store/examples/latest_component.rs

@@ -11,8 +11,7 @@ use re_log_types::datagen::build_some_rects;
 use re_log_types::{
     component_types::{InstanceKey, Point2D},
     datagen::{build_frame_nr, build_some_point2d},
-    msg_bundle::Component,
-    EntityPath,
+    Component, EntityPath,
 };
 
 fn main() {

crates/re_arrow_store/examples/latest_components.rs

@@ -10,8 +10,7 @@ use re_arrow_store::{test_bundle, DataStore, LatestAtQuery, TimeType, Timeline};
 use re_log_types::{
     component_types::{InstanceKey, Point2D, Rect2D},
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
-    msg_bundle::Component,
-    EntityPath,
+    Component, EntityPath,
 };
 
 fn main() {

crates/re_arrow_store/examples/range_components.rs

@@ -9,8 +9,7 @@ use re_arrow_store::{polars_util, test_bundle, DataStore, RangeQuery, TimeRange}
 use re_log_types::{
     component_types::{InstanceKey, Point2D, Rect2D},
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
-    msg_bundle::Component as _,
-    EntityPath, TimeType, Timeline,
+    Component as _, EntityPath, TimeType, Timeline,
 };
 
 fn main() {

crates/re_arrow_store/tests/correctness.rs

@@ -16,8 +16,7 @@ use re_log_types::{
         build_frame_nr, build_log_time, build_some_colors, build_some_instances, build_some_point2d,
     },
     external::arrow2_convert::deserialize::arrow_array_deserialize_iterator,
-    msg_bundle::Component as _,
-    DataCell, Duration, EntityPath, MsgId, Time, TimeType, Timeline,
+    Component as _, DataCell, Duration, EntityPath, MsgId, Time, TimeType, Timeline,
 };
 
 // ---

crates/re_arrow_store/tests/data_store.rs

@@ -22,8 +22,8 @@ use re_log_types::{
         build_some_point2d, build_some_rects,
     },
     external::arrow2_convert::deserialize::arrow_array_deserialize_iterator,
-    msg_bundle::{wrap_in_listarray, Component as _, MsgBundle},
-    ComponentName, EntityPath, MsgId, TimeType, Timeline,
+    msg_bundle::{wrap_in_listarray, MsgBundle},
+    Component as _, ComponentName, EntityPath, MsgId, TimeType, Timeline,
 };
 
 // --- LatestComponentsAt ---

crates/re_arrow_store/tests/internals.rs

@@ -8,8 +8,8 @@ use re_arrow_store::{DataStore, DataStoreConfig};
 use re_log_types::{
     component_types::InstanceKey,
     datagen::{build_frame_nr, build_some_instances},
-    msg_bundle::{Component as _, MsgBundle},
-    EntityPath, MsgId, TimePoint,
+    msg_bundle::MsgBundle,
+    Component as _, EntityPath, MsgId, TimePoint,
 };
 
 // --- Internals ---

crates/re_data_store/src/entity_properties.rs

@@ -1,7 +1,7 @@
 use re_arrow_store::LatestAtQuery;
 use re_log_types::{
     external::arrow2_convert::deserialize::arrow_array_deserialize_iterator,
-    msg_bundle::DeserializableComponent, EntityPath,
+    DeserializableComponent, EntityPath,
 };
 
 use crate::log_db::EntityDb;
@@ -201,7 +201,7 @@ impl Default for ColorMapper {
 
 // ----------------------------------------------------------------------------
 
-/// Get the latest value for a given [`re_log_types::msg_bundle::Component`].
+/// Get the latest value for a given [`re_log_types::Component`].
 ///
 /// This assumes that the row we get from the store only contains a single instance for this
 /// component; it will log a warning otherwise.

crates/re_data_store/src/log_db.rs

@@ -3,10 +3,10 @@ use nohash_hasher::IntMap;
 use re_arrow_store::{DataStoreConfig, GarbageCollectionTarget, TimeInt};
 use re_log_types::{
     component_types::InstanceKey,
-    external::arrow2_convert::deserialize::arrow_array_deserialize_iterator,
-    msg_bundle::{Component as _, MsgBundle},
-    ArrowMsg, BeginRecordingMsg, ComponentPath, DataCell, EntityPath, EntityPathHash,
-    EntityPathOpMsg, LogMsg, MsgId, PathOp, RecordingId, RecordingInfo, TimePoint, Timeline,
+    external::arrow2_convert::deserialize::arrow_array_deserialize_iterator, msg_bundle::MsgBundle,
+    ArrowMsg, BeginRecordingMsg, Component as _, ComponentPath, DataCell, EntityPath,
+    EntityPathHash, EntityPathOpMsg, LogMsg, MsgId, PathOp, RecordingId, RecordingInfo, TimePoint,
+    Timeline,
 };
 
 use crate::{Error, TimesPerTimeline};

crates/re_log_types/src/component.rs

@@ -0,0 +1,66 @@
+use arrow2::datatypes::Field;
+use arrow2_convert::{
+    deserialize::{ArrowArray, ArrowDeserialize},
+    field::ArrowField,
+    serialize::ArrowSerialize,
+};
+
+use crate::ComponentName;
+
+// ---
+
+/// A type that can used as a Component of an Entity.
+///
+/// Examples of components include positions and colors.
+pub trait Component: ArrowField {
+    /// The name of the component.
+    fn name() -> ComponentName;
+
+    /// Create a [`Field`] for this [`Component`].
+    fn field() -> Field {
+        Field::new(Self::name().as_str(), Self::data_type(), false)
+    }
+}
+
+// TODO(cmc): do a pass over these traits, this is incomprehensible... also why would a component
+// ever not be (de)serializable? Do keep in mind the whole (component, datatype) story though.
+
+/// A [`Component`] that fulfils all the conditions required to be serialized as an Arrow payload.
+pub trait SerializableComponent<ArrowFieldType = Self>
+where
+    Self: Component + ArrowSerialize + ArrowField<Type = Self> + 'static,
+{
+}
+
+impl<C> SerializableComponent for C where
+    C: Component + ArrowSerialize + ArrowField<Type = C> + 'static
+{
+}
+
+/// A [`Component`] that fulfils all the conditions required to be deserialized from an Arrow
+/// payload.
+///
+/// Note that due to the use of HRTBs in `arrow2_convert` traits, you will still need an extra HRTB
+/// clause when marking a type as `DeserializableComponent`:
+/// ```ignore
+/// where
+///     T: SerializableComponent,
+///     for<'a> &'a T::ArrayType: IntoIterator,
+/// ```
+pub trait DeserializableComponent<ArrowFieldType = Self>
+where
+    Self: Component,
+    Self: ArrowDeserialize + ArrowField<Type = ArrowFieldType> + 'static,
+    Self::ArrayType: ArrowArray,
+    for<'b> &'b Self::ArrayType: IntoIterator,
+{
+}
+
+impl<C> DeserializableComponent for C
+where
+    C: Component,
+    C: ArrowDeserialize + ArrowField<Type = C> + 'static,
+    C::ArrayType: ArrowArray,
+    for<'b> &'b C::ArrayType: IntoIterator,
+{
+}

crates/re_log_types/src/component_types/arrow.rs

@@ -1,7 +1,7 @@
 use super::Vec3D;
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A 3D Arrow
 ///

crates/re_log_types/src/component_types/bbox.rs

@@ -6,7 +6,7 @@ use arrow2_convert::{
     serialize::ArrowSerialize,
 };
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A 3D bounding box represented by it's half-lengths
 ///

crates/re_log_types/src/component_types/class_id.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A 16-bit ID representing a type of semantic class.
 ///

crates/re_log_types/src/component_types/color.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// An RGBA color tuple.
 ///

crates/re_log_types/src/component_types/context.rs

@@ -7,7 +7,7 @@ use arrow2_convert::{
 
 use crate::{
     component_types::{ClassId, KeypointId},
-    msg_bundle::Component,
+    Component,
 };
 
 use super::{ColorRGBA, Label};

crates/re_log_types/src/component_types/coordinates.rs

@@ -5,7 +5,7 @@ use arrow2_convert::{
     serialize::ArrowSerialize,
 };
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// The six cardinal directions for 3D view-space and image-space.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

crates/re_log_types/src/component_types/instance_key.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A number used to specify a specific instance in an entity.
 ///

crates/re_log_types/src/component_types/keypoint_id.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A 16-bit ID representing a type of semantic keypoint within a class.
 ///

crates/re_log_types/src/component_types/label.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A String label component
 ///

crates/re_log_types/src/component_types/linestrip.rs

@@ -7,7 +7,7 @@ use arrow2_convert::{
     serialize::ArrowSerialize,
 };
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 use super::Vec2D;
 use super::Vec3D;

crates/re_log_types/src/component_types/mesh3d.rs

@@ -7,7 +7,7 @@ use arrow2_convert::deserialize::ArrowDeserialize;
 use arrow2_convert::field::ArrowField;
 use arrow2_convert::{serialize::ArrowSerialize, ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 use super::{FieldError, Vec4D};
 

crates/re_log_types/src/component_types/mod.rs

@@ -14,7 +14,7 @@ use arrow2_convert::{
 };
 use lazy_static::lazy_static;
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 mod arrow;
 mod arrow_convert_shims;

crates/re_log_types/src/component_types/msg_id.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::{msg_bundle::Component, ComponentName};
+use crate::{Component, ComponentName};
 
 /// A unique id per [`crate::LogMsg`].
 ///

crates/re_log_types/src/component_types/point.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 // TODO(cmc): Points should just be containers of Vecs.
 

crates/re_log_types/src/component_types/quaternion.rs

@@ -6,7 +6,7 @@ use arrow2_convert::{
     serialize::ArrowSerialize,
 };
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A Quaternion represented by 4 real numbers.
 ///

crates/re_log_types/src/component_types/radius.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A Radius component
 ///

crates/re_log_types/src/component_types/rect.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 use super::Vec4D;
 

crates/re_log_types/src/component_types/scalar.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 // ---
 

crates/re_log_types/src/component_types/size.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A 3D size, e.g. the size of a 3D box.
 // TODO(cmc): should just embed a Vec3D?

crates/re_log_types/src/component_types/tensor.rs

@@ -4,7 +4,7 @@ use arrow2_convert::deserialize::ArrowDeserialize;
 use arrow2_convert::field::ArrowField;
 use arrow2_convert::{serialize::ArrowSerialize, ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 use crate::{TensorDataType, TensorElement};
 
 use super::arrow_convert_shims::BinaryBuffer;

crates/re_log_types/src/component_types/text_entry.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// A text entry component, comprised of a text body and its log level.
 ///

crates/re_log_types/src/component_types/transform.rs

@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::msg_bundle::Component;
+use crate::Component;
 
 use super::{mat::Mat3x3, Quaternion, Vec2D, Vec3D};
 

crates/re_log_types/src/component_types/vec.rs

@@ -1,7 +1,7 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
 use super::FixedSizeArrayField;
-use crate::msg_bundle::Component;
+use crate::Component;
 
 /// Number of decimals shown for all vector display methods.
 const DISPLAY_PRECISION: usize = 3;

crates/re_log_types/src/data_cell.rs

@@ -1,9 +1,8 @@
 use arrow2_convert::deserialize::arrow_array_deserialize_iterator;
 
 use crate::{
-    external::arrow2_convert::serialize::TryIntoArrow,
-    msg_bundle::{wrap_in_listarray, Component, DeserializableComponent, SerializableComponent},
-    ComponentName,
+    external::arrow2_convert::serialize::TryIntoArrow, msg_bundle::wrap_in_listarray, Component,
+    ComponentName, DeserializableComponent, SerializableComponent,
 };
 
 // ---