Refactor/simplify window frame utils #11648
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
sql
alamb
reviewed
Jul 25, 2024
| .order_by(order_by) | ||
| .window_frame(window_frame) | ||
| .build() | ||
| .unwrap()) |
Contributor
There was a problem hiding this comment.
this is a nice improvement too
alamb
reviewed
Jul 25, 2024
| || frame.end_bound.is_unbounded()) | ||
| { | ||
| plan_err!("RANGE requires exactly one ORDER BY column")? | ||
| /// Returns whether the window frame can accept multiple ORDER BY expressons. |
alamb
approved these changes
Jul 25, 2024
Contributor
alamb
left a comment
alamb
left a comment
There was a problem hiding this comment.
Thank you @ozankabak -- this looks like a nice improvement to me
datafusion/expr/src/window_frame.rs
Outdated
Comment on lines
263
to
267
| order_by.push(Expr::Sort(Sort::new( | ||
| Box::new(Expr::Literal(ScalarValue::UInt64(Some(1)))), | ||
| true, | ||
| false, | ||
| ))); |
Contributor
There was a problem hiding this comment.
FWIW you can write this more succinctly with the expr API like this I think
Suggested change
| order_by.push(Expr::Sort(Sort::new( | |
| Box::new(Expr::Literal(ScalarValue::UInt64(Some(1)))), | |
| true, | |
| false, | |
| ))); | |
| order_by.push(lit(1u64).sort(true, false)); |
Contributor
Author
There was a problem hiding this comment.
Indeed much nicer, thank you -- added
Contributor
Author
|
Did a Rust version update just land? CI checks were passing in-branch, but we have clippy and doc failures on CI post merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #.
Rationale for this change
Reducing API clutter for checking/verifying/regularizing window frames.
What changes are included in this PR?
Apart from the said API simplification, fixes the window fuzz tests to make it clear when streaming execution is not possible. Also removes some unwrap calls from window related code.
Are these changes tested?
Yes
Are there any user-facing changes?
A very minor change at the API level: The
regularizefunction becomes a method ofWindowFrame