From f7e12605a2e66eeb7d8cabe7f0a94c17e70765b4 Mon Sep 17 00:00:00 2001
From: jakevin <jakevingoo@gmail.com>
Date: Tue, 16 Jan 2024 10:09:25 +0800
Subject: [PATCH] [fix](Nereids): fix NPE InferPredicates (#29978)

PredicatePropagation shouldn't add null into List.
---
 .../apache/doris/nereids/rules/rewrite/InferPredicates.java  | 4 ++--
 .../doris/nereids/rules/rewrite/PredicatePropagation.java    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferPredicates.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferPredicates.java
index 36236c3db8..bafbc45cae 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferPredicates.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferPredicates.java
@@ -122,8 +122,8 @@ public class InferPredicates extends DefaultPlanRewriter<JobContext> implements
 
     private Plan inferNewPredicate(Plan plan, Set<Expression> expressions) {
         Set<Expression> predicates = expressions.stream()
-                .filter(c -> !c.getInputSlots().isEmpty() && plan.getOutputSet().containsAll(
-                        c.getInputSlots())).collect(Collectors.toSet());
+                .filter(c -> !c.getInputSlots().isEmpty() && plan.getOutputSet().containsAll(c.getInputSlots()))
+                .collect(Collectors.toSet());
         predicates.removeAll(plan.accept(pollUpPredicates, null));
         return PlanUtils.filterOrSelf(predicates, plan);
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PredicatePropagation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PredicatePropagation.java
index 5d11a1fa54..d1eba6cce3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PredicatePropagation.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PredicatePropagation.java
@@ -95,7 +95,10 @@ public class PredicatePropagation {
         slotPredicates.forEach((left, exprs) -> {
             for (Slot right : equalSet.calEqualSet(left)) {
                 for (Expression expr : exprs) {
-                    inferred.add(doInferPredicate(left, right, expr));
+                    Expression inferPredicate = doInferPredicate(left, right, expr);
+                    if (inferPredicate != null) {
+                        inferred.add(inferPredicate);
+                    }
                 }
             }
         });