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

Co-authored-by: Kishore Kumar M V <[email protected]>
StarRocks · Nov 21, 2024 · 307a91e · 307a91e
1 parent ac98db9
commit 307a91e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...core/src/main/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRule.java b/...core/src/main/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRule.java
@@ -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 -> {

diff --git a/.../src/test/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRuleTest.java b/.../src/test/java/com/starrocks/sql/optimizer/rewrite/scalar/NormalizePredicateRuleTest.java
@@ -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()));
+    }
 }