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/26 01:02:40 UTC
[GitHub] [spark] amaliujia opened a new pull request, #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
amaliujia opened a new pull request, #38393:
URL: https://github.com/apache/spark/pull/38393
<!--
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.
-->
1. Fix Join's `on` from ANY to concrete types (e.g. str, list of str, column, list of columns)
2. When `on` is str or list of str, it should generate a proto plan with `using_columns`
3. When `on` is column or list of column, it should generate a proto plan with `join_condition`.
### 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.
4. If you fix a bug, you can clarify why it is a bug.
-->
Improve API coverage
### 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'.
-->
### 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.
-->
--
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] HyukjinKwon commented on a diff in pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1006430760
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -218,8 +218,13 @@ def head(self, n: int) -> Optional["pandas.DataFrame"]:
self.limit(n)
return self.toPandas()
- # TODO(martin.grund) fix mypu
- def join(self, other: "DataFrame", on: Any, how: Optional[str] = None) -> "DataFrame":
+ # TODO: extend `on` to also be type List[ColumnRef].
Review Comment:
What does this mean?
--
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] zhengruifeng commented on a diff in pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
zhengruifeng commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1006443809
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -537,7 +537,7 @@ def __init__(
self,
left: Optional["LogicalPlan"],
right: "LogicalPlan",
- on: "ColumnOrString",
+ on: Optional[Union[str, List[str], ColumnRef]],
Review Comment:
should not be incompatible change, they are just used for static checking
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1006436736
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -218,8 +218,13 @@ def head(self, n: int) -> Optional["pandas.DataFrame"]:
self.limit(n)
return self.toPandas()
- # TODO(martin.grund) fix mypu
- def join(self, other: "DataFrame", on: Any, how: Optional[str] = None) -> "DataFrame":
+ # TODO: extend `on` to also be type List[ColumnRef].
Review Comment:
Join condition could be something like `[df.name=df2.name, df.age=df2.age]` which will be mapped to List[ColumnRef].
Current expression system in Connect is not perfect that we cannot convert the expression above into a simple expression. There are mixed ColumnRef, String, Expression, List, etc. and we need to figure out a way to unify all of those into ultimately one single expression. If that is too hard then at least we need to change proto to allow accepting a list of Expression.
I will follow up on the expression support in the Connect.
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1009005272
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -575,7 +575,14 @@ def plan(self, session: Optional["RemoteSparkSession"]) -> proto.Relation:
rel = proto.Relation()
rel.join.left.CopyFrom(self.left.plan(session))
rel.join.right.CopyFrom(self.right.plan(session))
- rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
+ if self.on is not None:
+ if not isinstance(self.on, list):
+ if isinstance(self.on, str):
Review Comment:
If you check existing PySpark implementation, yes, this is what I learn from there to support such multiple types.
--
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] HyukjinKwon closed pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon closed pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
URL: https://github.com/apache/spark/pull/38393
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #38393:
URL: https://github.com/apache/spark/pull/38393#issuecomment-1291778717
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] HyukjinKwon commented on pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on PR #38393:
URL: https://github.com/apache/spark/pull/38393#issuecomment-1297935788
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.
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] HyukjinKwon commented on a diff in pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1006430574
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -537,7 +537,7 @@ def __init__(
self,
left: Optional["LogicalPlan"],
right: "LogicalPlan",
- on: "ColumnOrString",
+ on: Optional[Union[str, List[str], ColumnRef]],
Review Comment:
Should actually use the signature of either `Sequence` or `Iterable[ColumnRef]` for `str` and `ColumnRef`. Should fix `dataframe.py` in PySpark API too. I am fine as is since it's at least consistent now.
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1008513991
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -537,7 +537,7 @@ def __init__(
self,
left: Optional["LogicalPlan"],
right: "LogicalPlan",
- on: "ColumnOrString",
+ on: Optional[Union[str, List[str], ColumnRef]],
Review Comment:
hmmm I gave a try but failed to make it work for mypy and UT together (not a python expert):
I found the trick case is `str` seems to be also consider-red as `Sequence` or `Iterable`.
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1008513991
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -537,7 +537,7 @@ def __init__(
self,
left: Optional["LogicalPlan"],
right: "LogicalPlan",
- on: "ColumnOrString",
+ on: Optional[Union[str, List[str], ColumnRef]],
Review Comment:
hmmm I gave a try but failed to make it work for mypy and UT together (not a python expert):
I found the trick case is `str` seems to be also consider-red as `Sequence` or `Iterable` which have caused things for implementation....
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on PR #38393:
URL: https://github.com/apache/spark/pull/38393#issuecomment-1296501846
@HyukjinKwon I have a TODO in the PR and also crated https://issues.apache.org/jira/browse/SPARK-40970 to follow up.
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1008919064
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -575,7 +575,14 @@ def plan(self, session: Optional["RemoteSparkSession"]) -> proto.Relation:
rel = proto.Relation()
rel.join.left.CopyFrom(self.left.plan(session))
rel.join.right.CopyFrom(self.right.plan(session))
- rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
+ if self.on is not None:
+ if not isinstance(self.on, list):
+ if isinstance(self.on, str):
Review Comment:
is this consistent with the "regular" PySpark approach?
--
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 #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on PR #38393:
URL: https://github.com/apache/spark/pull/38393#issuecomment-1292648488
R: @HyukjinKwon @zhengruifeng
cc: @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
[GitHub] [spark] amaliujia commented on a diff in pull request #38393: [SPARK-40915][CONNECT] Improve `on` in Join in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38393:
URL: https://github.com/apache/spark/pull/38393#discussion_r1006437955
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -537,7 +537,7 @@ def __init__(
self,
left: Optional["LogicalPlan"],
right: "LogicalPlan",
- on: "ColumnOrString",
+ on: Optional[Union[str, List[str], ColumnRef]],
Review Comment:
Is `list` to `Sequence` or `Iterable[xxx]` a API incompatible change? If not I can try to fix in this PR which sounds straightforward.
--
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