Apache DataFusion SQL Query Engine
Minor: Make `BloomFilterStatistics` and `RowGroupAccessPlanFilter::prune_by_bloom_filters` public (#23302)
xudong.wed37b6c9555b
diff --git a/datafusion/datasource-parquet/src/bloom_filter.rs b/datafusion/datasource-parquet/src/bloom_filter.rsindex 24cb5f3146..9c3b73e038 100644--- a/datafusion/datasource-parquet/src/bloom_filter.rs+++ b/datafusion/datasource-parquet/src/bloom_filter.rs@@ -33,7 +33,7 @@ use parquet::data_type::Decimal;/// This structure implements [`PruningStatistics`] and is used to prune/// Parquet row groups and data pages based on the query predicate.#[derive(Debug, Clone, Default)]-pub(crate) struct BloomFilterStatistics {+pub struct BloomFilterStatistics {/// Per-column Bloom filters keyed by predicate column name.column_sbbf: HashMap<String, ColumnBloomFilter>,}@@ -50,19 +50,20 @@ struct ColumnBloomFilter {impl BloomFilterStatistics {/// Create an empty [`BloomFilterStatistics`]- pub(crate) fn new() -> Self {+ pub fn new() -> Self {Default::default()}/// Create an empty [`BloomFilterStatistics`] with the specified capacity- pub(crate) fn with_capacity(capacity: usize) -> Self {+ pub fn with_capacity(capacity: usize) -> Self {Self {column_sbbf: HashMap::with_capacity(capacity),}}- /// Add a Bloom filter and type for the specified column- pub(crate) fn insert(+ /// Add a Bloom filter for the specified column, along with the column's+ /// Parquet physical [`Type`] and type length from the column descriptor.+ pub fn insert(&mut self,column: impl Into<String>,sbbf: Sbbf,diff --git a/datafusion/datasource-parquet/src/mod.rs b/datafusion/datasource-parquet/src/mod.rsindex 250b36ad6d..e6e372cd78 100644--- a/datafusion/datasource-parquet/src/mod.rs+++ b/datafusion/datasource-parquet/src/mod.rs@@ -47,6 +47,7 @@ mod virtual_column;mod writer;pub use access_plan::{ParquetAccessPlan, ParquetRowSelection, RowGroupAccess};+pub use bloom_filter::BloomFilterStatistics;pub use file_format::*;pub use metrics::ParquetFileMetrics;pub use page_filter::PagePruningAccessPlanFilter;diff --git a/datafusion/datasource-parquet/src/opener/mod.rs b/datafusion/datasource-parquet/src/opener/mod.rsindex af50b89901..87ec341f59 100644--- a/datafusion/datasource-parquet/src/opener/mod.rs+++ b/datafusion/datasource-parquet/src/opener/mod.rs@@ -30,10 +30,11 @@ use crate::push_decoder::{DecoderBuilderConfig, PushDecoderStreamState, RgPlanEntry, RowGroupPruner,};use crate::row_filter::RowFilterGenerator;-use crate::row_group_filter::{BloomFilterStatistics, RowGroupAccessPlanFilter};+use crate::row_group_filter::RowGroupAccessPlanFilter;use crate::{- Int96Coercer, ParquetAccessPlan, ParquetFileMetrics, ParquetFileReaderFactory,- ParquetRowSelection, ParquetVirtualColumn, apply_file_schema_type_coercions,+ BloomFilterStatistics, Int96Coercer, ParquetAccessPlan, ParquetFileMetrics,+ ParquetFileReaderFactory, ParquetRowSelection, ParquetVirtualColumn,+ apply_file_schema_type_coercions,};use arrow::array::RecordBatch;use arrow::datatypes::DataType;diff --git a/datafusion/datasource-parquet/src/row_group_filter.rs b/datafusion/datasource-parquet/src/row_group_filter.rsindex bbf6cd3876..2a2544b99b 100644--- a/datafusion/datasource-parquet/src/row_group_filter.rs+++ b/datafusion/datasource-parquet/src/row_group_filter.rs@@ -19,9 +19,7 @@ use std::collections::HashSet;use std::sync::Arc;use super::{ParquetAccessPlan, ParquetFileMetrics, RowGroupAccess};-// Re-exported so the existing `crate::row_group_filter::BloomFilterStatistics`-// path keeps resolving for in-crate callers (e.g. `opener`).-pub(crate) use crate::bloom_filter::BloomFilterStatistics;+use crate::bloom_filter::BloomFilterStatistics;use arrow::array::{ArrayRef, BooleanArray, UInt64Array};use arrow::datatypes::Schema;use datafusion_common::pruning::PruningStatistics;@@ -420,7 +418,7 @@ impl RowGroupAccessPlanFilter {////// # Panics/// if `row_group_bloom_filters` does not have the same number of row groups as this set- pub(crate) fn prune_by_bloom_filters(+ pub fn prune_by_bloom_filters(&mut self,predicate: &PruningPredicate,metrics: &ParquetFileMetrics,