trickle change through and iterate on them. entitypathfilter also now…

… has a defined but different order. stored order is now different!
rerun-io · Dec 19, 2024 · 0531185 · 0531185
1 parent 249cad5
commit 0531185
Show file tree

Hide file tree

Showing 15 changed files with 292 additions and 137 deletions.
diff --git a/crates/store/re_dataframe/examples/query.rs b/crates/store/re_dataframe/examples/query.rs
@@ -3,8 +3,8 @@
 use itertools::Itertools;
 
 use re_dataframe::{
-    ChunkStoreConfig, EntityPathFilter, QueryEngine, QueryExpression, ResolvedTimeRange,
-    SparseFillStrategy, StoreKind, TimeInt, Timeline,
+    ChunkStoreConfig, EntityPathFilter, EntityPathSubs, QueryEngine, QueryExpression,
+    ResolvedTimeRange, SparseFillStrategy, StoreKind, TimeInt, Timeline,
 };
 use re_log_encoding::VersionPolicy;
 
@@ -30,7 +30,9 @@ fn main() -> anyhow::Result<()> {
     let time_to = args.get(4).map_or(TimeInt::MAX, |s| {
         TimeInt::new_temporal(s.parse::<i64>().unwrap())
     });
-    let entity_path_filter = EntityPathFilter::try_from(args.get(5).map_or("/**", |s| s.as_str()))?;
+    let entity_path_filter =
+        EntityPathFilter::parse_strict(args.get(5).map_or("/**", |s| s.as_str()))?
+            .resolve_strict(&EntityPathSubs::empty())?;
 
     // TODO(cmc): We need to take a selector, not a Timeline.
     let timeline = match timeline_name {

diff --git a/crates/store/re_dataframe/src/engine.rs b/crates/store/re_dataframe/src/engine.rs
@@ -4,7 +4,7 @@ use re_chunk::{EntityPath, TransportChunk};
 use re_chunk_store::{
     ChunkStore, ChunkStoreConfig, ChunkStoreHandle, ColumnDescriptor, QueryExpression,
 };
-use re_log_types::{EntityPathFilter, StoreId};
+use re_log_types::{ResolvedEntityPathFilter, StoreId};
 use re_query::{QueryCache, QueryCacheHandle, StorageEngine, StorageEngineLike};
 
 use crate::QueryHandle;
@@ -104,7 +104,7 @@ impl<E: StorageEngineLike + Clone> QueryEngine<E> {
     #[inline]
     pub fn iter_entity_paths_sorted<'a>(
         &self,
-        filter: &'a EntityPathFilter,
+        filter: &'a ResolvedEntityPathFilter,
     ) -> impl Iterator<Item = EntityPath> + 'a {
         self.engine.with(|store, _cache| {
             store

diff --git a/crates/store/re_dataframe/src/lib.rs b/crates/store/re_dataframe/src/lib.rs
@@ -17,7 +17,8 @@ pub use self::external::re_chunk_store::{
 };
 #[doc(no_inline)]
 pub use self::external::re_log_types::{
-    EntityPath, EntityPathFilter, ResolvedTimeRange, StoreKind, TimeInt, Timeline,
+    EntityPath, EntityPathFilter, EntityPathSubs, ResolvedEntityPathFilter, ResolvedTimeRange,
+    StoreKind, TimeInt, Timeline,
 };
 #[doc(no_inline)]
 pub use self::external::re_query::{QueryCache, QueryCacheHandle, StorageEngine};

diff --git a/crates/store/re_grpc_client/src/lib.rs b/crates/store/re_grpc_client/src/lib.rs
@@ -577,7 +577,7 @@ fn activate_catalog_blueprint(
         .with_archetype(RowId::new(), timepoint, &vb)
         .build()?;
 
-    let epf = EntityPathFilter::parse_forgiving("/**", &Default::default());
+    let epf = EntityPathFilter::parse_forgiving("/**");
     let vc = ViewContents::new(epf.iter_expressions());
     let view_contents_chunk = ChunkBuilder::new(
         ChunkId::new(),