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.

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

Refactor: more clearly delineate between TableParquetOptions and ParquetWriterOptions #11444

Merged
merged 11 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from 8 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
92 changes: 92 additions & 0 deletions datafusion/common/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ use std::collections::{BTreeMap, HashMap};
use std::fmt::{self, Display};
use std::str::FromStr;

#[cfg(feature = "parquet")]
use crate::file_options::parquet_writer::{
parse_compression_string, parse_encoding_string, parse_statistics_string,
parse_version_string,
};
#[cfg(feature = "parquet")]
use parquet::file::properties::{
WriterProperties, WriterPropertiesBuilder, DEFAULT_MAX_STATISTICS_SIZE,
DEFAULT_STATISTICS_ENABLED,
};

use crate::error::_config_err;
use crate::parsers::CompressionTypeVariant;
use crate::{DataFusionError, Result};
Expand Down Expand Up @@ -454,6 +465,87 @@ config_namespace! {
}
}

#[cfg(feature = "parquet")]
wiedld marked this conversation as resolved.
Show resolved Hide resolved
impl ParquetOptions {
/// Convert the global session options, [`ParquetOptions`], into a single write action's [`WriterPropertiesBuilder`].
///
/// The returned [`WriterPropertiesBuilder`] can then be further modified with additional options
/// applied per column; a customization which is not applicable for [`ParquetOptions`].
pub fn writer_props_from_global_opts(&self) -> Result<WriterPropertiesBuilder> {
wiedld marked this conversation as resolved.
Show resolved Hide resolved
let ParquetOptions {
data_pagesize_limit,
write_batch_size,
writer_version,
compression,
dictionary_enabled,
dictionary_page_size_limit,
statistics_enabled,
max_statistics_size,
max_row_group_size,
created_by,
column_index_truncate_length,
data_page_row_count_limit,
encoding,
bloom_filter_on_write,
bloom_filter_fpp,
bloom_filter_ndv,

// not in WriterProperties
wiedld marked this conversation as resolved.
Show resolved Hide resolved
enable_page_index: _,
pruning: _,
skip_metadata: _,
metadata_size_hint: _,
pushdown_filters: _,
reorder_filters: _,
allow_single_file_parallelism: _,
maximum_parallel_row_group_writers: _,
maximum_buffered_record_batches_per_stream: _,
bloom_filter_on_read: _, // reads not used for writer props
} = self;

let mut builder = WriterProperties::builder()
.set_data_page_size_limit(*data_pagesize_limit)
.set_write_batch_size(*write_batch_size)
.set_writer_version(parse_version_string(writer_version.as_str())?)
.set_dictionary_page_size_limit(*dictionary_page_size_limit)
.set_statistics_enabled(
statistics_enabled
.as_ref()
.and_then(|s| parse_statistics_string(s).ok())
.unwrap_or(DEFAULT_STATISTICS_ENABLED),
)
.set_max_statistics_size(
max_statistics_size.unwrap_or(DEFAULT_MAX_STATISTICS_SIZE),
)
.set_max_row_group_size(*max_row_group_size)
.set_created_by(created_by.clone())
.set_column_index_truncate_length(*column_index_truncate_length)
.set_data_page_row_count_limit(*data_page_row_count_limit)
.set_bloom_filter_enabled(*bloom_filter_on_write);

if let Some(bloom_filter_fpp) = bloom_filter_fpp {
builder = builder.set_bloom_filter_fpp(*bloom_filter_fpp);
};
if let Some(bloom_filter_ndv) = bloom_filter_ndv {
builder = builder.set_bloom_filter_ndv(*bloom_filter_ndv);
};
if let Some(dictionary_enabled) = dictionary_enabled {
builder = builder.set_dictionary_enabled(*dictionary_enabled);
};

// We do not have access to default ColumnProperties set in Arrow.
// Therefore, only overwrite if these settings exist.
if let Some(compression) = compression {
builder = builder.set_compression(parse_compression_string(compression)?);
}
if let Some(encoding) = encoding {
builder = builder.set_encoding(parse_encoding_string(encoding)?);
}

Ok(builder)
}
}

config_namespace! {
/// Options related to aggregate execution
///
Expand Down
Loading