Repository: spark Updated Branches: refs/heads/branch-1.1 8d33a6d3d -> 19b01d6f7
[SPARK-3204][SQL] MaxOf would be foldable if both left and right are foldable. Author: Takuya UESHIN <[email protected]> Closes #2116 from ueshin/issues/SPARK-3204 and squashes the following commits: 7d9b107 [Takuya UESHIN] Make MaxOf foldable if both left and right are foldable. (cherry picked from commit d299e2bf2f6733a6267b7ce85e2b288608b17db3) Signed-off-by: Michael Armbrust <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/19b01d6f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/19b01d6f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/19b01d6f Branch: refs/heads/branch-1.1 Commit: 19b01d6f79f2919257fcd14524bc8267c57eb3d9 Parents: 8d33a6d Author: Takuya UESHIN <[email protected]> Authored: Mon Aug 25 16:27:00 2014 -0700 Committer: Michael Armbrust <[email protected]> Committed: Mon Aug 25 16:27:17 2014 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/catalyst/expressions/arithmetic.scala | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/19b01d6f/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala index 8d90614..5f8b6ae 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala @@ -89,6 +89,8 @@ case class Remainder(left: Expression, right: Expression) extends BinaryArithmet case class MaxOf(left: Expression, right: Expression) extends Expression { type EvaluatedType = Any + override def foldable = left.foldable && right.foldable + override def nullable = left.nullable && right.nullable override def children = left :: right :: Nil --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
