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.

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

Minor: Fix name in ArrayFunctionRewriter, error not panic if Expr::GetStructField is planned #10564

Closed
wants to merge 3 commits into from
Closed

Minor: Fix name in ArrayFunctionRewriter, error not panic if Expr::GetStructField is planned #10564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
926bba7
Minor: Fix names in ArrayFunctionRewriter
alamb May 17, 2024
7dcf0cb
Change panic to internal error
alamb May 17, 2024
9dbf5a4
fix
alamb May 17, 2024
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
6 changes: 3 additions & 3 deletions datafusion/core/src/physical_planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,12 @@ fn create_physical_name(e: &Expr, is_first_expr: bool) -> Result<String> {
match field {
GetFieldAccess::NamedStructField { name: _ } => {
unreachable!(
"NamedStructField should have been rewritten in OperatorToFunction"
"NamedStructField should have been rewritten in ArrayFunctionRewriter"
)
}
GetFieldAccess::ListIndex { key: _ } => {
unreachable!(
"ListIndex should have been rewritten in OperatorToFunction"
"ListIndex should have been rewritten in ArrayFunctionRewriter"
)
}
GetFieldAccess::ListRange {
Expand All @@ -234,7 +234,7 @@ fn create_physical_name(e: &Expr, is_first_expr: bool) -> Result<String> {
stride: _,
} => {
unreachable!(
"ListRange should have been rewritten in OperatorToFunction"
"ListRange should have been rewritten in ArrayFunctionRewriter"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

OperatorToFunction was the old name for these functions I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, now that I think about this I think the issue is that we now expect that these Exprs should never be present....

I think they can still be created via Expr::field(name)...

Will double check / see if I can make a reproduicer

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed -- it panics here: #10565

)
}
};
Expand Down
2 changes: 1 addition & 1 deletion datafusion/functions-array/src/rewrite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub(crate) struct ArrayFunctionRewriter {}

impl FunctionRewrite for ArrayFunctionRewriter {
fn name(&self) -> &str {
"FunctionRewrite"
"ArrayFunctionRewriter"
}

fn rewrite(
Expand Down
Loading