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

Update ListingTable to use StatisticsConverter #11068

Merged
merged 7 commits into from
Jun 24, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix misc
xinlifoobar committed Jun 22, 2024
commit 28eb6c1eb3153af127fdf9097c0ef04f12ef0f20
10 changes: 8 additions & 2 deletions datafusion/core/src/datasource/file_format/parquet.rs
Original file line number Diff line number Diff line change
@@ -1417,8 +1417,14 @@ mod tests {
// column c1
let c1_stats = &stats.column_statistics[0];
assert_eq!(c1_stats.null_count, Precision::Exact(1));
assert_eq!(c1_stats.max_value, Precision::Exact(Utf8(Some("bar".to_string()))));
assert_eq!(c1_stats.min_value, Precision::Exact(Utf8(Some("Foo".to_string()))));
assert_eq!(
c1_stats.max_value,
Precision::Exact(Utf8(Some("bar".to_string())))
);
assert_eq!(
c1_stats.min_value,
Precision::Exact(Utf8(Some("Foo".to_string())))
);
// column c2: missing from the file so the table treats all 3 rows as null
let c2_stats = &stats.column_statistics[1];
assert_eq!(c2_stats.null_count, Precision::Exact(3));
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ use crate::datasource::physical_plan::parquet::ParquetAccessPlan;
use crate::physical_optimizer::pruning::{PruningPredicate, PruningStatistics};

use super::metrics::ParquetFileMetrics;
use super::statistics::parquet_column_by_name;
use super::statistics::parquet_column;

/// A [`PagePruningPredicate`] provides the ability to construct a [`RowSelection`]
/// based on parquet page level statistics, if any
@@ -308,7 +308,7 @@ fn find_column_index(
return None;
};

parquet_column_by_name(parquet_schema, arrow_schema, column.name()).map(|x| x.0)
parquet_column(parquet_schema, arrow_schema, column.name()).map(|x| x.0)
}

/// Returns a `RowSelection` for the pages in this RowGroup if any
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ use std::collections::{HashMap, HashSet};
use std::sync::Arc;

use crate::datasource::listing::FileRange;
use crate::datasource::physical_plan::parquet::statistics::parquet_column_by_name;
use crate::datasource::physical_plan::parquet::statistics::parquet_column;
use crate::physical_optimizer::pruning::{PruningPredicate, PruningStatistics};

use super::{ParquetAccessPlan, ParquetFileMetrics, StatisticsConverter};
@@ -169,11 +169,9 @@ impl RowGroupAccessPlanFilter {
let mut column_sbbf = HashMap::with_capacity(literal_columns.len());

for column_name in literal_columns {
let Some((column_idx, _field)) = parquet_column_by_name(
builder.parquet_schema(),
arrow_schema,
&column_name,
) else {
let Some((column_idx, _field)) =
parquet_column(builder.parquet_schema(), arrow_schema, &column_name)
else {
continue;
};

Original file line number Diff line number Diff line change
@@ -703,7 +703,7 @@ macro_rules! get_data_page_statistics {
/// Returns the parquet column index and the corresponding arrow field
/// It is less efficient to reuse function [`parquet_column_by_arrow_schema_index`]
/// as the root_idx could be found at once.
pub(crate) fn parquet_column_by_name<'a>(
pub(crate) fn parquet_column<'a>(
parquet_schema: &SchemaDescriptor,
arrow_schema: &'a Schema,
name: &str,
@@ -959,7 +959,7 @@ impl<'a> StatisticsConverter<'a> {
};

// find the column in the parquet schema, if not, return a null array
let parquet_index = match parquet_column_by_name(
let parquet_index = match parquet_column(
parquet_schema,
arrow_schema,
column_name,
@@ -1928,8 +1928,7 @@ mod test {
let parquet_schema = metadata.file_metadata().schema_descr();

// read the int_col statistics
let (idx, _) =
parquet_column_by_name(parquet_schema, &schema, "int_col").unwrap();
let (idx, _) = parquet_column(parquet_schema, &schema, "int_col").unwrap();
assert_eq!(idx, 2);

let row_groups = metadata.row_groups();
@@ -2127,8 +2126,7 @@ mod test {

for field in schema.fields() {
if field.data_type().is_nested() {
let lookup =
parquet_column_by_name(parquet_schema, &schema, field.name());
let lookup = parquet_column(parquet_schema, &schema, field.name());
assert_eq!(lookup, None);
continue;
}