Skip to content

Commit a01886d

Browse files
authored
Minor: rename ParquetRecordBatchStream::reader to ParquetRecordBatchStream::factory (#7319)
1 parent ac759d5 commit a01886d

File tree

1 file changed

+8
-8
lines changed
  • parquet/src/arrow/async_reader

1 file changed

+8
-8
lines changed

parquet/src/arrow/async_reader/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ impl<T: AsyncFileReader + Send + 'static> ParquetRecordBatchStreamBuilder<T> {
558558
let batch_size = self
559559
.batch_size
560560
.min(self.metadata.file_metadata().num_rows() as usize);
561-
let reader = ReaderFactory {
561+
let reader_factory = ReaderFactory {
562562
input: self.input.0,
563563
filter: self.filter,
564564
metadata: self.metadata.clone(),
@@ -569,7 +569,7 @@ impl<T: AsyncFileReader + Send + 'static> ParquetRecordBatchStreamBuilder<T> {
569569

570570
// Ensure schema of ParquetRecordBatchStream respects projection, and does
571571
// not store metadata (same as for ParquetRecordBatchReader and emitted RecordBatches)
572-
let projected_fields = match reader.fields.as_deref().map(|pf| &pf.arrow_type) {
572+
let projected_fields = match reader_factory.fields.as_deref().map(|pf| &pf.arrow_type) {
573573
Some(DataType::Struct(fields)) => {
574574
fields.filter_leaves(|idx, _| self.projection.leaf_included(idx))
575575
}
@@ -585,7 +585,7 @@ impl<T: AsyncFileReader + Send + 'static> ParquetRecordBatchStreamBuilder<T> {
585585
projection: self.projection,
586586
selection: self.selection,
587587
schema,
588-
reader: Some(reader),
588+
reader_factory: Some(reader_factory),
589589
state: StreamState::Init,
590590
})
591591
}
@@ -765,7 +765,7 @@ pub struct ParquetRecordBatchStream<T> {
765765
selection: Option<RowSelection>,
766766

767767
/// This is an option so it can be moved into a future
768-
reader: Option<ReaderFactory<T>>,
768+
reader_factory: Option<ReaderFactory<T>>,
769769

770770
state: StreamState<T>,
771771
}
@@ -827,7 +827,7 @@ where
827827

828828
let selection = self.selection.as_mut().map(|s| s.split_off(row_count));
829829

830-
let reader_factory = self.reader.take().expect("lost reader");
830+
let reader_factory = self.reader_factory.take().expect("lost reader factory");
831831

832832
let (reader_factory, maybe_reader) = reader_factory
833833
.read_row_group(
@@ -841,7 +841,7 @@ where
841841
self.state = StreamState::Error;
842842
err
843843
})?;
844-
self.reader = Some(reader_factory);
844+
self.reader_factory = Some(reader_factory);
845845

846846
if let Some(reader) = maybe_reader {
847847
return Ok(Some(reader));
@@ -881,7 +881,7 @@ where
881881
None => return Poll::Ready(None),
882882
};
883883

884-
let reader = self.reader.take().expect("lost reader");
884+
let reader = self.reader_factory.take().expect("lost reader factory");
885885

886886
let row_count = self.metadata.row_group(row_group_idx).num_rows() as usize;
887887

@@ -900,7 +900,7 @@ where
900900
}
901901
StreamState::Reading(f) => match ready!(f.poll_unpin(cx)) {
902902
Ok((reader_factory, maybe_reader)) => {
903-
self.reader = Some(reader_factory);
903+
self.reader_factory = Some(reader_factory);
904904
match maybe_reader {
905905
// Read records from [`ParquetRecordBatchReader`]
906906
Some(reader) => self.state = StreamState::Decoding(reader),

0 commit comments

Comments
 (0)