Skip to content

Remove BoxedAsyncFileReader #4150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Remove BoxedAsyncFileReader #4150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 3 additions & 37 deletions datafusion/core/src/physical_plan/file_format/parquet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,13 @@ impl FileOpener for ParquetOpener {
&self.metrics,
);

let reader =
BoxedAsyncFileReader(self.parquet_file_reader_factory.create_reader(
let reader: Box<dyn AsyncFileReader> =
self.parquet_file_reader_factory.create_reader(
self.partition_index,
file_meta,
self.metadata_size_hint,
&self.metrics,
)?);
)?;

let schema_adapter = SchemaAdapter::new(self.table_schema.clone());
let batch_size = self.batch_size;
Expand Down Expand Up @@ -598,40 +598,6 @@ impl ParquetFileReaderFactory for DefaultParquetFileReaderFactory {
}
}

///
/// BoxedAsyncFileReader has been created to satisfy type requirements of
/// parquet stream builder constructor.
///
/// Temporary pending https://github.com/apache/arrow-rs/pull/2368
struct BoxedAsyncFileReader(Box<dyn AsyncFileReader + Send>);

impl AsyncFileReader for BoxedAsyncFileReader {
fn get_bytes(
&mut self,
range: Range<usize>,
) -> BoxFuture<'_, ::parquet::errors::Result<Bytes>> {
self.0.get_bytes(range)
}

fn get_byte_ranges(
&mut self,
ranges: Vec<Range<usize>>,
) -> BoxFuture<'_, parquet::errors::Result<Vec<Bytes>>>
// TODO: This where bound forces us to enable #![allow(where_clauses_object_safety)] (#3081)
// Upstream issue https://github.com/apache/arrow-rs/issues/2372
where
Self: Send,
{
self.0.get_byte_ranges(ranges)
}

fn get_metadata(
&mut self,
) -> BoxFuture<'_, ::parquet::errors::Result<Arc<ParquetMetaData>>> {
self.0.get_metadata()
}
}

/// Wraps parquet statistics in a way
/// that implements [`PruningStatistics`]
struct RowGroupPruningStatistics<'a> {
Expand Down