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/10/22 05:21:24 UTC
[GitHub] [spark] amaliujia opened a new pull request, #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
amaliujia opened a new pull request, #38345:
URL: https://github.com/apache/spark/pull/38345
<!--
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.
-->
I was working on refactoring Connect proto tests from Catalyst DSL to DataFrame API, and identified that Join in Connect does not support `UsingColumns`. This is a gap between the Connect proto and DataFrame API. This also blocks the refactoring work because without `UsingColumns`, there is no compatible DataFrame Join API that we can covert existing tests to.
This PR adds the support for Join's `UsingColumns`.
### 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.
-->
1. Improve API coverage.
2. Unblock testing refactoring.
### 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.
-->
UT
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
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] grundprinzip commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1003254127
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
doc?
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1004023351
##########
connector/connect/src/main/scala/org/apache/spark/sql/connect/dsl/package.scala:
##########
@@ -238,13 +238,17 @@ package object dsl {
def join(
otherPlan: proto.Relation,
joinType: JoinType = JoinType.JOIN_TYPE_INNER,
+ usingColumns: Seq[String] = Seq(),
Review Comment:
let's add an overload of `def join` which only accepts `usingColumns`, no `condition`
--
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] amaliujia commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1002886307
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
Based on the current Catalyst implementation. My read is yes.
My understanding is current Catalyst implementation does not support `JOIN USING col_name,...` in the join_condition. It is a separate code path. Is it true?
--
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] amaliujia commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1002886307
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
Based on the current Catalyst implementation. My read is yes.
My understanding is current Catalyst implementation does not support `USING ON col_name,...` in the join_condition. It is a separate code path. Is it true?
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1002881870
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
Can join_condition and using_columns co-exist?
--
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] AmplabJenkins commented on pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #38345:
URL: https://github.com/apache/spark/pull/38345#issuecomment-1287953624
Can one of the admins verify this patch?
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
URL: https://github.com/apache/spark/pull/38345
--
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] amaliujia commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1004046961
##########
connector/connect/src/main/scala/org/apache/spark/sql/connect/dsl/package.scala:
##########
@@ -238,13 +238,17 @@ package object dsl {
def join(
otherPlan: proto.Relation,
joinType: JoinType = JoinType.JOIN_TYPE_INNER,
+ usingColumns: Seq[String] = Seq(),
Review Comment:
Looks like only one overloaded version can have default arguments:
[ERROR] /Users/rui.wang/Documents/open-source-spark/spark/connector/connect/src/main/scala/org/apache/spark/sql/connect/dsl/package.scala:176: in class DslLogicalPlan, multiple overloaded alternatives of method join define default arguments.
I ended up with adding a few more overloaded version of `def join`.
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,10 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ // Optional. using_columns provides a list of columns that should present on both sides of
+ // the join inputs that this Join will join on. For example A JOIN B USING col_name is
+ // equivalent to A JOIN B on A.col_name = B.col_name.
Review Comment:
done.
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1004022886
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,10 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ // Optional. using_columns provides a list of columns that should present on both sides of
+ // the join inputs that this Join will join on. For example A JOIN B USING col_name is
+ // equivalent to A JOIN B on A.col_name = B.col_name.
Review Comment:
let's also mention that this can't co-exist with `join_condition`
--
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] amaliujia commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1003878598
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
I see. To match with our API (but not implementation), I added a check to make sure only one of these two will be set.
--
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] amaliujia commented on a diff in pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1003878330
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
done
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #38345:
URL: https://github.com/apache/spark/pull/38345#discussion_r1002888858
##########
connector/connect/src/main/protobuf/spark/connect/relations.proto:
##########
@@ -109,6 +109,7 @@ message Join {
Relation right = 2;
Expression join_condition = 3;
JoinType join_type = 4;
+ repeated string using_columns = 5;
Review Comment:
Looking at the API layer (DF and SQL), I don't think they can co-exist. E.g. the parser rule is
```
joinCriteria
: ON booleanExpression
| USING identifierList
;
```
--
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 #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #38345:
URL: https://github.com/apache/spark/pull/38345#issuecomment-1290776486
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] amaliujia commented on pull request #38345: [SPARK-40879][CONNECT] Support Join UsingColumns in proto
Posted by GitBox <gi...@apache.org>.
amaliujia commented on PR #38345:
URL: https://github.com/apache/spark/pull/38345#issuecomment-1287635120
R: @cloud-fan
--
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