these dont need fancy guards

Author: teh-cmc

crates/store/re_entity_db/src/entity_db.rs

@@ -13,7 +13,8 @@ use re_log_types::{
     SetStoreInfo, StoreId, StoreInfo, StoreKind, Timeline,
 };
 use re_query::{
-    QueryCache, QueryCacheHandle, StorageEngine, StorageEngineArcReadGuard, StorageEngineWriteGuard,
+    QueryCache, QueryCacheHandle, StorageEngine, StorageEngineArcReadGuard, StorageEngineReadGuard,
+    StorageEngineWriteGuard,
 };
 
 use crate::{Error, TimesPerTimeline};
@@ -110,14 +111,20 @@ impl EntityDb {
         &self.tree
     }
 
+    /// Returns a read-only guard to the backing [`StorageEngine`].
+    #[inline]
+    pub fn storage_engine(&self) -> StorageEngineReadGuard<'_> {
+        self.storage_engine.read()
+    }
+
     /// Returns a read-only guard to the backing [`StorageEngine`].
     ///
     /// That guard can be cloned at will and has a static lifetime.
     ///
     /// It is not possible to insert any more data in this [`EntityDb`] until the returned guard,
     /// and any clones, have been dropped.
     #[inline]
-    pub fn storage_engine(&self) -> StorageEngineArcReadGuard {
+    pub fn storage_engine_arc(&self) -> StorageEngineArcReadGuard {
         self.storage_engine.read_arc()
     }
 
@@ -667,7 +674,7 @@ impl EntityDb {
     /// This excludes temporal data.
     pub fn subtree_stats_static(
         &self,
-        engine: &StorageEngineArcReadGuard,
+        engine: &StorageEngineReadGuard<'_>,
         entity_path: &EntityPath,
     ) -> ChunkStoreChunkStats {
         re_tracing::profile_function!();
@@ -689,7 +696,7 @@ impl EntityDb {
     /// This excludes static data.
     pub fn subtree_stats_on_timeline(
         &self,
-        engine: &StorageEngineArcReadGuard,
+        engine: &StorageEngineReadGuard<'_>,
         entity_path: &EntityPath,
         timeline: &Timeline,
     ) -> ChunkStoreChunkStats {
@@ -712,7 +719,7 @@ impl EntityDb {
     /// This includes static data.
     pub fn subtree_has_data_on_timeline(
         &self,
-        engine: &StorageEngineArcReadGuard,
+        engine: &StorageEngineReadGuard<'_>,
         timeline: &Timeline,
         entity_path: &EntityPath,
     ) -> bool {
@@ -734,7 +741,7 @@ impl EntityDb {
     /// This ignores static data.
     pub fn subtree_has_temporal_data_on_timeline(
         &self,
-        engine: &StorageEngineArcReadGuard,
+        engine: &StorageEngineReadGuard<'_>,
         timeline: &Timeline,
         entity_path: &EntityPath,
     ) -> bool {

crates/viewer/re_space_view_dataframe/src/space_view_class.rs

@@ -129,7 +129,7 @@ mode sets the default time range to _everything_. You can override this in the s
         let view_query = view_query::Query::from_blueprint(ctx, query.space_view_id);
 
         let query_engine = QueryEngine {
-            engine: ctx.recording_engine(),
+            engine: ctx.recording().storage_engine_arc(),
         };
 
         let view_contents = query

crates/viewer/re_viewer_context/src/space_view/view_context.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use re_chunk::ArrowArray;
 use re_chunk_store::LatestAtQuery;
 use re_log_types::{EntityPath, TimePoint};
-use re_query::StorageEngineArcReadGuard;
+use re_query::StorageEngineReadGuard;
 use re_types::{AsComponents, ComponentBatch, ComponentName};
 
 use crate::{DataQueryResult, DataResult, QueryContext, SpaceViewId};
@@ -48,7 +48,7 @@ impl<'a> ViewContext<'a> {
 
     /// The `StorageEngine` for the active recording.
     #[inline]
-    pub fn recording_engine(&self) -> StorageEngineArcReadGuard {
+    pub fn recording_engine(&self) -> StorageEngineReadGuard<'_> {
         self.viewer_ctx.recording_engine()
     }
 

crates/viewer/re_viewer_context/src/viewer_context.rs

@@ -3,7 +3,7 @@ use parking_lot::RwLock;
 
 use re_chunk_store::LatestAtQuery;
 use re_entity_db::entity_db::EntityDb;
-use re_query::StorageEngineArcReadGuard;
+use re_query::StorageEngineReadGuard;
 
 use crate::{
     query_context::DataQueryResult, AppOptions, ApplicableEntities, ApplicationSelectionState,
@@ -96,13 +96,13 @@ impl<'a> ViewerContext<'a> {
 
     /// The `StorageEngine` for the active recording.
     #[inline]
-    pub fn recording_engine(&self) -> StorageEngineArcReadGuard {
+    pub fn recording_engine(&self) -> StorageEngineReadGuard<'_> {
         self.store_context.recording.storage_engine()
     }
 
     /// The `StorageEngine` for the active blueprint.
     #[inline]
-    pub fn blueprint_engine(&self) -> StorageEngineArcReadGuard {
+    pub fn blueprint_engine(&self) -> StorageEngineReadGuard<'_> {
         self.store_context.blueprint.storage_engine()
     }