Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Renamed factory argument on parquet read functions to reader_factory #1380

Merged
merged 2 commits into from
Feb 7, 2023
Merged
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
12 changes: 6 additions & 6 deletions src/io/parquet/read/row_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ where
}

async fn _read_single_column_async<'b, R, F>(
factory: F,
reader_factory: F,
meta: &ColumnChunkMetaData,
) -> Result<(&ColumnChunkMetaData, Vec<u8>)>
where
R: AsyncRead + AsyncSeek + Send + Unpin,
F: Fn() -> BoxFuture<'b, std::io::Result<R>>,
{
let mut reader = factory().await?;
let mut reader = reader_factory().await?;
let (start, length) = meta.byte_range();
reader.seek(std::io::SeekFrom::Start(start)).await?;

Expand All @@ -169,13 +169,13 @@ pub async fn read_columns_async<
R: AsyncRead + AsyncSeek + Send + Unpin,
F: Fn() -> BoxFuture<'b, std::io::Result<R>> + Clone,
>(
factory: F,
reader_factory: F,
columns: &'a [ColumnChunkMetaData],
field_name: &str,
) -> Result<Vec<(&'a ColumnChunkMetaData, Vec<u8>)>> {
let futures = get_field_columns(columns, field_name)
.into_iter()
.map(|meta| async { _read_single_column_async(factory.clone(), meta).await });
.map(|meta| async { _read_single_column_async(reader_factory.clone(), meta).await });

try_join_all(futures).await
}
Expand Down Expand Up @@ -309,7 +309,7 @@ pub async fn read_columns_many_async<
R: AsyncRead + AsyncSeek + Send + Unpin,
F: Fn() -> BoxFuture<'b, std::io::Result<R>> + Clone,
>(
factory: F,
reader_factory: F,
row_group: &RowGroupMetaData,
fields: Vec<Field>,
chunk_size: Option<usize>,
Expand All @@ -321,7 +321,7 @@ pub async fn read_columns_many_async<

let futures = fields
.iter()
.map(|field| read_columns_async(factory.clone(), row_group.columns(), &field.name));
.map(|field| read_columns_async(reader_factory.clone(), row_group.columns(), &field.name));

let field_columns = try_join_all(futures).await?;

Expand Down