rename

vortex-file/src/read/coalescer.rs → vortex-file/src/read/buffered.rs

@@ -43,7 +43,7 @@ enum RowMaskState<V> {
     Empty,
 }
 
-pub struct Coalescer<R, S, V, RM> {
+pub struct BufferedLayoutReader<R, S, V, RM> {
     values: S,
     row_mask_reader: RM,
     in_flight: Option<BoxFuture<'static, io::Result<Vec<Message>>>>,
@@ -53,7 +53,7 @@ pub struct Coalescer<R, S, V, RM> {
     cache: Arc<RwLock<LayoutMessageCache>>,
 }
 
-impl<R, S, V, RM> Coalescer<R, S, V, RM>
+impl<R, S, V, RM> BufferedLayoutReader<R, S, V, RM>
 where
     R: VortexReadAt,
     S: Stream<Item = VortexResult<RowMask>> + Unpin,
@@ -177,7 +177,7 @@ where
     }
 }
 
-impl<R, S, V, RM> Stream for Coalescer<R, S, V, RM>
+impl<R, S, V, RM> Stream for BufferedLayoutReader<R, S, V, RM>
 where
     R: VortexReadAt + Unpin,
     S: Stream<Item = VortexResult<RowMask>> + Unpin,

vortex-file/src/read/metadata.rs

@@ -11,10 +11,10 @@ use vortex_error::VortexResult;
 use vortex_io::{IoDispatcher, VortexReadAt};
 
 use super::{LayoutMessageCache, LayoutReader};
-use crate::read::coalescer::{Coalescer, RowMaskReader};
+use crate::read::buffered::{BufferedLayoutReader, RowMaskReader};
 use crate::{MessageRead, RowMask};
 
-type MetadataCoalescer<R> = Coalescer<
+type MetadataCoalescer<R> = BufferedLayoutReader<
     R,
     Box<dyn Stream<Item = VortexResult<RowMask>> + Send + Unpin>,
     Vec<Option<ArrayData>>,
@@ -51,7 +51,7 @@ impl<R: VortexReadAt + Unpin> MetadataFetcher<R> {
         root_layout: Box<dyn LayoutReader>,
         layout_cache: Arc<RwLock<LayoutMessageCache>>,
     ) -> Self {
-        let metadata_reader = Coalescer::new(
+        let metadata_reader = BufferedLayoutReader::new(
             input,
             dispatcher,
             Box::new(stream::iter(iter::once(Ok(RowMask::new_valid_between(

vortex-file/src/read/mod.rs

@@ -5,9 +5,9 @@ use bytes::Bytes;
 use vortex_array::ArrayData;
 use vortex_error::VortexResult;
 
+mod buffered;
 pub mod builder;
 mod cache;
-mod coalescer;
 mod context;
 mod expr_project;
 mod filtering;

vortex-file/src/read/splits.rs

@@ -8,7 +8,7 @@ use itertools::Itertools;
 use vortex_array::stats::ArrayStatistics;
 use vortex_error::{vortex_bail, VortexExpect, VortexResult};
 
-use crate::read::coalescer::RowMaskReader;
+use crate::read::buffered::RowMaskReader;
 use crate::{BatchRead, LayoutReader, MessageRead, RowMask, SplitRead};
 
 enum SplitState {

vortex-file/src/read/stream.rs

@@ -11,8 +11,8 @@ use vortex_dtype::DType;
 use vortex_error::{vortex_panic, VortexResult, VortexUnwrap};
 use vortex_io::{IoDispatcher, VortexReadAt};
 
+use crate::read::buffered::{BufferedLayoutReader, MaskLayoutReader};
 use crate::read::cache::LayoutMessageCache;
-use crate::read::coalescer::{Coalescer, MaskLayoutReader};
 use crate::read::mask::RowMask;
 use crate::read::splits::{FixedSplitIterator, RowMaskLayoutReader};
 use crate::read::LayoutReader;
@@ -28,7 +28,7 @@ use crate::LazyDType;
 pub struct VortexFileArrayStream<R> {
     dtype: Arc<LazyDType>,
     row_count: u64,
-    array_reader: Coalescer<
+    array_reader: BufferedLayoutReader<
         R,
         Box<dyn Stream<Item = VortexResult<RowMask>> + Send + Unpin>,
         ArrayData,
@@ -57,7 +57,7 @@ impl<R: VortexReadAt + Unpin> VortexFileArrayStream<R> {
         split_iterator.additional_splits(&mut reader_splits)?;
 
         let mask_iterator = if let Some(fr) = filter_reader {
-            Box::new(Coalescer::new(
+            Box::new(BufferedLayoutReader::new(
                 input.clone(),
                 dispatcher.clone(),
                 split_iterator,
@@ -68,7 +68,7 @@ impl<R: VortexReadAt + Unpin> VortexFileArrayStream<R> {
             Box::new(split_iterator) as _
         };
 
-        let array_reader = Coalescer::new(
+        let array_reader = BufferedLayoutReader::new(
             input,
             dispatcher,
             mask_iterator,