Skip to content

feat: implement predicate adaptation for nested structs #16589

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
16 changes: 16 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ members = [
"datafusion/functions-window-common",
"datafusion/optimizer",
"datafusion/physical-expr",
"datafusion/physical-expr-adapter",
"datafusion/physical-expr-common",
"datafusion/physical-optimizer",
"datafusion/pruning",
Expand Down Expand Up @@ -135,6 +136,7 @@ datafusion-functions-window-common = { path = "datafusion/functions-window-commo
datafusion-macros = { path = "datafusion/macros", version = "48.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "48.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "48.0.0", default-features = false }
datafusion-physical-expr-adapter = { path = "datafusion/physical-expr-adapter", version = "48.0.0", default-features = false }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to make a new package because physical-expr does not have access to functions-nested

datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "48.0.0", default-features = false }
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "48.0.0" }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "48.0.0" }
Expand Down
1 change: 1 addition & 0 deletions datafusion/datasource-parquet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-functions-aggregate = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-adapter = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
datafusion-physical-optimizer = { workspace = true }
datafusion-physical-plan = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion datafusion/datasource-parquet/src/opener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use arrow::datatypes::{FieldRef, SchemaRef, TimeUnit};
use arrow::error::ArrowError;
use datafusion_common::{exec_err, DataFusionError, Result};
use datafusion_datasource::PartitionedFile;
use datafusion_physical_expr::PhysicalExprSchemaRewriter;
use datafusion_physical_expr_adapter::PhysicalExprSchemaRewriter;
use datafusion_physical_expr_common::physical_expr::{
is_dynamic_physical_expr, PhysicalExpr,
};
Expand Down
30 changes: 30 additions & 0 deletions datafusion/physical-expr-adapter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[package]
name = "datafusion-physical-expr-adapter"
description = "Physical expression schema adaptation utilities for DataFusion"
keywords = ["datafusion", "query", "sql"]
readme = "README.md"
version = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_physical_expr_adapter"
path = "src/lib.rs"

[dependencies]
arrow = { workspace = true }
datafusion-common = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-functions = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
itertools = { workspace = true }

[dev-dependencies]
datafusion-expr = { workspace = true }
insta = { workspace = true }
rstest = { workspace = true }
12 changes: 12 additions & 0 deletions datafusion/physical-expr-adapter/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# DataFusion Physical Expression Adapter

This crate provides physical expression schema adaptation utilities for DataFusion, with support for complex nested struct type handling.

## Overview

The `PhysicalExprSchemaRewriter` allows rewriting physical expressions to match different schemas, including:

- Type casting when logical and physical schemas have different types
- Handling missing columns by inserting null literals
- Struct support: Recursive rebuilding of struct expressions with proper field mapping
- Partition column replacement with literal values
28 changes: 28 additions & 0 deletions datafusion/physical-expr-adapter/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#![doc(
html_logo_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg",
html_favicon_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg"
)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

//! Physical expression schema adaptation utilities for DataFusion

pub mod schema_rewriter;

pub use schema_rewriter::PhysicalExprSchemaRewriter;
Loading