housekeeping

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

Author: AdamGS

vortex-scan/public-api.lock

@@ -16,6 +16,10 @@ pub vortex_scan::api::ScanRequest::row_range: core::option::Option<core::ops::ra
 
 pub vortex_scan::api::ScanRequest::selection: vortex_scan::Selection
 
+pub vortex_scan::api::ScanRequest::target_output_bytes: core::option::Option<usize>
+
+pub vortex_scan::api::ScanRequest::target_output_rows: core::option::Option<usize>
+
 impl core::clone::Clone for vortex_scan::api::ScanRequest
 
 pub fn vortex_scan::api::ScanRequest::clone(&self) -> vortex_scan::api::ScanRequest
@@ -28,6 +32,10 @@ impl core::fmt::Debug for vortex_scan::api::ScanRequest
 
 pub fn vortex_scan::api::ScanRequest::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 
+pub const vortex_scan::api::DEFAULT_TARGET_OUTPUT_BYTES_HINT: usize
+
+pub const vortex_scan::api::DEFAULT_TARGET_OUTPUT_ROWS_HINT: usize
+
 pub trait vortex_scan::api::DataSource: 'static + core::marker::Send + core::marker::Sync
 
 pub fn vortex_scan::api::DataSource::byte_size(&self) -> core::option::Option<vortex_array::expr::stats::precision::Precision<u64>>

vortex-scan/src/repeated_scan.rs

@@ -354,8 +354,11 @@ struct StagedSplitStream<A: 'static + Send> {
     emit: EmitQueue<A>,
 }
 
+type FilterTaskResult = (usize, usize, VortexResult<Option<FilteredSplit>>);
+type ProjectionTaskResult<A> = (usize, usize, usize, VortexResult<A>);
+
 struct FilterQueue {
-    in_flight: FuturesUnordered<Task<(usize, usize, VortexResult<Option<FilteredSplit>>)>>,
+    in_flight: FuturesUnordered<Task<FilterTaskResult>>,
     ready: BTreeMap<usize, FilteredSplit>,
     ready_rows: usize,
     ready_projection_bytes: usize,
@@ -387,7 +390,7 @@ impl FilterQueue {
 }
 
 struct ProjectionQueue<A: 'static + Send> {
-    in_flight: FuturesUnordered<Task<(usize, usize, usize, VortexResult<A>)>>,
+    in_flight: FuturesUnordered<Task<ProjectionTaskResult<A>>>,
     target_rows: usize,
     target_bytes: usize,
     row_cost_bytes: usize,
@@ -959,15 +962,15 @@ mod test {
                     FilteredSplit {
                         row_range: 0..10,
                         mask: Mask::new_true(10),
-                        projection_ranges: vec![0..10],
+                        projection_ranges: std::iter::once(0..10).collect(),
                     },
                 ),
                 (
                     1,
                     FilteredSplit {
                         row_range: 10..20,
                         mask: Mask::new_true(10),
-                        projection_ranges: vec![10..20],
+                        projection_ranges: std::iter::once(10..20).collect(),
                     },
                 ),
             ]),