feat: add pattern for simplifying exprs like str ~ '^foo$'
#6369
Conversation
This file contains 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
crepererum
reviewed
May 17, 2023
| .all(|h| matches!(h.kind(), HirKind::Literal(_))) | ||
| } | ||
|
|
||
| /// extracts a string literal expression assuming that `is_anchored_literal()` |
There was a problem hiding this comment.
Suggested change
| /// extracts a string literal expression assuming that `is_anchored_literal()` | |
| /// extracts a string literal expression assuming that [`is_anchored_literal`] |
| assert_change( | ||
| regex_not_match(col("c1"), lit("^foo$")), | ||
| col("c1").not_eq(lit("foo")), | ||
| ); |
There was a problem hiding this comment.
Could we have another "unsupported" test here for (use assert_no_change, see other cases in this test):
^foo|bar$(OR within anchor)^(foo)(bar)$(I think this is a concat or more than 3 elements)^and$(single element)$^and$foo^(anchors flipped)
There was a problem hiding this comment.
Done, also added a test that combines anchored regexes with OR-chains, since lower_simple is called recursively for that case.
crepererum
approved these changes
May 17, 2023
|
To be merged once CI is green, thank you. |
alamb
reviewed
May 17, 2023
| @@ -2453,6 +2474,19 @@ mod tests { | |||
| .and(not_like(col("c1"), "%bar%")) | |||
| .and(not_like(col("c1"), "%baz%")), | |||
| ); | |||
| // both anchored expressions (translated to equality) and unanchored | |||
| assert_change( | |||
| regex_match(col("c1"), lit("foo|^x$|baz")), | |||
There was a problem hiding this comment.
this is a pretty neat rewrite
|
Thanks @wolffcm and @crepererum ! |
alamb
reviewed
May 17, 2023
| _ => None, | ||
| } | ||
| } | ||
|
|
||
| fn lower_simple(mode: &OperatorMode, left: &Expr, hir: &Hir) -> Option<Expr> { | ||
| println!("Considering hir kind: mode {mode:?} hir: {hir:?}"); |
There was a problem hiding this comment.
I noticed this stray println while reviewing this code so I propose removing it: #6375
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #6367.
Rationale for this change
This should be a performance improvement for queries that contain this pattern, and it may also be easier to push down predicates that use
=or!=rather than regexes.It will also make it easier to find predicates that are looking for the empty string (an important case for IOx's InfluxQL support).
What changes are included in this PR?
This adds a pattern to
ExprSimplifierto find regexes of the form^foo$and uses them to compare with a string literal instead of doing regex matching.Are these changes tested?
I included unit tests with the other regex simplifications that are performed. I also tested manually with
datafusion-cli.Are there any user-facing changes?
No.