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/18 15:13:32 UTC
[GitHub] [spark] cloud-fan opened a new pull request, #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
cloud-fan opened a new pull request, #38713:
URL: https://github.com/apache/spark/pull/38713
<!--
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, our SQL parser only supports PIVOT/UNPIVOT at the end of the FROM clause. This is quite limited and it's better to allow PIVOT/UNPIVOT in the join children as well. As a reference, snowflake supports it: https://docs.snowflake.com/en/sql-reference/constructs/from.html
This PR supports the following SQL syntaxes:
```
FROM t1 PIVOT/UNPIVOT ... JOIN t2 // pivot/unpivot the left table
FROM t1 JOIN t2 PIVOT/UNPIVOT ... // pivot/unpivot the join result. This is the same before this PR
FROM t1 JOIN (t2 PIVOT/UNPIVOT ...) // pivot/unpivot the right table
```
### 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.
-->
make PIVOT/UNPIVOT syntax more flexible
### 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'.
-->
Yes, new SQL syntax without any breaking change
### 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.
-->
new parser 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] srielau commented on a diff in pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
srielau commented on code in PR #38713:
URL: https://github.com/apache/spark/pull/38713#discussion_r1026672022
##########
sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -697,12 +697,12 @@ setQuantifier
;
relation
- : LATERAL? relationPrimary joinRelation*
+ : LATERAL? relationPrimary pivotClause? unpivotClause? joinRelation*
;
joinRelation
- : (joinType) JOIN LATERAL? right=relationPrimary joinCriteria?
- | NATURAL joinType JOIN LATERAL? right=relationPrimary
+ : (joinType) JOIN LATERAL? right=relationPrimary joinCriteria? pivotClause? unpivotClause?
+ | NATURAL joinType JOIN LATERAL? right=relationPrimary pivotClause? unpivotClause?
Review Comment:
Have you tried simply:
```suggestion
: (joinType) JOIN LATERAL? right=relationPrimary joinCriteria? pivotClause? unpivotClause?
| NATURAL joinType JOIN LATERAL? right=relationPrimary
| pivotClause
| unpivotClause
```
Also removing the relation entries above?
##########
sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -697,12 +697,12 @@ setQuantifier
;
relation
- : LATERAL? relationPrimary joinRelation*
+ : LATERAL? relationPrimary pivotClause? unpivotClause? joinRelation*
Review Comment:
This doesn't look right.
As you say PIVOT and UNPIVOT are like JOINs, so why are do you have this strange ordered optional clauses instead of merging them in as if they were another type of join.
I can't put my finger on exactly how it breaks without running a bunch of tests.
For example I should be able to chain a string UNPIVOTs and PIVOTs in any order without the need for a JOIN (or a braces) in between. I don't see how that works here.
--
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] srielau commented on a diff in pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
srielau commented on code in PR #38713:
URL: https://github.com/apache/spark/pull/38713#discussion_r1026672022
##########
sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -697,12 +697,12 @@ setQuantifier
;
relation
- : LATERAL? relationPrimary joinRelation*
+ : LATERAL? relationPrimary pivotClause? unpivotClause? joinRelation*
;
joinRelation
- : (joinType) JOIN LATERAL? right=relationPrimary joinCriteria?
- | NATURAL joinType JOIN LATERAL? right=relationPrimary
+ : (joinType) JOIN LATERAL? right=relationPrimary joinCriteria? pivotClause? unpivotClause?
+ | NATURAL joinType JOIN LATERAL? right=relationPrimary pivotClause? unpivotClause?
Review Comment:
Have you tried simply:
```suggestion
: (joinType) JOIN LATERAL? right=relationPrimary joinCriteria?
| NATURAL joinType JOIN LATERAL? right=relationPrimary
| pivotClause
| unpivotClause
```
Also removing the relation entries above?
--
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] gengliangwang closed pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
gengliangwang closed pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
URL: https://github.com/apache/spark/pull/38713
--
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 #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #38713:
URL: https://github.com/apache/spark/pull/38713#issuecomment-1320161201
cc @viirya @MaxGekk
--
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] gengliangwang commented on pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
gengliangwang commented on PR #38713:
URL: https://github.com/apache/spark/pull/38713#issuecomment-1322461692
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
[GitHub] [spark] cloud-fan commented on a diff in pull request #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38713:
URL: https://github.com/apache/spark/pull/38713#discussion_r1026557894
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/UnpivotParserSuite.scala:
##########
@@ -192,4 +193,131 @@ class UnpivotParserSuite extends AnalysisTest {
)
}
+ test("unpivot - with joins") {
Review Comment:
I didn't add tests for pivot because:
1. there is no pivot parser suite
2. pivot/unpivot syntax is exactly the same regarding joins, no need to test both
--
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 #38713: [SPARK-41195][SQL] Support PIVOT/UNPIVOT with join children
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38713:
URL: https://github.com/apache/spark/pull/38713#discussion_r1027630891
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -1263,60 +1263,71 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
* }}}
*/
override def visitRelation(ctx: RelationContext): LogicalPlan = withOrigin(ctx) {
- withJoinRelations(plan(ctx.relationPrimary), ctx)
+ withRelationExtensions(ctx, plan(ctx.relationPrimary))
+ }
+
+ private def withRelationExtensions(ctx: RelationContext, query: LogicalPlan): LogicalPlan = {
+ ctx.relationExtension().asScala.foldLeft(query) { (left, extension) =>
+ if (extension.joinRelation() != null) {
+ withJoinRelation(extension.joinRelation(), left)
+ } else if (extension.pivotClause() != null) {
+ withPivot(extension.pivotClause(), left)
+ } else {
+ assert(extension.unpivotClause() != null)
+ withUnpivot(extension.unpivotClause(), left)
+ }
+ }
}
/**
- * Join one more [[LogicalPlan]]s to the current logical plan.
+ * Join one more [[LogicalPlan]] to the current logical plan.
*/
- private def withJoinRelations(base: LogicalPlan, ctx: RelationContext): LogicalPlan = {
- ctx.joinRelation.asScala.foldLeft(base) { (left, join) =>
Review Comment:
The actually code change is very small, just remove this loop and rename a few variables.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -1263,60 +1263,71 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
* }}}
*/
override def visitRelation(ctx: RelationContext): LogicalPlan = withOrigin(ctx) {
- withJoinRelations(plan(ctx.relationPrimary), ctx)
+ withRelationExtensions(ctx, plan(ctx.relationPrimary))
+ }
+
+ private def withRelationExtensions(ctx: RelationContext, query: LogicalPlan): LogicalPlan = {
+ ctx.relationExtension().asScala.foldLeft(query) { (left, extension) =>
+ if (extension.joinRelation() != null) {
+ withJoinRelation(extension.joinRelation(), left)
+ } else if (extension.pivotClause() != null) {
+ withPivot(extension.pivotClause(), left)
+ } else {
+ assert(extension.unpivotClause() != null)
+ withUnpivot(extension.unpivotClause(), left)
+ }
+ }
}
/**
- * Join one more [[LogicalPlan]]s to the current logical plan.
+ * Join one more [[LogicalPlan]] to the current logical plan.
*/
- private def withJoinRelations(base: LogicalPlan, ctx: RelationContext): LogicalPlan = {
- ctx.joinRelation.asScala.foldLeft(base) { (left, join) =>
Review Comment:
The actual code change is very small, just remove this loop and rename a few variables.
--
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