You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "mikhailnik-db (via GitHub)" <gi...@apache.org> on 2025/12/18 11:58:38 UTC
[PR] [SPARK-54758] Fix generator resolution order in Project [spark]
mikhailnik-db opened a new pull request, #53527:
URL: https://github.com/apache/spark/pull/53527
<!--
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
'common/utils/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.
-->
Fix generator resolution order within project list. Now it always resolves from left to right. (see the golden file change for example)
### 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.
-->
Makes the resolution order more predictable. This will allow us to implement generator extraction in the new single-pass analyzer in plan compatible way.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
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, including those I added previously in https://github.com/apache/spark/pull/53447
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
Generated-by: Cursor 2.2.14
--
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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "mikhailnik-db (via GitHub)" <gi...@apache.org>.
mikhailnik-db commented on PR #53527:
URL: https://github.com/apache/spark/pull/53527#issuecomment-3671364816
@cloud-fan [second run](https://github.com/mikhailnik-db/spark/actions/runs/20335926036) has finished successfully
--
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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #53527:
URL: https://github.com/apache/spark/pull/53527#issuecomment-3673365156
thanks, 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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #53527:
URL: https://github.com/apache/spark/pull/53527#discussion_r2631244072
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -3239,15 +3246,21 @@ class Analyzer(
p
// The star will be expanded differently if we insert `Generate` under `Project` too early.
- case p @ Project(projectList, child) if !projectList.exists(_.exists(_.isInstanceOf[Star])) =>
+ // We also wait for all functions and generators to be resolved to ensure left-to-right
+ // generator ordering.
+ case p @ Project(projectList, child)
+ if !projectList.exists(_.exists(_.isInstanceOf[Star])) &&
+ !hasUnresolvedGeneratorOrFunction(projectList) =>
+ var hasSeenGenerator = false
val (resolvedGenerator, newProjectList) = projectList
.map(trimNonTopLevelAliases)
.foldLeft((None: Option[Generate], Nil: Seq[NamedExpression])) { (res, e) =>
e match {
// If there are more than one generator, we only rewrite the first one and wait for
// the next analyzer iteration to rewrite the next one.
- case AliasedGenerator(generator, names, outer) if res._1.isEmpty &&
+ case AliasedGenerator(generator, names, outer) if !hasSeenGenerator &&
Review Comment:
why we change `res._1.isEmpty` to 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.
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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #53527:
URL: https://github.com/apache/spark/pull/53527#issuecomment-3670944929
@mikhailnik-db can you re-trigger the failed CI job?
--
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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "mikhailnik-db (via GitHub)" <gi...@apache.org>.
mikhailnik-db commented on code in PR #53527:
URL: https://github.com/apache/spark/pull/53527#discussion_r2631300496
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -3239,15 +3246,21 @@ class Analyzer(
p
// The star will be expanded differently if we insert `Generate` under `Project` too early.
- case p @ Project(projectList, child) if !projectList.exists(_.exists(_.isInstanceOf[Star])) =>
+ // We also wait for all functions and generators to be resolved to ensure left-to-right
+ // generator ordering.
+ case p @ Project(projectList, child)
+ if !projectList.exists(_.exists(_.isInstanceOf[Star])) &&
+ !hasUnresolvedGeneratorOrFunction(projectList) =>
+ var hasSeenGenerator = false
val (resolvedGenerator, newProjectList) = projectList
.map(trimNonTopLevelAliases)
.foldLeft((None: Option[Generate], Nil: Seq[NamedExpression])) { (res, e) =>
e match {
// If there are more than one generator, we only rewrite the first one and wait for
// the next analyzer iteration to rewrite the next one.
- case AliasedGenerator(generator, names, outer) if res._1.isEmpty &&
+ case AliasedGenerator(generator, names, outer) if !hasSeenGenerator &&
Review Comment:
Here we change semantic a little:
* `res._1.isEmpty` means that we did not go down this branch and did not extract anything.
* `hasSeenGenerator` check almost the same, but also makes sure we did not miss any generators behind (e.g., because it did not match `AliasedGenerator(generator, names, outer)`).
In other words, I make this condition more strict: now even if we see in the project list smth like `UnresolvedAlias(Generator)` we save it in `hasSeenGenerator`. Therefore, instead of extracting the next (right) generator, we do nothing and wait for the leftmost to be resolved first.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -3239,15 +3246,21 @@ class Analyzer(
p
// The star will be expanded differently if we insert `Generate` under `Project` too early.
- case p @ Project(projectList, child) if !projectList.exists(_.exists(_.isInstanceOf[Star])) =>
+ // We also wait for all functions and generators to be resolved to ensure left-to-right
+ // generator ordering.
+ case p @ Project(projectList, child)
+ if !projectList.exists(_.exists(_.isInstanceOf[Star])) &&
+ !hasUnresolvedGeneratorOrFunction(projectList) =>
+ var hasSeenGenerator = false
val (resolvedGenerator, newProjectList) = projectList
.map(trimNonTopLevelAliases)
.foldLeft((None: Option[Generate], Nil: Seq[NamedExpression])) { (res, e) =>
e match {
// If there are more than one generator, we only rewrite the first one and wait for
// the next analyzer iteration to rewrite the next one.
- case AliasedGenerator(generator, names, outer) if res._1.isEmpty &&
+ case AliasedGenerator(generator, names, outer) if !hasSeenGenerator &&
Review Comment:
Here we change semantics a little:
* `res._1.isEmpty` means that we did not go down this branch and did not extract anything.
* `hasSeenGenerator` check almost the same, but also makes sure we did not miss any generators behind (e.g., because it did not match `AliasedGenerator(generator, names, outer)`).
In other words, I make this condition more strict: now even if we see in the project list smth like `UnresolvedAlias(Generator)` we save it in `hasSeenGenerator`. Therefore, instead of extracting the next (right) generator, we do nothing and wait for the leftmost to be resolved first.
--
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
Re: [PR] [SPARK-54758][SQL] Fix generator resolution order in Project [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #53527: [SPARK-54758][SQL] Fix generator resolution order in Project
URL: https://github.com/apache/spark/pull/53527
--
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