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

Jump to bottom

[BugFix] Fix for npe NormalizePredicateRule (backport #52326) #53087

Merged
merged 1 commit into from
Nov 21, 2024
Merged

[BugFix] Fix for npe NormalizePredicateRule (backport #52326) #53087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...core/src/main/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ private Optional<ScalarOperator> getOptimizedCompoundTree(CompoundPredicateOpera
parent.setCompoundTreeUniqueLeaves(compoundTreeUniqueLeaves);

// this tree can be optimized
if (compoundTreeUniqueLeaves.size() != parent.getCompoundTreeLeafNodeNumber()) {
if (compoundTreeUniqueLeaves != null &&
compoundTreeUniqueLeaves.size() != parent.getCompoundTreeLeafNodeNumber()) {
ScalarOperator newTree = Utils.createCompound(parent.getCompoundType(),
compoundTreeUniqueLeaves.stream().map(
node -> {
Expand Down
16 changes: 16 additions & 0 deletions .../src/test/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,20 @@ public void testCompound1() {
ScalarOperator res =
operatorRewriter.rewrite(compoundPredicateOperator, Lists.newArrayList(new NormalizePredicateRule()));
}

@Test
public void testCompound2() {
InPredicateOperator inOp = new InPredicateOperator(
false,
ConstantOperator.createInt(1063),
new ColumnRefOperator(0, Type.INT, "col1", false),
new ColumnRefOperator(1, Type.INT, "col2", false),
new ColumnRefOperator(2, Type.INT, "col3", false),
new ColumnRefOperator(3, Type.INT, "col4", false)
);

ScalarOperatorRewriter operatorRewriter = new ScalarOperatorRewriter();
ScalarOperator res =
operatorRewriter.rewrite(inOp, Lists.newArrayList(new NormalizePredicateRule()));
}
}
Loading