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 2020/10/22 18:16:23 UTC
[GitHub] [spark] tanelk opened a new pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
tanelk opened a new pull request #30134:
URL: https://github.com/apache/spark/pull/30134
<!--
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.
-->
Extract methods related to handling Aliases to a trait.
### 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.
-->
Avoid code duplication
### 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.
-->
Existing UTs cover this
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
tanelk commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716554760
> Have you checked all the place where `Alias`s are used in analyzer/optimizer?
There were some places, but I did not feel that they deserved to get a method extracted. For example:
https://github.com/tanelk/spark/blob/63abab41b40e98947a5cb340a966e657e6b03632/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala#L3741
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716612926
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/34893/
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716628638
----------------------------------------------------------------
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] cloud-fan commented on a change in pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #30134:
URL: https://github.com/apache/spark/pull/30134#discussion_r511928131
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/AliasHelper.scala
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.expressions
+
+import org.apache.spark.sql.catalyst.analysis.MultiAlias
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Project}
+
+/**
+ * Helper methods for collecting and replacing aliases.
+ */
+trait AliasHelper {
+
+ protected def getAliasMap(plan: Project): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ getAliasMap(plan.projectList)
+ }
+
+ protected def getAliasMap(plan: Aggregate): AttributeMap[Alias] = {
+ // Find all the aliased expressions in the aggregate list that don't include any actual
+ // AggregateExpression or PythonUDF, and create a map from the alias to the expression
+ val aliasMap = plan.aggregateExpressions.collect {
+ case a: Alias if a.child.find(e => e.isInstanceOf[AggregateExpression] ||
+ PythonUDF.isGroupedAggPandasUDF(e)).isEmpty =>
+ (a.toAttribute, a)
+ }
+ AttributeMap(aliasMap)
+ }
+
+ protected def getAliasMap(exprs: Seq[NamedExpression]): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ AttributeMap(exprs.collect { case a: Alias => (a.toAttribute, a) })
+ }
+
+ /**
+ * Replace all attributes, that reference an alias, with the aliased expression
+ */
+ protected def replaceAlias(
+ expr: Expression,
+ aliasMap: AttributeMap[Alias]): Expression = {
+ // Use transformUp to prevent infinite recursion when the replacement expression
+ // redefines the same ExprId,
+ trimAliases(expr.transformUp {
+ case a: Attribute => aliasMap.getOrElse(a, a)
+ })
+ }
+
+ /**
+ * Replace all attributes, that reference an alias, with the aliased expression,
+ * but keep the name of the outmost attribute.
+ */
+ protected def replaceAliasButKeepName(
+ expr: NamedExpression,
+ aliasMap: AttributeMap[Alias]): NamedExpression = {
+ // Use transformUp to prevent infinite recursion when the replacement expression
+ // redefines the same ExprId,
+ trimNonTopLevelAliases(expr.transformUp {
+ case a: Attribute => aliasMap.getOrElse(a, a)
+ }).asInstanceOf[NamedExpression]
+ }
+
+ protected def trimAliases(e: Expression): Expression = {
+ e.transformDown {
+ case Alias(child, _) => child
+ case MultiAlias(child, _) => child
+ }
+ }
+
+ protected def trimNonTopLevelAliases(e: Expression): Expression = e match {
Review comment:
this method will never change the input expression type, how about
`def trimNonTopLevelAliases[T <: Expression](expr: T): T`
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714713721
Kubernetes integration test status success
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/34779/
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
maropu closed pull request #30134:
URL: https://github.com/apache/spark/pull/30134
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
maropu commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-717255473
> There were some places, but I did not feel that they deserved to get a method extracted. For example:
https://github.com/tanelk/spark/blob/63abab41b40e98947a5cb340a966e657e6b03632/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala#L3741
okay, thanks for the check. LGTM.
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714672645
**[Test build #130173 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130173/testReport)** for PR 30134 at commit [`783b763`](https://github.com/apache/spark/commit/783b76371aba7221c9d35c54965bb009ba30075a).
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716628607
Kubernetes integration test status success
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/34893/
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714819386
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714818775
**[Test build #130173 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130173/testReport)** for PR 30134 at commit [`783b763`](https://github.com/apache/spark/commit/783b76371aba7221c9d35c54965bb009ba30075a).
* 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] AmplabJenkins removed a comment on pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716743923
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714697599
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/34779/
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
maropu commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-717259554
Thanks! 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] cloud-fan commented on a change in pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #30134:
URL: https://github.com/apache/spark/pull/30134#discussion_r511926874
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/AliasHelper.scala
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.expressions
+
+import org.apache.spark.sql.catalyst.analysis.MultiAlias
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Project}
+
+/**
+ * Helper methods for collecting and replacing aliases.
+ */
+trait AliasHelper {
+
+ protected def getAliasMap(plan: Project): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ getAliasMap(plan.projectList)
+ }
+
+ protected def getAliasMap(plan: Aggregate): AttributeMap[Alias] = {
+ // Find all the aliased expressions in the aggregate list that don't include any actual
+ // AggregateExpression or PythonUDF, and create a map from the alias to the expression
+ val aliasMap = plan.aggregateExpressions.collect {
+ case a: Alias if a.child.find(e => e.isInstanceOf[AggregateExpression] ||
+ PythonUDF.isGroupedAggPandasUDF(e)).isEmpty =>
+ (a.toAttribute, a)
+ }
+ AttributeMap(aliasMap)
+ }
+
+ protected def getAliasMap(exprs: Seq[NamedExpression]): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ AttributeMap(exprs.collect { case a: Alias => (a.toAttribute, a) })
+ }
+
+ /**
+ * Replace all attributes, that reference an alias, with the aliased expression
+ */
+ protected def replaceAlias(
+ expr: Expression,
Review comment:
nit: 4 space indentation
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716628638
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714713744
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714713744
----------------------------------------------------------------
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] cloud-fan commented on pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716519788
looks fine
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714672645
**[Test build #130173 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130173/testReport)** for PR 30134 at commit [`783b763`](https://github.com/apache/spark/commit/783b76371aba7221c9d35c54965bb009ba30075a).
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716551877
**[Test build #130292 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130292/testReport)** for PR 30134 at commit [`bd2e8bc`](https://github.com/apache/spark/commit/bd2e8bcb351c723a6be51d38b81959bdc794e45a).
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716742913
**[Test build #130292 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130292/testReport)** for PR 30134 at commit [`bd2e8bc`](https://github.com/apache/spark/commit/bd2e8bcb351c723a6be51d38b81959bdc794e45a).
* 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] AmplabJenkins removed a comment on pull request #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-714819386
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716743923
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716551877
**[Test build #130292 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/130292/testReport)** for PR 30134 at commit [`bd2e8bc`](https://github.com/apache/spark/commit/bd2e8bcb351c723a6be51d38b81959bdc794e45a).
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
tanelk commented on a change in pull request #30134:
URL: https://github.com/apache/spark/pull/30134#discussion_r511962300
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/AliasHelper.scala
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.expressions
+
+import org.apache.spark.sql.catalyst.analysis.MultiAlias
+import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
+import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Project}
+
+/**
+ * Helper methods for collecting and replacing aliases.
+ */
+trait AliasHelper {
+
+ protected def getAliasMap(plan: Project): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ getAliasMap(plan.projectList)
+ }
+
+ protected def getAliasMap(plan: Aggregate): AttributeMap[Alias] = {
+ // Find all the aliased expressions in the aggregate list that don't include any actual
+ // AggregateExpression or PythonUDF, and create a map from the alias to the expression
+ val aliasMap = plan.aggregateExpressions.collect {
+ case a: Alias if a.child.find(e => e.isInstanceOf[AggregateExpression] ||
+ PythonUDF.isGroupedAggPandasUDF(e)).isEmpty =>
+ (a.toAttribute, a)
+ }
+ AttributeMap(aliasMap)
+ }
+
+ protected def getAliasMap(exprs: Seq[NamedExpression]): AttributeMap[Alias] = {
+ // Create a map of Aliases to their values from the child projection.
+ // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)).
+ AttributeMap(exprs.collect { case a: Alias => (a.toAttribute, a) })
+ }
+
+ /**
+ * Replace all attributes, that reference an alias, with the aliased expression
+ */
+ protected def replaceAlias(
+ expr: Expression,
+ aliasMap: AttributeMap[Alias]): Expression = {
+ // Use transformUp to prevent infinite recursion when the replacement expression
+ // redefines the same ExprId,
+ trimAliases(expr.transformUp {
+ case a: Attribute => aliasMap.getOrElse(a, a)
+ })
+ }
+
+ /**
+ * Replace all attributes, that reference an alias, with the aliased expression,
+ * but keep the name of the outmost attribute.
+ */
+ protected def replaceAliasButKeepName(
+ expr: NamedExpression,
+ aliasMap: AttributeMap[Alias]): NamedExpression = {
+ // Use transformUp to prevent infinite recursion when the replacement expression
+ // redefines the same ExprId,
+ trimNonTopLevelAliases(expr.transformUp {
+ case a: Attribute => aliasMap.getOrElse(a, a)
+ }).asInstanceOf[NamedExpression]
+ }
+
+ protected def trimAliases(e: Expression): Expression = {
+ e.transformDown {
+ case Alias(child, _) => child
+ case MultiAlias(child, _) => child
+ }
+ }
+
+ protected def trimNonTopLevelAliases(e: Expression): Expression = e match {
Review comment:
Good point!
----------------------------------------------------------------
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 #30134: [SPARK-33225][SQL] Extract AliasHelper trait
Posted by GitBox <gi...@apache.org>.
maropu commented on pull request #30134:
URL: https://github.com/apache/spark/pull/30134#issuecomment-716506505
NOTE: This PR comes from the comment in https://github.com/apache/spark/pull/30018#discussion_r510101973 cc: @cloud-fan @viirya
@tanelk Thanks for the work. Have you checked all the place where `Alias`s are used in analyzer/optimizer?
----------------------------------------------------------------
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