Skip to content

Commit 396e0d5

Browse files
authored
refactor: move should_enable_page_index from mod.rs to opener.rs (#16026)
1 parent f7c7d92 commit 396e0d5

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

datafusion/datasource-parquet/src/mod.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ mod row_group_filter;
3030
pub mod source;
3131
mod writer;
3232

33-
use std::sync::Arc;
34-
3533
pub use access_plan::{ParquetAccessPlan, RowGroupAccess};
3634
pub use file_format::*;
3735
pub use metrics::ParquetFileMetrics;
@@ -41,15 +39,3 @@ pub use row_filter::build_row_filter;
4139
pub use row_filter::can_expr_be_pushed_down_with_schemas;
4240
pub use row_group_filter::RowGroupAccessPlanFilter;
4341
pub use writer::plan_to_parquet;
44-
45-
fn should_enable_page_index(
46-
enable_page_index: bool,
47-
page_pruning_predicate: &Option<Arc<PagePruningAccessPlanFilter>>,
48-
) -> bool {
49-
enable_page_index
50-
&& page_pruning_predicate.is_some()
51-
&& page_pruning_predicate
52-
.as_ref()
53-
.map(|p| p.filter_number() > 0)
54-
.unwrap_or(false)
55-
}

datafusion/datasource-parquet/src/opener.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ use crate::page_filter::PagePruningAccessPlanFilter;
2323
use crate::row_group_filter::RowGroupAccessPlanFilter;
2424
use crate::{
2525
apply_file_schema_type_coercions, coerce_int96_to_resolution, row_filter,
26-
should_enable_page_index, ParquetAccessPlan, ParquetFileMetrics,
27-
ParquetFileReaderFactory,
26+
ParquetAccessPlan, ParquetFileMetrics, ParquetFileReaderFactory,
2827
};
2928
use datafusion_datasource::file_meta::FileMeta;
3029
use datafusion_datasource::file_stream::{FileOpenFuture, FileOpener};
@@ -440,3 +439,15 @@ async fn load_page_index<T: AsyncFileReader>(
440439
Ok(reader_metadata)
441440
}
442441
}
442+
443+
fn should_enable_page_index(
444+
enable_page_index: bool,
445+
page_pruning_predicate: &Option<Arc<PagePruningAccessPlanFilter>>,
446+
) -> bool {
447+
enable_page_index
448+
&& page_pruning_predicate.is_some()
449+
&& page_pruning_predicate
450+
.as_ref()
451+
.map(|p| p.filter_number() > 0)
452+
.unwrap_or(false)
453+
}

0 commit comments

Comments
 (0)