Fix apply.

apache · Jun 2, 2016 · 3959d57 · 3959d57
1 parent 0acb157
commit 3959d57
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
@@ -752,25 +752,27 @@ object ReorderAssociativeOperator extends Rule[LogicalPlan] {
     case other => other :: Nil
   }
 
-  def apply(plan: LogicalPlan): LogicalPlan = plan transformExpressionsDown {
-    case a: Add if a.deterministic && a.dataType.isInstanceOf[IntegralType] =>
-      val (foldables, others) = flattenAdd(a).partition(_.foldable)
-      if (foldables.size > 1) {
-        val foldableExpr = foldables.reduce((x, y) => Add(x, y))
-        val c = Literal.create(foldableExpr.eval(EmptyRow), a.dataType)
-        if (others.isEmpty) c else Add(others.reduce((x, y) => Add(x, y)), c)
-      } else {
-        a
-      }
-    case m: Multiply if m.deterministic && m.dataType.isInstanceOf[IntegralType] =>
-      val (foldables, others) = flattenMultiply(m).partition(_.foldable)
-      if (foldables.size > 1) {
-        val foldableExpr = foldables.reduce((x, y) => Multiply(x, y))
-        val c = Literal.create(foldableExpr.eval(EmptyRow), m.dataType)
-        if (others.isEmpty) c else Multiply(others.reduce((x, y) => Multiply(x, y)), c)
-      } else {
-        m
-      }
+  def apply(plan: LogicalPlan): LogicalPlan = plan transform {
+    case q: LogicalPlan => q transformExpressionsDown {
+      case a: Add if a.deterministic && a.dataType.isInstanceOf[IntegralType] =>
+        val (foldables, others) = flattenAdd(a).partition(_.foldable)
+        if (foldables.size > 1) {
+          val foldableExpr = foldables.reduce((x, y) => Add(x, y))
+          val c = Literal.create(foldableExpr.eval(EmptyRow), a.dataType)
+          if (others.isEmpty) c else Add(others.reduce((x, y) => Add(x, y)), c)
+        } else {
+          a
+        }
+      case m: Multiply if m.deterministic && m.dataType.isInstanceOf[IntegralType] =>
+        val (foldables, others) = flattenMultiply(m).partition(_.foldable)
+        if (foldables.size > 1) {
+          val foldableExpr = foldables.reduce((x, y) => Multiply(x, y))
+          val c = Literal.create(foldableExpr.eval(EmptyRow), m.dataType)
+          if (others.isEmpty) c else Multiply(others.reduce((x, y) => Multiply(x, y)), c)
+        } else {
+          m
+        }
+    }
   }
 }