Introduce StoreHub and rename Recording->Store

crates/re_data_store/examples/memory_usage.rs

@@ -48,7 +48,7 @@ fn live_bytes() -> usize {
 
 // ----------------------------------------------------------------------------
 
-use re_log_types::{entity_path, DataRow, RecordingId, RecordingType, RowId};
+use re_log_types::{entity_path, DataRow, RowId, StoreId, StoreKind};
 
 fn main() {
     log_messages();
@@ -91,7 +91,7 @@ fn log_messages() {
 
     const NUM_POINTS: usize = 1_000;
 
-    let recording_id = RecordingId::random(RecordingType::Data);
+    let store_id = StoreId::random(StoreKind::Recording);
     let timeline = Timeline::new_sequence("frame_nr");
     let mut time_point = TimePoint::default();
     time_point.insert(timeline, TimeInt::from(0));
@@ -118,7 +118,7 @@ fn log_messages() {
         );
         let table_bytes = live_bytes() - used_bytes_start;
         let log_msg = Box::new(LogMsg::ArrowMsg(
-            recording_id.clone(),
+            store_id.clone(),
             table.to_arrow_msg().unwrap(),
         ));
         let log_msg_bytes = live_bytes() - used_bytes_start;
@@ -143,10 +143,7 @@ fn log_messages() {
             .into_table(),
         );
         let table_bytes = live_bytes() - used_bytes_start;
-        let log_msg = Box::new(LogMsg::ArrowMsg(
-            recording_id,
-            table.to_arrow_msg().unwrap(),
-        ));
+        let log_msg = Box::new(LogMsg::ArrowMsg(store_id, table.to_arrow_msg().unwrap()));
         let log_msg_bytes = live_bytes() - used_bytes_start;
         println!("Arrow payload containing a Pos2 uses {table_bytes} bytes in RAM");
         let encoded = encode_log_msg(&log_msg);

crates/re_data_store/src/instance_path.rs

@@ -2,7 +2,7 @@ use std::hash::Hash;
 
 use re_log_types::{EntityPath, EntityPathHash, InstanceKey};
 
-use crate::log_db::EntityDb;
+use crate::store_db::EntityDb;
 
 // ----------------------------------------------------------------------------
 

crates/re_data_store/src/lib.rs

@@ -9,13 +9,13 @@ mod editable_auto_value;
 pub mod entity_properties;
 pub mod entity_tree;
 mod instance_path;
-pub mod log_db;
+pub mod store_db;
 mod util;
 
 pub use entity_properties::*;
 pub use entity_tree::*;
 pub use instance_path::*;
-pub use log_db::LogDb;
+pub use store_db::StoreDb;
 pub use util::*;
 
 #[cfg(feature = "serde")]

crates/re_data_store/src/log_db.rs → crates/re_data_store/src/store_db.rs

@@ -4,9 +4,9 @@ use nohash_hasher::IntMap;
 
 use re_arrow_store::{DataStoreConfig, TimeInt};
 use re_log_types::{
-    ArrowMsg, Component as _, ComponentPath, DataCell, DataRow, DataTable, EntityPath,
-    EntityPathHash, EntityPathOpMsg, InstanceKey, LogMsg, PathOp, RecordingId, RecordingInfo,
-    RecordingType, RowId, SetRecordingInfo, TimePoint, Timeline,
+    ApplicationId, ArrowMsg, Component as _, ComponentPath, DataCell, DataRow, DataTable,
+    EntityPath, EntityPathHash, EntityPathOpMsg, InstanceKey, LogMsg, PathOp, RowId, SetStoreInfo,
+    StoreId, StoreInfo, StoreKind, TimePoint, Timeline,
 };
 
 use crate::{Error, TimesPerTimeline};
@@ -171,48 +171,52 @@ impl EntityDb {
 // ----------------------------------------------------------------------------
 
 /// A in-memory database built from a stream of [`LogMsg`]es.
-pub struct LogDb {
-    /// The [`RecordingId`] for this log.
-    recording_id: RecordingId,
+pub struct StoreDb {
+    /// The [`StoreId`] for this log.
+    store_id: StoreId,
 
     /// All [`EntityPathOpMsg`]s ever received.
     entity_op_msgs: BTreeMap<RowId, EntityPathOpMsg>,
 
-    /// Set by whomever created this [`LogDb`].
+    /// Set by whomever created this [`StoreDb`].
     pub data_source: Option<re_smart_channel::SmartChannelSource>,
 
-    /// Comes in a special message, [`LogMsg::SetRecordingInfo`].
-    recording_msg: Option<SetRecordingInfo>,
+    /// Comes in a special message, [`LogMsg::SetStoreInfo`].
+    recording_msg: Option<SetStoreInfo>,
 
     /// Where we store the entities.
     pub entity_db: EntityDb,
 }
 
-impl LogDb {
-    pub fn new(recording_id: RecordingId) -> Self {
+impl StoreDb {
+    pub fn new(store_id: StoreId) -> Self {
         Self {
-            recording_id,
+            store_id,
             entity_op_msgs: Default::default(),
             data_source: None,
             recording_msg: None,
             entity_db: Default::default(),
         }
     }
 
-    pub fn recording_msg(&self) -> Option<&SetRecordingInfo> {
+    pub fn recording_msg(&self) -> Option<&SetStoreInfo> {
         self.recording_msg.as_ref()
     }
 
-    pub fn recording_info(&self) -> Option<&RecordingInfo> {
+    pub fn store_info(&self) -> Option<&StoreInfo> {
         self.recording_msg().map(|msg| &msg.info)
     }
 
-    pub fn recording_type(&self) -> RecordingType {
-        self.recording_id.variant
+    pub fn app_id(&self) -> Option<&ApplicationId> {
+        self.store_info().map(|ri| &ri.application_id)
     }
 
-    pub fn recording_id(&self) -> &RecordingId {
-        &self.recording_id
+    pub fn store_kind(&self) -> StoreKind {
+        self.store_id.kind
+    }
+
+    pub fn store_id(&self) -> &StoreId {
+        &self.store_id
     }
 
     pub fn timelines(&self) -> impl ExactSizeIterator<Item = &Timeline> {
@@ -239,8 +243,10 @@ impl LogDb {
     pub fn add(&mut self, msg: &LogMsg) -> Result<(), Error> {
         re_tracing::profile_function!();
 
+        debug_assert_eq!(msg.store_id(), self.store_id());
+
         match &msg {
-            LogMsg::SetRecordingInfo(msg) => self.add_begin_recording_msg(msg),
+            LogMsg::SetStoreInfo(msg) => self.add_begin_recording_msg(msg),
             LogMsg::EntityPathOpMsg(_, msg) => {
                 let EntityPathOpMsg {
                     row_id,
@@ -256,11 +262,11 @@ impl LogDb {
         Ok(())
     }
 
-    pub fn add_begin_recording_msg(&mut self, msg: &SetRecordingInfo) {
+    pub fn add_begin_recording_msg(&mut self, msg: &SetStoreInfo) {
         self.recording_msg = Some(msg.clone());
     }
 
-    /// Returns an iterator over all [`EntityPathOpMsg`]s that have been written to this `LogDb`.
+    /// Returns an iterator over all [`EntityPathOpMsg`]s that have been written to this `StoreDb`.
     pub fn iter_entity_op_msgs(&self) -> impl Iterator<Item = &EntityPathOpMsg> {
         self.entity_op_msgs.values()
     }
@@ -287,7 +293,7 @@ impl LogDb {
         let cutoff_times = self.entity_db.data_store.oldest_time_per_timeline();
 
         let Self {
-            recording_id: _,
+            store_id: _,
             entity_op_msgs,
             data_source: _,
             recording_msg: _,

crates/re_data_store/src/util.rs

@@ -3,7 +3,7 @@ use re_log_types::{
     DataRow, DeserializableComponent, EntityPath, RowId, SerializableComponent, TimePoint, Timeline,
 };
 
-use crate::LogDb;
+use crate::StoreDb;
 
 // ----------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ where
 
 /// Store a single value for a given [`re_log_types::Component`].
 pub fn store_one_component<C: SerializableComponent>(
-    log_db: &mut LogDb,
+    store_db: &mut StoreDb,
     entity_path: &EntityPath,
     timepoint: &TimePoint,
     component: C,
@@ -74,7 +74,7 @@ pub fn store_one_component<C: SerializableComponent>(
     );
     row.compute_all_size_bytes();
 
-    match log_db.entity_db.try_add_data_row(&row) {
+    match store_db.entity_db.try_add_data_row(&row) {
         Ok(()) => {}
         Err(err) => {
             re_log::warn_once!(

crates/re_data_ui/src/annotation_context.rs

@@ -78,7 +78,7 @@ fn annotation_info(
     keypoint_id: &re_components::KeypointId,
 ) -> Option<re_components::AnnotationInfo> {
     let class_id = ctx
-        .log_db
+        .store_db
         .entity_db
         .data_store
         .query_latest_component::<ClassId>(entity_path, query)?;

crates/re_data_ui/src/component_path.rs

@@ -11,7 +11,7 @@ impl DataUi for ComponentPath {
         verbosity: UiVerbosity,
         query: &re_arrow_store::LatestAtQuery,
     ) {
-        let store = &ctx.log_db.entity_db.data_store;
+        let store = &ctx.store_db.entity_db.data_store;
 
         if let Some((_, component_data)) = re_query::get_component_with_instances(
             store,

crates/re_data_ui/src/instance_path.rs

@@ -17,7 +17,7 @@ impl DataUi for InstancePath {
         verbosity: UiVerbosity,
         query: &re_arrow_store::LatestAtQuery,
     ) {
-        let store = &ctx.log_db.entity_db.data_store;
+        let store = &ctx.store_db.entity_db.data_store;
 
         let Some(mut components) = store.all_components(&query.timeline, &self.entity_path) else {
             ui.label(format!("No components in entity {}", self.entity_path));

crates/re_data_ui/src/log_msg.rs

@@ -1,4 +1,4 @@
-use re_log_types::{ArrowMsg, DataTable, EntityPathOpMsg, LogMsg, RecordingInfo, SetRecordingInfo};
+use re_log_types::{ArrowMsg, DataTable, EntityPathOpMsg, LogMsg, SetStoreInfo, StoreInfo};
 use re_viewer_context::{UiVerbosity, ViewerContext};
 
 use super::DataUi;
@@ -13,55 +13,55 @@ impl DataUi for LogMsg {
         query: &re_arrow_store::LatestAtQuery,
     ) {
         match self {
-            LogMsg::SetRecordingInfo(msg) => msg.data_ui(ctx, ui, verbosity, query),
+            LogMsg::SetStoreInfo(msg) => msg.data_ui(ctx, ui, verbosity, query),
             LogMsg::EntityPathOpMsg(_, msg) => msg.data_ui(ctx, ui, verbosity, query),
             LogMsg::ArrowMsg(_, msg) => msg.data_ui(ctx, ui, verbosity, query),
         }
     }
 }
 
-impl DataUi for SetRecordingInfo {
+impl DataUi for SetStoreInfo {
     fn data_ui(
         &self,
         _ctx: &mut ViewerContext<'_>,
         ui: &mut egui::Ui,
         _verbosity: UiVerbosity,
         _query: &re_arrow_store::LatestAtQuery,
     ) {
-        ui.code("SetRecordingInfo");
-        let SetRecordingInfo { row_id: _, info } = self;
-        let RecordingInfo {
+        ui.code("SetStoreInfo");
+        let SetStoreInfo { row_id: _, info } = self;
+        let StoreInfo {
             application_id,
-            recording_id,
+            store_id,
             started,
-            recording_source,
+            store_source,
             is_official_example,
-            recording_type,
+            store_kind,
         } = info;
 
         egui::Grid::new("fields").num_columns(2).show(ui, |ui| {
             ui.monospace("application_id:");
             ui.label(application_id.to_string());
             ui.end_row();
 
-            ui.monospace("recording_id:");
-            ui.label(format!("{recording_id:?}"));
+            ui.monospace("store_id:");
+            ui.label(format!("{store_id:?}"));
             ui.end_row();
 
             ui.monospace("started:");
             ui.label(started.format());
             ui.end_row();
 
-            ui.monospace("recording_source:");
-            ui.label(format!("{recording_source}"));
+            ui.monospace("store_source:");
+            ui.label(format!("{store_source}"));
             ui.end_row();
 
             ui.monospace("is_official_example:");
             ui.label(format!("{is_official_example}"));
             ui.end_row();
 
-            ui.monospace("recording_type:");
-            ui.label(format!("{recording_type}"));
+            ui.monospace("store_kind:");
+            ui.label(format!("{store_kind}"));
             ui.end_row();
         });
     }