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 2022/11/30 15:47:44 UTC
[GitHub] [spark] cloud-fan opened a new pull request, #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
cloud-fan opened a new pull request, #38851:
URL: https://github.com/apache/spark/pull/38851
<!--
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'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### 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.
-->
Today, the way we resolve outer references is very inefficient. It invokes the entire analyzer to resolve the subquery plan, then transforms the plan to resolve `UnresolvedAttribute` to outer references. If the plan is still unresolved, repeat the process until the plan is resolved or the plan doesn't change any more. Ideally, we should only invoke the analyzer once to resolve subquery plans.
This PR adds a new rule to resolve outer references, and put it in the main analyzer batch. Then we can safely invoke the analyzer only once.
### 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.
-->
Simplify the subquery resolution code and make it more efficient
### 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.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
existing tests
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] viirya commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
viirya commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036659792
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
Aren't `ResolveMissingReferences` and `ResolveReferences` already run before `ResolveOuterReferences`?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #38851:
URL: https://github.com/apache/spark/pull/38851#issuecomment-1332373661
cc @viirya @allisonwang-db
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036654360
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,39 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set). Note that, this rule must be run after
+ * `ResolveReferences` and `ResolveMissingReferences`, as outer reference should be the last
+ * resort during column resolution.
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ val preparedPlan = ResolveMissingReferences(ResolveReferences(plan))
Review Comment:
as long as an `UnresolvedAttribute` can't be resolved by these rules, we can resolve it to outer references.
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] anchovYu commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
anchovYu commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036272043
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,39 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set). Note that, this rule must be run after
+ * `ResolveReferences` and `ResolveMissingReferences`, as outer reference should be the last
+ * resort during column resolution.
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ val preparedPlan = ResolveMissingReferences(ResolveReferences(plan))
Review Comment:
Is applying these rules once enough? e.g. is it possible that the application of `ResolveMissingReferences` makes more attributes resolvable by `ResolveReferences` and `ResolveMissingReferences` can be applied another time, so forth?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036678320
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
The key is to run `ResolveOuterReferences` **right after** these 3 rules, so that it's safe to resolve `UnresolvedAttribute` to outer references. Otherwise, other rules may change the plan shape and make these 3 rules applicable again.
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] viirya commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
viirya commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036659792
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
Aren't `ResolveMissingReferences` and `ResolveReferences` already run before `ResolveOuterReferences`? Will we just run this rule separately?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] anchovYu commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
anchovYu commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036726329
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,39 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set). Note that, this rule must be run after
+ * `ResolveReferences` and `ResolveMissingReferences`, as outer reference should be the last
+ * resort during column resolution.
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ val preparedPlan = ResolveMissingReferences(ResolveReferences(plan))
Review Comment:
Also these rules won't generate any new `UnresolvedAttribute ` correct?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] anchovYu commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
anchovYu commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1036272043
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,39 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set). Note that, this rule must be run after
+ * `ResolveReferences` and `ResolveMissingReferences`, as outer reference should be the last
+ * resort during column resolution.
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ val preparedPlan = ResolveMissingReferences(ResolveReferences(plan))
Review Comment:
Is applying these rules once enough? e.g. is it possible that the application of `ResolveMissingReferences` makes more attributes resolvable by `ResolveReferences` and so forth?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] allisonwang-db commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
allisonwang-db commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1037402070
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
+ prepared.resolveOperatorsDownWithPruning(_.containsPattern(UNRESOLVED_ATTRIBUTE)) {
+ // Handle `Generate` specially here, because `Generate.generatorOutput` starts with
+ // `UnresolvedAttribute` but we should never resolve it to outer references. It's a bit
+ // hacky that `Generate` uses `UnresolvedAttribute` to store the generator column names,
+ // we should clean it up later.
+ case g: Generate if g.childrenResolved && !g.resolved =>
Review Comment:
Do we have a unit test for this case?
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
I guess one disadvantage of running these three rules inside ResolveOuterReferences is that they are not visible in the plan change log.
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 closed pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
URL: https://github.com/apache/spark/pull/38851
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #38851:
URL: https://github.com/apache/spark/pull/38851#issuecomment-1333269909
thanks for review, merging 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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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] anchovYu commented on a diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
anchovYu commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1037696777
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
Also it's a bit strange when there is no outer reference to resolve but the 3 rules take effect, the plan change logger of this ResolveOuterReferences actually shows the changes from these 3 rules.
```
=== Applying Rule org.apache.spark.sql.catalyst.analysis.Analyzer$ResolveOuterReferences ===
'Project [id2#28L] 'Project [id2#28L]
+- 'SubqueryAlias __auto_generated_subquery_name +- 'SubqueryAlias __auto_generated_subquery_name
! +- 'Project [id#27, ('id + cast(1 as bigint)) AS id2#28] +- 'Project [id#27, (id#27 + cast(1 as bigint)) AS id2#28]
..
```
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1037757469
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
+ prepared.resolveOperatorsDownWithPruning(_.containsPattern(UNRESOLVED_ATTRIBUTE)) {
+ // Handle `Generate` specially here, because `Generate.generatorOutput` starts with
+ // `UnresolvedAttribute` but we should never resolve it to outer references. It's a bit
+ // hacky that `Generate` uses `UnresolvedAttribute` to store the generator column names,
+ // we should clean it up later.
+ case g: Generate if g.childrenResolved && !g.resolved =>
Review Comment:
existing tests failed without this 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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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 diff in pull request #38851: [SPARK-41338][SQL] Resolve outer references and normal columns in the same analyzer batch
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38851:
URL: https://github.com/apache/spark/pull/38851#discussion_r1037758192
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -2109,6 +2110,51 @@ class Analyzer(override val catalogManager: CatalogManager)
}
}
+ /**
+ * Resolves `UnresolvedAttribute` to `OuterReference` if we are resolving subquery plans (when
+ * `AnalysisContext.get.outerPlan` is set).
+ */
+ object ResolveOuterReferences extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ // Only apply this rule if we are resolving subquery plans.
+ if (AnalysisContext.get.outerPlan.isEmpty) return plan
+
+ // We must run these 3 rules first, as they also resolve `UnresolvedAttribute` and have
+ // higher priority than outer reference resolution.
+ val prepared = ResolveAggregateFunctions(ResolveMissingReferences(ResolveReferences(plan)))
Review Comment:
Yes, this is not a perfect solution, but AFAIK this is the only reliable way to guarantee rule execution order. The best solution in my opinion is to centralize all column resolution code in one rule, but that's a much larger 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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
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