Address feedback

dbtsai · dbtsai · commit a9c97ceb445d · 2018-07-23T14:30:07.000-07: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
@@ -415,11 +415,8 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
         val (h, t) = branches.span(_._1 != TrueLiteral)
         CaseWhen( h :+ t.head, None)
 
-      case CaseWhen(branches, elseValue) if branches.length == 1 =>
-        val cond = branches.head._1
-        val trueValue = branches.head._2
-        val falseValue = elseValue.getOrElse(Literal(null, trueValue.dataType))
-        If(cond, trueValue, falseValue)
+      case CaseWhen((cond, branchValue) :: Nil, elseValue) =>
+        If(cond, branchValue, elseValue.getOrElse(Literal(null, branchValue.dataType)))
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -415,11 +415,8 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {`
`415`	`415`	`val (h, t) = branches.span(_._1 != TrueLiteral)`
`416`	`416`	`CaseWhen( h :+ t.head, None)`
`417`	`417`
`418`		`- case CaseWhen(branches, elseValue) if branches.length == 1 =>`
`419`		`- val cond = branches.head._1`
`420`		`- val trueValue = branches.head._2`
`421`		`- val falseValue = elseValue.getOrElse(Literal(null, trueValue.dataType))`
`422`		`- If(cond, trueValue, falseValue)`
	`418`	`+ case CaseWhen((cond, branchValue) :: Nil, elseValue) =>`
	`419`	`+ If(cond, branchValue, elseValue.getOrElse(Literal(null, branchValue.dataType)))`
`423`	`420`	`}`
`424`	`421`	`}`
`425`	`422`	`}`