Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions rust/parquet/src/arrow/array_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ impl<T: DataType> PrimitiveArrayReader<T> {
.clone();

let mut record_reader = RecordReader::<T>::new(column_desc.clone());
record_reader.set_page_reader(
pages
.next()
.ok_or_else(|| general_err!("Can't build array without pages!"))??,
)?;
match pages.next() {
Some(page_reader) => {
record_reader.set_page_reader(page_reader?)?;
}
None => {}
}

Ok(Self {
data_type,
Expand Down Expand Up @@ -133,6 +134,9 @@ impl<T: DataType> ArrayReader for PrimitiveArrayReader<T> {
let records_to_read = batch_size - records_read;

let records_read_once = self.record_reader.read_records(records_to_read)?;
if records_read_once == 0 {
break; // record reader has no record
}
records_read = records_read + records_read_once;

// Record reader exhausted
Expand Down
5 changes: 4 additions & 1 deletion rust/parquet/src/arrow/record_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,10 @@ impl<T: DataType> RecordReader<T> {
///
/// Number of actual records read.
pub fn read_records(&mut self, num_records: usize) -> Result<usize> {
assert!(self.column_reader.is_some());
if self.column_reader.is_none() {
return Ok(0);
}

let mut records_read = 0;

// Used to mark whether we have reached the end of current
Expand Down