Skip to content

Use leaf level ProjectionMask for parquet projections #20925

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

Draft
friendlymatthew wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Use leaf level ProjectionMask for parquet projections #20925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5f8ee6
pr-20854:wq
friendlymatthew Mar 10, 2026
ba759be
unify parquet read plan
friendlymatthew Mar 12, 2026
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
16 changes: 12 additions & 4 deletions datafusion/datasource-parquet/src/opener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
//! [`ParquetOpener`] for opening Parquet files

use crate::page_filter::PagePruningAccessPlanFilter;
use crate::row_filter::build_projection_read_plan;
use crate::row_group_filter::RowGroupAccessPlanFilter;
use crate::{
ParquetAccessPlan, ParquetFileMetrics, ParquetFileReaderFactory,
Expand Down Expand Up @@ -621,9 +622,16 @@ impl FileOpener for ParquetOpener {
// metrics from the arrow reader itself
let arrow_reader_metrics = ArrowReaderMetrics::enabled();

let indices = projection.column_indices();
let mask =
ProjectionMask::roots(reader_metadata.parquet_schema(), indices.clone());
let read_plan = build_projection_read_plan(
projection.expr_iter(),
&physical_file_schema,
reader_metadata.parquet_schema(),
);

let mask = ProjectionMask::leaves(
reader_metadata.parquet_schema(),
read_plan.leaf_indices.iter().copied(),
);

let decoder = builder
.with_projection(mask)
Expand All @@ -639,7 +647,7 @@ impl FileOpener for ParquetOpener {
// Rebase column indices to match the narrowed stream schema.
// The projection expressions have indices based on physical_file_schema,
// but the stream only contains the columns selected by the ProjectionMask.
let stream_schema = Arc::new(physical_file_schema.project(&indices)?);
let stream_schema = read_plan.projected_schema;
let replace_schema = stream_schema != output_schema;
let projection = projection
.try_map_exprs(|expr| reassign_expr_columns(expr, &stream_schema))?;
Expand Down
Loading
Loading