monolithic

Signed-off-by: Adam Gutglick <adam@spiraldb.com>

Author: AdamGS

vortex-file/src/file.rs

@@ -111,11 +111,10 @@ impl VortexFile {
 
     /// Initiate a scan of the file, returning a builder for configuring the scan.
     pub fn scan(&self) -> VortexResult<ScanBuilder<ArrayRef>> {
-        Ok(ScanBuilder::new(
-            self.session.clone(),
-            self.layout_reader()?,
+        Ok(
+            ScanBuilder::new(self.session.clone(), self.layout_reader()?)
+                .with_segment_source(self.segment_source()),
         )
-        .with_segment_source(self.segment_source()))
     }
 
     /// Returns true if the expression will never match any rows in the file.

vortex-scan/src/fetch_plan.rs

@@ -336,7 +336,13 @@ mod tests {
     fn deferred_plan_activates_for_narrow_filtered_projection() {
         let projection = select(["id", "payload"], root());
         let mask = vec![FieldMask::Prefix(FieldPath::from(Field::Name("id".into())))];
-        let plan = MaterializationPlan::from_projection(&projection, &scan_dtype(), true, &mask, &BTreeSet::new());
+        let plan = MaterializationPlan::from_projection(
+            &projection,
+            &scan_dtype(),
+            true,
+            &mask,
+            &BTreeSet::new(),
+        );
         let deferred = plan.deferred().expect("deferred plan");
         assert_eq!(
             deferred.final_fields(),
@@ -350,22 +356,40 @@ mod tests {
     fn deferred_plan_stays_off_for_unfiltered_projection() {
         let projection = select(["id", "payload"], root());
         let mask = vec![FieldMask::Prefix(FieldPath::from(Field::Name("id".into())))];
-        let plan = MaterializationPlan::from_projection(&projection, &scan_dtype(), false, &mask, &BTreeSet::new());
+        let plan = MaterializationPlan::from_projection(
+            &projection,
+            &scan_dtype(),
+            false,
+            &mask,
+            &BTreeSet::new(),
+        );
         assert!(plan.deferred().is_none());
     }
 
     #[test]
     fn deferred_plan_stays_off_for_root_projection() {
         let mask = vec![FieldMask::Prefix(FieldPath::from(Field::Name("id".into())))];
-        let plan = MaterializationPlan::from_projection(&root(), &scan_dtype(), true, &mask, &BTreeSet::new());
+        let plan = MaterializationPlan::from_projection(
+            &root(),
+            &scan_dtype(),
+            true,
+            &mask,
+            &BTreeSet::new(),
+        );
         assert!(plan.deferred().is_none());
     }
 
     #[test]
     fn deferred_plan_stays_off_for_wide_projection() {
         let projection = select(["id", "score", "payload", "nested"], root());
         let mask = vec![FieldMask::Prefix(FieldPath::from(Field::Name("id".into())))];
-        let plan = MaterializationPlan::from_projection(&projection, &scan_dtype(), true, &mask, &BTreeSet::new());
+        let plan = MaterializationPlan::from_projection(
+            &projection,
+            &scan_dtype(),
+            true,
+            &mask,
+            &BTreeSet::new(),
+        );
         assert!(plan.deferred().is_none());
     }