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/12/01 20:56:25 UTC
[GitHub] [spark] amaliujia opened a new pull request, #38866: [CONNECT][PYTHON] Support List[Column] for Join's on argument
amaliujia opened a new pull request, #38866:
URL: https://github.com/apache/spark/pull/38866
<!--
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.
-->
This PR adds the support for Join on a list of columns.
### 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.
-->
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'.
-->
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] amaliujia commented on a diff in pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037739126
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -468,7 +468,7 @@ def take(self, num: int) -> List[Row]:
def join(
self,
other: "DataFrame",
- on: Optional[Union[str, List[str], Column]] = None,
+ on: Optional[Union[str, List[str], Column, List[Column]]] = None,
Review Comment:
Given this matches what PySpark does I will leave it as it 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] AmplabJenkins commented on pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #38866:
URL: https://github.com/apache/spark/pull/38866#issuecomment-1334657012
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] amaliujia commented on a diff in pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037581740
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
+ rel.join.join_condition.CopyFrom(
+ merge_column.to_plan(session) # ignore: union-attr
Review Comment:
With your analysis I see the error better now.
I chose to cast merged_column to `Column` which fix the error because I did `len(self.on) > 0` first then also rule out the str case by `isinstance(self.on[0], str)`.
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037707938
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(cast(str, self.on))
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
Review Comment:
maybe `functools.reduce(lambda c1, c2: c1 & c2, self.on)`
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037580677
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
Review Comment:
ah yes it fixes the check. thanks!
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037741383
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
Review Comment:
After check the Scala Dataset, I believe that does not do such validation so I assume Dataset also choose to leave Calalyst to handle such case.
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
Review Comment:
After check the Scala Dataset, I believe that does not do such validation so I assume Dataset also choose to leave Catalyst to handle such case.
--
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 pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
zhengruifeng commented on PR #38866:
URL: https://github.com/apache/spark/pull/38866#issuecomment-1334921050
late lgtm
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037554357
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
Review Comment:
I am having trouble to make this pass mypy.
Basically mypy does not buy in `isinstance(self.on[0], str):` is true is `type(self.on) = list[str]`.
Do you know if there is a way to fix it cc @zhengruifeng ?
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
+ rel.join.join_condition.CopyFrom(
+ merge_column.to_plan(session) # ignore: union-attr
Review Comment:
Same for 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
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037706761
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -468,7 +468,7 @@ def take(self, num: int) -> List[Row]:
def join(
self,
other: "DataFrame",
- on: Optional[Union[str, List[str], Column]] = None,
+ on: Optional[Union[str, List[str], Column, List[Column]]] = None,
Review Comment:
Just dropping a comment. It should actually be able to accept a tuple too .. or `Iterable` .. but I am fine because that's what's already done in PySpark DataFrame.
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037708218
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
Review Comment:
Should we throw an exception if the list (or string) is empty?
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037556630
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
Review Comment:
```
python/pyspark/sql/connect/plan.py:726: error: Argument 1 to "extend" of "RepeatedScalarFieldContainer" has incompatible type "Union[List[str], List[Column]]"; expected "Optional[Iterable[str]]" [arg-type]
```
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
+ rel.join.join_condition.CopyFrom(
+ merge_column.to_plan(session) # ignore: union-attr
Review Comment:
```
python/pyspark/sql/connect/plan.py:735: error: Item "str" of "Union[str, Column, None]" has no attribute "to_plan" [union-attr]
python/pyspark/sql/connect/plan.py:735: error: Item "None" of "Union[str, Column, None]" has no attribute "to_plan" [union-attr]
```
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037574229
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
Review Comment:
you need to cast:
```suggestion
rel.join.using_columns.extend(cast(str, self.on)) # ignore: arg-type
```
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
HyukjinKwon closed pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
URL: https://github.com/apache/spark/pull/38866
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on PR #38866:
URL: https://github.com/apache/spark/pull/38866#issuecomment-1334888344
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] amaliujia commented on a diff in pull request #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037740215
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
Review Comment:
I actually assumed Catalyst will complain if it hits illegal case.
Do you think client side should be more aggressive to check things before passing to server?
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037581740
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
+ rel.join.join_condition.CopyFrom(
+ merge_column.to_plan(session) # ignore: union-attr
Review Comment:
Thanks. With your analysis I see the error better now.
I chose to cast merged_column to `Column` which fix the error because I did `len(self.on) > 0` first then also rule out the str case by `isinstance(self.on[0], str)`.
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037576399
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,19 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(self.on) # ignore: arg-type
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
+ rel.join.join_condition.CopyFrom(
+ merge_column.to_plan(session) # ignore: union-attr
Review Comment:
So here the challenge is: if self.on is empty, merge_column is None (Optional). On itself is defined as either str, Column or None, so when you asign it might be any of those.
My suggestion would be to add proper isinstance checks or do a manual conversion to the expected type.
--
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 #38866: [SPARK-40970][CONNECT][PYTHON] Support List[Column] for Join's on argument
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38866:
URL: https://github.com/apache/spark/pull/38866#discussion_r1037739020
##########
python/pyspark/sql/connect/plan.py:
##########
@@ -721,8 +721,17 @@ def plan(self, session: "SparkConnectClient") -> proto.Relation:
rel.join.using_columns.append(self.on)
else:
rel.join.join_condition.CopyFrom(self.to_attr_or_expression(self.on, session))
- else:
- rel.join.using_columns.extend(self.on)
+ elif len(self.on) > 0:
+ if isinstance(self.on[0], str):
+ rel.join.using_columns.extend(cast(str, self.on))
+ else:
+ merge_column = None
+ for c in self.on:
+ if merge_column is not None:
+ merge_column = merge_column & c
+ else:
+ merge_column = c
Review Comment:
This is great! Applied your suggestion.
--
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