spark-28478 small changes after CR

David Vrba · David Vrba · commit 81354ddb7e8b · 2020-01-20T08:03:28.000+01:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
@@ -443,11 +443,12 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
   private def isRedundantNullCheck(
       ifNullExpr: Expression,
       ifNotNullExpr: Expression,
-      checkedExpr: Expression): Boolean = ifNotNullExpr match {
-    case e: NullIntolerant if (
-      (ifNullExpr == checkedExpr || ifNullExpr == Literal.create(null, checkedExpr.dataType))
-      && e.children.contains(checkedExpr)) => true
-    case _ => false
+      checkedExpr: Expression): Boolean = {
+    ifNotNullExpr.isInstanceOf[NullIntolerant] && {
+      (ifNullExpr.semanticEquals(checkedExpr) ||
+        (ifNullExpr.foldable && ifNullExpr.eval() == null)) &&
+        ifNotNullExpr.children.contains(checkedExpr)
+    }
   }
 
   def apply(plan: LogicalPlan): LogicalPlan = plan transform {
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
@@ -22,7 +22,7 @@ import org.apache.spark.sql.catalyst.dsl.expressions._
 import org.apache.spark.sql.catalyst.dsl.plans._
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.expressions.Literal.{FalseLiteral, TrueLiteral}
-import org.apache.spark.sql.catalyst.plans.{PlanTest}
+import org.apache.spark.sql.catalyst.plans.PlanTest
 import org.apache.spark.sql.catalyst.plans.logical.{LocalRelation, LogicalPlan, Project}
 import org.apache.spark.sql.catalyst.rules.RuleExecutor
 import org.apache.spark.sql.types.{IntegerType, NullType}
