fix

Author: wangyum

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala

@@ -475,8 +475,6 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
       case If(TrueLiteral, trueValue, _) => trueValue
       case If(FalseLiteral, _, falseValue) => falseValue
       case If(Literal(null, _), _, falseValue) => falseValue
-      case If(_, TrueLiteral, TrueLiteral) => TrueLiteral
-      case If(_, FalseLiteral, FalseLiteral) => FalseLiteral
       case If(cond, TrueLiteral, FalseLiteral) => cond
       case If(cond, FalseLiteral, TrueLiteral) => Not(cond)
       case If(cond, trueValue, falseValue)
@@ -486,10 +484,6 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
       case If(cond, FalseLiteral, l @ Literal(null, _)) if !cond.nullable => And(Not(cond), l)
       case If(cond, TrueLiteral, l @ Literal(null, _)) if !cond.nullable => Or(cond, l)
 
-      case CaseWhen(branches, Some(TrueLiteral))
-          if branches.forall(_._2 == TrueLiteral) => TrueLiteral
-      case CaseWhen(branches, Some(FalseLiteral))
-          if branches.forall(_._2 == FalseLiteral) => FalseLiteral
       case CaseWhen(Seq((cond, TrueLiteral)), Some(FalseLiteral)) => cond
       case CaseWhen(Seq((cond, FalseLiteral)), Some(TrueLiteral)) => Not(cond)
 

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/PushFoldableIntoBranchesSuite.scala

@@ -68,7 +68,8 @@ class PushFoldableIntoBranchesSuite
     assert(!nonDeterministic.deterministic)
     assertEquivalent(EqualTo(nonDeterministic, Literal(2)),
       GreaterThanOrEqual(Rand(1), Literal(0.5)))
-    assertEquivalent(EqualTo(nonDeterministic, Literal(3)), FalseLiteral)
+    assertEquivalent(EqualTo(nonDeterministic, Literal(3)),
+      If(LessThan(Rand(1), Literal(0.5)), FalseLiteral, FalseLiteral))
 
     // Handle Null values.
     assertEquivalent(
@@ -141,7 +142,8 @@ class PushFoldableIntoBranchesSuite
     assert(!nonDeterministic.deterministic)
     assertEquivalent(EqualTo(nonDeterministic, Literal(2)),
       GreaterThanOrEqual(Rand(1), Literal(0.5)))
-    assertEquivalent(EqualTo(nonDeterministic, Literal(3)), FalseLiteral)
+    assertEquivalent(EqualTo(nonDeterministic, Literal(3)),
+      CaseWhen(Seq((LessThan(Rand(1), Literal(0.5)), FalseLiteral)), Some(FalseLiteral)))
 
     // Handle Null values.
     assertEquivalent(
@@ -268,9 +270,10 @@ class PushFoldableIntoBranchesSuite
     }
   }
 
-  test("SPARK-33884: simplify conditional if all branches are foldable boolean type") {
-    assertEquivalent(EqualTo(
-      CaseWhen(Seq((IsNull('a), Literal(0)), (IsNull('b), Literal(1))), Literal(2)), Literal(3)),
-      FalseLiteral)
+  test("SPARK-33884: simplify CaseWhen clauses with (true and false) and (false and true)") {
+    assertEquivalent(
+      EqualTo(CaseWhen(Seq(('a > 10, Literal(0))), Literal(1)), Literal(0)), 'a > 10)
+    assertEquivalent(
+      EqualTo(CaseWhen(Seq(('a > 10, Literal(0))), Literal(1)), Literal(1)), 'a <= 10)
   }
 }

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala

@@ -207,10 +207,6 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P
     assertEquivalent(
       If(IsNotNull(UnresolvedAttribute("a")), FalseLiteral, TrueLiteral),
       IsNull(UnresolvedAttribute("a")))
-    assertEquivalent(
-      If(IsNotNull(UnresolvedAttribute("a")), TrueLiteral, TrueLiteral), TrueLiteral)
-    assertEquivalent(
-      If(IsNotNull(UnresolvedAttribute("a")), FalseLiteral, FalseLiteral), FalseLiteral)
 
     assertEquivalent(
       If(GreaterThan(Rand(0), UnresolvedAttribute("a")), TrueLiteral, FalseLiteral),
@@ -228,21 +224,10 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P
     }
   }
 
-  test("SPARK-33884: simplify conditional if all branches are foldable boolean type") {
-    Seq(IsNull('a), GreaterThan(Rand(0), 1)).foreach { condition =>
-      assertEquivalent(CaseWhen(Seq((condition, FalseLiteral)), FalseLiteral), FalseLiteral)
-      assertEquivalent(CaseWhen(Seq((condition, TrueLiteral)), TrueLiteral), TrueLiteral)
-      assertEquivalent(
-        CaseWhen(Seq((condition, FalseLiteral), (IsNull('b), FalseLiteral)), FalseLiteral),
-        FalseLiteral)
-      assertEquivalent(
-        CaseWhen(Seq((condition, TrueLiteral), (IsNull('b), TrueLiteral)), TrueLiteral),
-        TrueLiteral)
+  test("SPARK-33884: simplify CaseWhen clauses with (true and false) and (false and true)") {
+    Seq(IsNull('a), GreaterThan(Rand(0), 1.0)).foreach { cond =>
+      assertEquivalent(CaseWhen(Seq((cond, TrueLiteral)), FalseLiteral), cond)
     }
-
-    assertEquivalent(CaseWhen(Seq((IsNull('a), TrueLiteral)), FalseLiteral), IsNull('a))
-    assertEquivalent(CaseWhen(Seq((GreaterThan(Rand(0), 1.0), TrueLiteral)), FalseLiteral),
-      GreaterThan(Rand(0), 1.0))
     assertEquivalent(CaseWhen(Seq((IsNull('a), FalseLiteral)), TrueLiteral), IsNotNull('a))
     assertEquivalent(CaseWhen(Seq((GreaterThan(Rand(0), 1.0), FalseLiteral)), TrueLiteral),
       LessThanOrEqual(Rand(0), 1.0))