Github user hvanhovell commented on a diff in the pull request:
https://github.com/apache/spark/pull/14917#discussion_r78577165
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
---
@@ -57,20 +57,37 @@ object ConstantFolding extends Rule[LogicalPlan] {
* Reorder associative integral-type operators and fold all constants into
one.
*/
object ReorderAssociativeOperator extends Rule[LogicalPlan] {
- private def flattenAdd(e: Expression): Seq[Expression] = e match {
- case Add(l, r) => flattenAdd(l) ++ flattenAdd(r)
+ private def flattenAdd(
+ expression: Expression,
+ groupSet: ExpressionSet): Seq[Expression] = expression match {
+ case expr @ Add(l, r) if !groupSet.contains(expr) =>
+ flattenAdd(l, groupSet) ++ flattenAdd(r, groupSet)
case other => other :: Nil
}
- private def flattenMultiply(e: Expression): Seq[Expression] = e match {
- case Multiply(l, r) => flattenMultiply(l) ++ flattenMultiply(r)
+ private def flattenMultiply(
+ expression: Expression,
+ groupSet: ExpressionSet): Seq[Expression] = expression match {
+ case expr @ Multiply(l, r) if !groupSet.contains(expr) =>
+ flattenMultiply(l, groupSet) ++ flattenMultiply(r, groupSet)
case other => other :: Nil
}
+ private def collectGroupingExpressions(plan: LogicalPlan): ExpressionSet
= plan match {
--- End diff --
Lets move this into the `apply` (you already have the relevant comment
there).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
