Skip to content
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

Jump to bottom

[BUG] Respect multithreaded_io flag when reading parquet #1359

Merged
merged 3 commits into from
Sep 9, 2023
Merged

[BUG] Respect multithreaded_io flag when reading parquet #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48f4b39
pass multithread flag
samster25 Sep 9, 2023
e07972b
multithreading off
samster25 Sep 9, 2023
9066248
respect multithreading flag
samster25 Sep 9, 2023
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
2 changes: 2 additions & 0 deletions src/daft-parquet/src/python.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pub mod pylib {
num_rows,
row_groups.as_deref(),
io_client,
multithreaded_io.unwrap_or(true),
&schema_infer_options,
)?
.into())
Expand Down Expand Up @@ -73,6 +74,7 @@ pub mod pylib {
num_rows,
row_groups,
io_client,
multithreaded_io.unwrap_or(true),
&schema_infer_options,
)?
.into_iter()
Expand Down
19 changes: 16 additions & 3 deletions src/daft-parquet/src/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,18 @@ async fn read_parquet_single(
Ok(table)
}

#[allow(clippy::too_many_arguments)]
pub fn read_parquet(
uri: &str,
columns: Option<&[&str]>,
start_offset: Option<usize>,
num_rows: Option<usize>,
row_groups: Option<&[i64]>,
io_client: Arc<IOClient>,
multithreaded_io: bool,
schema_infer_options: &ParquetSchemaInferenceOptions,
) -> DaftResult<Table> {
let runtime_handle = get_runtime(true)?;
let runtime_handle = get_runtime(multithreaded_io)?;
let _rt_guard = runtime_handle.enter();
runtime_handle.block_on(async {
read_parquet_single(
Expand All @@ -163,16 +165,18 @@ pub fn read_parquet(
})
}

#[allow(clippy::too_many_arguments)]
pub fn read_parquet_bulk(
uris: &[&str],
columns: Option<&[&str]>,
start_offset: Option<usize>,
num_rows: Option<usize>,
row_groups: Option<Vec<Vec<i64>>>,
io_client: Arc<IOClient>,
multithreaded_io: bool,
schema_infer_options: &ParquetSchemaInferenceOptions,
) -> DaftResult<Vec<Table>> {
let runtime_handle = get_runtime(true)?;
let runtime_handle = get_runtime(multithreaded_io)?;
let _rt_guard = runtime_handle.enter();
let owned_columns = columns.map(|s| s.iter().map(|v| String::from(*v)).collect::<Vec<_>>());
if let Some(ref row_groups) = row_groups {
Expand Down Expand Up @@ -321,7 +325,16 @@ mod tests {

let io_client = Arc::new(IOClient::new(io_config.into())?);

let table = read_parquet(file, None, None, None, None, io_client, &Default::default())?;
let table = read_parquet(
file,
None,
None,
None,
None,
io_client,
true,
&Default::default(),
)?;
assert_eq!(table.len(), 100);

Ok(())
Expand Down
Loading