renamed crates shenanigans

rerun-io · Jan 4, 2024 · 9989efd · 9989efd
1 parent e2952d8
commit 9989efd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/re_query_cache/Cargo.toml b/crates/re_query_cache/Cargo.toml
@@ -21,8 +21,8 @@ default = []
 
 [dependencies]
 # Rerun dependencies:
-re_arrow_store.workspace = true
 re_data_store.workspace = true
+re_entity_db.workspace = true
 re_format.workspace = true
 re_log.workspace = true
 re_log_types.workspace = true

diff --git a/crates/re_query_cache/benches/latest_at.rs b/crates/re_query_cache/benches/latest_at.rs
@@ -4,7 +4,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use itertools::Itertools;
-use re_arrow_store::{DataStore, LatestAtQuery};
+use re_data_store::{DataStore, LatestAtQuery};
 use re_log_types::{entity_path, DataRow, EntityPath, RowId, TimeInt, TimeType, Timeline};
 use re_query_cache::query_cached_archetype_pov1_comp1;
 use re_types::{

diff --git a/crates/re_query_cache/src/cache.rs b/crates/re_query_cache/src/cache.rs
@@ -10,7 +10,7 @@ use parking_lot::RwLock;
 use paste::paste;
 use seq_macro::seq;
 
-use re_arrow_store::LatestAtQuery;
+use re_data_store::LatestAtQuery;
 use re_log_types::{EntityPath, RowId, StoreId, TimeInt, Timeline};
 use re_query::ArchetypeView;
 use re_types_core::{components::InstanceKey, Archetype, ArchetypeName, Component, ComponentName};
@@ -86,7 +86,7 @@ impl Caches {
 /// Uniquely identifies cached query results in the [`Caches`].
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct CacheKey {
-    /// Which [`re_arrow_store::DataStore`] is the query targeting?
+    /// Which [`re_data_store::DataStore`] is the query targeting?
     pub store_id: StoreId,
 
     /// Which [`EntityPath`] is the query targeting?

diff --git a/crates/re_query_cache/src/query.rs b/crates/re_query_cache/src/query.rs
@@ -1,8 +1,8 @@
 use paste::paste;
 use seq_macro::seq;
 
-use re_arrow_store::{DataStore, LatestAtQuery, TimeInt, Timeline};
-use re_data_store::{ExtraQueryHistory, VisibleHistory};
+use re_data_store::{DataStore, LatestAtQuery, TimeInt, Timeline};
+use re_entity_db::{ExtraQueryHistory, VisibleHistory};
 use re_log_types::{EntityPath, RowId};
 use re_query::query_archetype;
 use re_types_core::{components::InstanceKey, Archetype, Component};

diff --git a/crates/re_query_cache/tests/latest_at.rs b/crates/re_query_cache/tests/latest_at.rs
@@ -4,7 +4,7 @@
 
 use itertools::Itertools as _;
 
-use re_arrow_store::{DataStore, LatestAtQuery};
+use re_data_store::{DataStore, LatestAtQuery};
 use re_log_types::{build_frame_nr, DataRow, EntityPath, RowId};
 use re_query_cache::query_cached_archetype_pov1_comp1;
 use re_types::{
@@ -45,7 +45,7 @@ fn simple_query() {
     store.insert_row(&row).unwrap();
 
     // Retrieve the view
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }
 
@@ -73,7 +73,7 @@ fn timeless_query() {
     store.insert_row(&row).unwrap();
 
     // Retrieve the view
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }
 
@@ -99,7 +99,7 @@ fn no_instance_join_query() {
     store.insert_row(&row).unwrap();
 
     // Retrieve the view
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }
 
@@ -120,7 +120,7 @@ fn missing_column_join_query() {
     store.insert_row(&row).unwrap();
 
     // Retrieve the view
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }
 
@@ -154,7 +154,7 @@ fn splatted_query() {
     store.insert_row(&row).unwrap();
 
     // Retrieve the view
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }
 
@@ -189,23 +189,23 @@ fn invalidation() {
     .unwrap();
     store.insert_row(&row).unwrap();
 
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 
     // Invalidate the PoV component
     let positions = vec![Position2D::new(10.0, 20.0), Position2D::new(30.0, 40.0)];
     let row = DataRow::from_cells1_sized(RowId::new(), ent_path, timepoint, 2, positions).unwrap();
     store.insert_row(&row).unwrap();
 
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 
     // Invalidate the optional component
     let colors = vec![Color::from_rgb(255, 0, 0), Color::from_rgb(0, 255, 0)];
     let row = DataRow::from_cells1_sized(RowId::new(), ent_path, timepoint, 2, colors).unwrap();
     store.insert_row(&row).unwrap();
 
-    let query = re_arrow_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
+    let query = re_data_store::LatestAtQuery::new(timepoint[0].0, timepoint[0].1);
     query_and_compare(&store, &query, &ent_path.into());
 }