You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2021/03/21 12:36:55 UTC
[GitHub] [spark] tanelk opened a new pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
tanelk opened a new pull request #31914:
URL: https://github.com/apache/spark/pull/31914
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Addressed the @dongjoon-hyun comments on the previous PR #30018
Extended the `RemoveRedundantAggregates` rule to remove redundant aggregations in even more queries. For example in
```
dataset
.dropDuplicates()
.groupBy('a)
.agg(max('b))
```
the `dropDuplicates` is not needed, because the result on `max` does not depend on duplicate values.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Improve performance.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
UT
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803630000
**[Test build #136308 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/136308/testReport)** for PR 31914 at commit [`19748dc`](https://github.com/apache/spark/commit/19748dcc88108019071971aeac7d1370d24d46cd).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847296708
**[Test build #138873 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/138873/testReport)** for PR 31914 at commit [`3fe6985`](https://github.com/apache/spark/commit/3fe698593cf78aeb7163130a2456fb7cca545719).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847119823
**[Test build #138873 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/138873/testReport)** for PR 31914 at commit [`3fe6985`](https://github.com/apache/spark/commit/3fe698593cf78aeb7163130a2456fb7cca545719).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803585081
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40890/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803633176
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/136308/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] tanelk commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
tanelk commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847119757
@maropu , this is a followup to a PR you reviewed a while back, but it has gone unnoticed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] tanelk commented on a change in pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
tanelk commented on a change in pull request #31914:
URL: https://github.com/apache/spark/pull/31914#discussion_r638050013
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RemoveRedundantAggregates.scala
##########
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.optimizer
+
+import org.apache.spark.sql.catalyst.analysis.PullOutNondeterministic
+import org.apache.spark.sql.catalyst.expressions.{AliasHelper, AttributeSet}
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.trees.TreePattern.AGGREGATE
+
+/**
+ * Remove redundant aggregates from a query plan. A redundant aggregate is an aggregate whose
+ * only goal is to keep distinct values, while its parent aggregate would ignore duplicate values.
+ */
+object RemoveRedundantAggregates extends Rule[LogicalPlan] with AliasHelper {
+ def apply(plan: LogicalPlan): LogicalPlan = plan.transformUpWithPruning(
+ _.containsPattern(AGGREGATE), ruleId) {
+ case upper @ Aggregate(_, _, lower: Aggregate) if isLowerRedundant(upper, lower) =>
+ val aliasMap = getAliasMap(lower)
+
+ val newAggregate = upper.copy(
+ child = lower.child,
+ groupingExpressions = upper.groupingExpressions.map(replaceAlias(_, aliasMap)),
+ aggregateExpressions = upper.aggregateExpressions.map(
+ replaceAliasButKeepName(_, aliasMap))
+ )
+
+ // We might have introduces non-deterministic grouping expression
+ if (newAggregate.groupingExpressions.exists(!_.deterministic)) {
+ PullOutNondeterministic.applyLocally.applyOrElse(newAggregate, identity[LogicalPlan])
+ } else {
+ newAggregate
+ }
+ }
+
+ private def isLowerRedundant(upper: Aggregate, lower: Aggregate): Boolean = {
+ val upperHasNoDuplicateSensitiveAgg = upper
+ .aggregateExpressions
+ .forall(expr => expr.find {
+ case ae: AggregateExpression => !EliminateDistinct.isDuplicateAgnostic(ae.aggregateFunction)
+ case e => AggregateExpression.isAggregate(e)
+ }.isEmpty)
Review comment:
This is only behaviour change
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] maropu commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
maropu commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847454950
Merged to master.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803586168
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40890/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] tanelk commented on a change in pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
tanelk commented on a change in pull request #31914:
URL: https://github.com/apache/spark/pull/31914#discussion_r598273073
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RemoveRedundantAggregates.scala
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.optimizer
+
+import org.apache.spark.sql.catalyst.analysis.PullOutNondeterministic
+import org.apache.spark.sql.catalyst.expressions.{AliasHelper, AttributeSet, Expression, PythonUDF}
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+/**
+ * Remove redundant aggregates from a query plan. A redundant aggregate is an aggregate whose
+ * only goal is to keep distinct values, while its parent aggregate would ignore duplicate values.
+ */
+object RemoveRedundantAggregates extends Rule[LogicalPlan] with AliasHelper {
+ def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {
+ case upper @ Aggregate(_, _, lower: Aggregate) if isLowerRedundant(upper, lower) =>
+ val aliasMap = getAliasMap(lower)
+
+ val newAggregate = upper.copy(
+ child = lower.child,
+ groupingExpressions = upper.groupingExpressions.map(replaceAlias(_, aliasMap)),
+ aggregateExpressions = upper.aggregateExpressions.map(
+ replaceAliasButKeepName(_, aliasMap))
+ )
+
+ // We might have introduced non-deterministic grouping expressions
+ if (newAggregate.groupingExpressions.exists(!_.deterministic)) {
+ PullOutNondeterministic.applyLocally.applyOrElse(newAggregate, identity[LogicalPlan])
+ } else {
+ newAggregate
+ }
+ }
+
+ private def isLowerRedundant(upper: Aggregate, lower: Aggregate): Boolean = {
+ val upperHasNoDuplicateSensitiveAgg = !upper
+ .aggregateExpressions
+ .exists(isDuplicateSensitiveAggregate)
+
+ lazy val upperRefsOnlyDeterministicNonAgg = upper.references.subsetOf(AttributeSet(
+ lower
+ .aggregateExpressions
+ .filter(_.deterministic)
+ .filterNot(isAggregate)
+ .map(_.toAttribute)
+ ))
+
+ upperHasNoDuplicateSensitiveAgg && upperRefsOnlyDeterministicNonAgg
+ }
+
+ private def isAggregate(expr: Expression): Boolean = {
+ expr.find(e => e.isInstanceOf[AggregateExpression] ||
+ PythonUDF.isGroupedAggPandasUDF(e)).isDefined
+ }
+
+ private def isDuplicateSensitiveAggregate(expr: Expression): Boolean = {
Review comment:
Added this check, previously `isAggregate` was used twice.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803575576
**[Test build #136308 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/136308/testReport)** for PR 31914 at commit [`19748dc`](https://github.com/apache/spark/commit/19748dcc88108019071971aeac7d1370d24d46cd).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847310472
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/138873/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847119823
**[Test build #138873 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/138873/testReport)** for PR 31914 at commit [`3fe6985`](https://github.com/apache/spark/commit/3fe698593cf78aeb7163130a2456fb7cca545719).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847310472
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/138873/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847184782
Kubernetes integration test status success
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/43395/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803575576
**[Test build #136308 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/136308/testReport)** for PR 31914 at commit [`19748dc`](https://github.com/apache/spark/commit/19748dcc88108019071971aeac7d1370d24d46cd).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847152782
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/43395/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847207928
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/43395/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] maropu closed pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
maropu closed pull request #31914:
URL: https://github.com/apache/spark/pull/31914
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803586168
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/40890/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847207928
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/43395/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] tanelk commented on a change in pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
tanelk commented on a change in pull request #31914:
URL: https://github.com/apache/spark/pull/31914#discussion_r598273073
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RemoveRedundantAggregates.scala
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.optimizer
+
+import org.apache.spark.sql.catalyst.analysis.PullOutNondeterministic
+import org.apache.spark.sql.catalyst.expressions.{AliasHelper, AttributeSet, Expression, PythonUDF}
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+/**
+ * Remove redundant aggregates from a query plan. A redundant aggregate is an aggregate whose
+ * only goal is to keep distinct values, while its parent aggregate would ignore duplicate values.
+ */
+object RemoveRedundantAggregates extends Rule[LogicalPlan] with AliasHelper {
+ def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {
+ case upper @ Aggregate(_, _, lower: Aggregate) if isLowerRedundant(upper, lower) =>
+ val aliasMap = getAliasMap(lower)
+
+ val newAggregate = upper.copy(
+ child = lower.child,
+ groupingExpressions = upper.groupingExpressions.map(replaceAlias(_, aliasMap)),
+ aggregateExpressions = upper.aggregateExpressions.map(
+ replaceAliasButKeepName(_, aliasMap))
+ )
+
+ // We might have introduced non-deterministic grouping expressions
+ if (newAggregate.groupingExpressions.exists(!_.deterministic)) {
+ PullOutNondeterministic.applyLocally.applyOrElse(newAggregate, identity[LogicalPlan])
+ } else {
+ newAggregate
+ }
+ }
+
+ private def isLowerRedundant(upper: Aggregate, lower: Aggregate): Boolean = {
+ val upperHasNoDuplicateSensitiveAgg = !upper
+ .aggregateExpressions
+ .exists(isDuplicateSensitiveAggregate)
+
+ lazy val upperRefsOnlyDeterministicNonAgg = upper.references.subsetOf(AttributeSet(
+ lower
+ .aggregateExpressions
+ .filter(_.deterministic)
+ .filterNot(isAggregate)
+ .map(_.toAttribute)
+ ))
+
+ upperHasNoDuplicateSensitiveAgg && upperRefsOnlyDeterministicNonAgg
+ }
+
+ private def isAggregate(expr: Expression): Boolean = {
+ expr.find(e => e.isInstanceOf[AggregateExpression] ||
+ PythonUDF.isGroupedAggPandasUDF(e)).isDefined
+ }
+
+ private def isDuplicateSensitiveAggregate(expr: Expression): Boolean = {
Review comment:
Added this check, previously `isAggregate` was used twice.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] maropu commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Extend RemoveRedundantAggregates optimizer rule to apply to more cases
Posted by GitBox <gi...@apache.org>.
maropu commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-847454529
I've checked the GA tests passed, so I will merge this. Thank you, @tanelk
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803584174
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/40890/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #31914: [SPARK-33122][SQL][FOLLOWUP] Remove redundant aggregates in the Optimzier
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #31914:
URL: https://github.com/apache/spark/pull/31914#issuecomment-803633176
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/136308/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org