[CALCITE-7747] RexSimplify.simplifySearch does not simplify SEARCH(li… - #5226
Open
sbroeder wants to merge 2 commits into
Open
[CALCITE-7747] RexSimplify.simplifySearch does not simplify SEARCH(li…#5226sbroeder wants to merge 2 commits into
sbroeder wants to merge 2 commits into
Conversation
…teral, Sarg) when pointCount >= 2 RexSimplify.simplifySearch only evaluated a SEARCH(subject, Sarg) call against its Sarg when sarg.isPoints() && sarg.pointCount <= 1, with no check for whether the subject itself is a constant. A single-point Sarg with any subject folded correctly, and a multi-point Sarg with a column-reference subject simplified correctly elsewhere, but a literal subject compared against a multi-point Sarg (for example, SEARCH(5, Sarg[1, 2])) fell through every branch unevaluated instead of folding to a boolean constant. This can occur whenever a rule substitutes a literal for a column reference in a SEARCH condition, such as when FilterSetOpTransposeRule pushes a filter through a branch of a Union that projects a constant. Fix simplifySearch so that when the search subject is itself a RexLiteral, the call is expanded via the existing RexUtil.expandSearch and the result is simplified recursively, regardless of point count. This matches the treatment already given to a single-point Sarg, but adds the recursive simplify() call needed to fold the expanded comparison tree down to a constant.
mihaibudiu
reviewed
Aug 26, 2026
| // Expand "SEARCH(x, Sarg([point])" to "x = point" | ||
| // and "SEARCH(x, Sarg([])" to "false" | ||
| return RexUtil.expandSearch(rexBuilder, null, call); | ||
| } else if (searchOperand instanceof RexLiteral || (sarg.isPoints() && sarg.pointCount <= 1)) { |
Contributor
There was a problem hiding this comment.
wouldn't this be clearer as two separate ifs?
Contributor
Author
There was a problem hiding this comment.
Yes, agreed. That is better.
mihaibudiu
approved these changes
Aug 27, 2026
|
mihaibudiu
added
the
LGTM-will-merge-soon
Contributor
|
I think you can squash. But I will wait a bit to merge to see if there are other comments. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
…teral, Sarg) when pointCount >= 2
RexSimplify.simplifySearch only evaluated a SEARCH(subject, Sarg) call against its Sarg when sarg.isPoints() && sarg.pointCount <= 1, with no check for whether the subject itself is a constant. A single-point Sarg with any subject folded correctly, and a multi-point Sarg with a column-reference subject simplified correctly elsewhere, but a literal subject compared against a multi-point Sarg (for example, SEARCH(5, Sarg[1, 2])) fell through every branch unevaluated instead of folding to a boolean constant.
This can occur whenever a rule substitutes a literal for a column reference in a SEARCH condition, such as when
FilterSetOpTransposeRule pushes a filter through a branch of a Union that projects a constant.
Jira Link
CALCITE-7747
Changes Proposed