gs

crates/sparrow-compiler/src/data_context.rs

@@ -324,25 +324,21 @@ impl FileSets {
         &self,
         requested_slice: &Option<v1alpha::slice_plan::Slice>,
     ) -> anyhow::Result<parking_lot::MappedMutexGuard<'_, Vec<PreparedFile>>> {
-        Ok(parking_lot::MutexGuard::map(self.file_sets.lock(), |fs| {
-            let file_set = fs
-                .iter_mut()
-                .find(|set| {
-                    set.slice_plan
-                        .iter()
-                        .all(|slice| &slice.slice == requested_slice)
-                })
-                .unwrap();
-            // .with_context(|| {
-            //     context_code!(
-            //         tonic::Code::InvalidArgument,
-            //         "Table '{}' missing file set with requested slice {:?}",
-            //         "asdf",
-            //         requested_slice
-            //     )
-            // }).unwrap();
-            &mut file_set.prepared_files
-        }))
+        parking_lot::MutexGuard::try_map(self.file_sets.lock(), |fs| {
+            let file_set = fs.iter_mut().find(|set| {
+                set.slice_plan
+                    .iter()
+                    .all(|slice| &slice.slice == requested_slice)
+            });
+            file_set.map(|f| &mut f.prepared_files)
+        })
+        .map_err(|_| {
+            anyhow::anyhow!(context_code!(
+                tonic::Code::InvalidArgument,
+                "Table missing file set with requested slice {:?}",
+                requested_slice
+            ))
+        })
     }
 
     pub fn metadata_for_files(&self) -> Vec<String> {

crates/sparrow-runtime/src/key_hash_inverse.rs

@@ -97,6 +97,10 @@ impl KeyHashInverse {
         primary_grouping: GroupId,
         registry: &ObjectStoreRegistry,
     ) -> error_stack::Result<(), Error> {
+        // TODO: Do we need to get all metadata files, or only ones for a specific slice?
+        // Investigate this -- it seems for a specific query we may only need to use
+        // the entities that are going to be a part of the query, which means only the
+        // entities for a specific slice.
         let metadata_files = data_context
             .tables_for_grouping(primary_grouping)
             .flat_map(|table| table.metadata_for_files());