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/19 05:59:58 UTC
[GitHub] [spark] amaliujia opened a new pull request, #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
amaliujia opened a new pull request, #38723:
URL: https://github.com/apache/spark/pull/38723
<!--
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.
-->
Implement `DataFrame.SelectExpr` in Python client. `SelectExpr` also has a good amount of usage.
### 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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029951172
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
I am pretty sure I removed this after conflict resolution.
Actually Martin pointed out another case: https://github.com/apache/spark/pull/38723#discussion_r1028942189
Basically it seems happened more than once that after code conflict resolution, the code I want to keep is gone.|
Maybe I should always do a `-i` commits square to in case more than 1 commit rebase causing unexpected result.
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
I will follow up this soon.
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon closed pull request #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
URL: https://github.com/apache/spark/pull/38723
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on PR #38723:
URL: https://github.com/apache/spark/pull/38723#issuecomment-1320811915
@zhengruifeng @HyukjinKwon
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1028930295
##########
python/pyspark/sql/connect/column.py:
##########
@@ -263,6 +263,22 @@ def __str__(self) -> str:
return f"Column({self._unparsed_identifier})"
+class SQLExpression(Expression):
+ """Returns Expression which contains a string which is a SQL expression
+ and server side will parse it by Catalyst
+ """
+
+ def __init__(self, expr: str) -> None:
+ super().__init__()
Review Comment:
I think that's fine. One point of having type hints is to avoid `assert`s on those types too.
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1027199617
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -124,6 +125,29 @@ def withPlan(cls, plan: plan.LogicalPlan, session: "RemoteSparkSession") -> "Dat
def select(self, *cols: "ExpressionOrString") -> "DataFrame":
return DataFrame.withPlan(plan.Project(self._plan, *cols), session=self._session)
+ def selectExpr(self, *expr: Union[str, List[str]]) -> "DataFrame":
+ """Projects a set of SQL expressions and returns a new :class:`DataFrame`.
+
+ This is a variant of :func:`select` that accepts SQL expressions.
+
+ .. versionadded:: 3.4.0
+
+ Returns
+ -------
+ :class:`DataFrame`
+ A DataFrame with new/old columns transformed by expressions.
+ """
+ sql_expr = []
+ if len(expr) == 1 and isinstance(expr[0], list):
+ expr = expr[0] # type: ignore[assignment]
+ for element in expr:
+ if isinstance(element, str):
+ sql_expr.append(SQLExpression(element))
+ else:
+ sql_expr.extend([SQLExpression(e) for e in element])
+
+ return DataFrame.withPlan(plan.Project(self._plan, *sql_expr), session=self._session)
Review Comment:
Actually it becomes `Expression.Builder().setExpressionString()` which are SQL expression strings.
`str` could be different things in DataFrame API.
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1027093850
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -124,6 +125,29 @@ def withPlan(cls, plan: plan.LogicalPlan, session: "RemoteSparkSession") -> "Dat
def select(self, *cols: "ExpressionOrString") -> "DataFrame":
return DataFrame.withPlan(plan.Project(self._plan, *cols), session=self._session)
+ def selectExpr(self, *expr: Union[str, List[str]]) -> "DataFrame":
+ """Projects a set of SQL expressions and returns a new :class:`DataFrame`.
+
+ This is a variant of :func:`select` that accepts SQL expressions.
+
+ .. versionadded:: 3.4.0
+
+ Returns
+ -------
+ :class:`DataFrame`
+ A DataFrame with new/old columns transformed by expressions.
+ """
+ sql_expr = []
+ if len(expr) == 1 and isinstance(expr[0], list):
+ expr = expr[0] # type: ignore[assignment]
+ for element in expr:
+ if isinstance(element, str):
+ sql_expr.append(SQLExpression(element))
+ else:
+ sql_expr.extend([SQLExpression(e) for e in element])
+
+ return DataFrame.withPlan(plan.Project(self._plan, *sql_expr), session=self._session)
Review Comment:
So this becomes an unresolved attribute and just works out of the box?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
zhengruifeng commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029949413
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
@amaliujia why you disable this test again?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1028411766
##########
python/pyspark/sql/connect/column.py:
##########
@@ -263,6 +263,22 @@ def __str__(self) -> str:
return f"Column({self._unparsed_identifier})"
+class SQLExpression(Expression):
+ """Returns Expression which contains a string which is a SQL expression
+ and server side will parse it by Catalyst
+ """
+
+ def __init__(self, expr: str) -> None:
+ super().__init__()
Review Comment:
In this implementation, we don't need to because the caller has verified the type (thus mypy does not complain).
I think this is a good question:
Generally speaking, I think for public API, we should throw user-facing exception, for internal API, we can assert when we want to defensive check unexpected input.
So it is a question of if we want to enforce checking cross all public/private API (by corresponding ways). I guess maybe not now but worth it at a right time (maybe before 3.4 release).
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029932646
##########
python/pyspark/sql/connect/column.py:
##########
@@ -263,6 +263,22 @@ def __str__(self) -> str:
return f"Column({self._unparsed_identifier})"
+class SQLExpression(Expression):
Review Comment:
Let's see in the future... I guess we will need to name more...
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029951479
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
I am really guessing if I have more than 1 commit locally, if the first one I resolve the conflict, the following commit that might add something back silently.....
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1027288544
##########
python/pyspark/sql/connect/dataframe.py:
##########
@@ -124,6 +125,29 @@ def withPlan(cls, plan: plan.LogicalPlan, session: "RemoteSparkSession") -> "Dat
def select(self, *cols: "ExpressionOrString") -> "DataFrame":
return DataFrame.withPlan(plan.Project(self._plan, *cols), session=self._session)
+ def selectExpr(self, *expr: Union[str, List[str]]) -> "DataFrame":
+ """Projects a set of SQL expressions and returns a new :class:`DataFrame`.
+
+ This is a variant of :func:`select` that accepts SQL expressions.
+
+ .. versionadded:: 3.4.0
+
+ Returns
+ -------
+ :class:`DataFrame`
+ A DataFrame with new/old columns transformed by expressions.
+ """
+ sql_expr = []
+ if len(expr) == 1 and isinstance(expr[0], list):
+ expr = expr[0] # type: ignore[assignment]
+ for element in expr:
+ if isinstance(element, str):
+ sql_expr.append(SQLExpression(element))
+ else:
+ sql_expr.extend([SQLExpression(e) for e in element])
+
+ return DataFrame.withPlan(plan.Project(self._plan, *sql_expr), session=self._session)
Review Comment:
This was not necessarily the question that I had, but I was not remembering correctly the type interface to Project:
```
def __init__(self, child: Optional["LogicalPlan"], *columns: "ExpressionOrString") -> None:
```
In this case `SQLExpression` is an expression and it just works.
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029950210
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
ah .. I didn't notice this. Can we enable this back?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
zhengruifeng commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029951842
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
no worries, add it back in https://github.com/apache/spark/pull/38763
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1028931101
##########
python/pyspark/sql/connect/column.py:
##########
@@ -263,6 +263,22 @@ def __str__(self) -> str:
return f"Column({self._unparsed_identifier})"
+class SQLExpression(Expression):
Review Comment:
I still don't like kind of naming .. but this is at least somewhat consistent with what we have in DSv2 so I am fine.
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on PR #38723:
URL: https://github.com/apache/spark/pull/38723#issuecomment-1324424425
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] zhengruifeng commented on a diff in pull request #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
zhengruifeng commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029950542
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -302,6 +301,31 @@ def test_to_pandas(self):
self.spark.sql(query).toPandas(),
)
+ def test_select_expr(self):
+ # SPARK-41201: test selectExpr API.
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ self.spark.read.table(self.tbl_name).selectExpr("id * 2").toPandas(),
+ )
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr(["id * 2", "cast(name as long) as name"])
+ .toPandas(),
+ )
+
+ self.assert_eq(
+ self.connect.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ self.spark.read.table(self.tbl_name)
+ .selectExpr("id * 2", "cast(name as long) as name")
+ .toPandas(),
+ )
+
+ @unittest.skip("test_fill_na is flaky")
Review Comment:
I think so, will send a followup for it
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1028942189
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -220,6 +220,29 @@ def test_create_global_temp_view(self):
with self.assertRaises(_MultiThreadedRendezvous):
Review Comment:
Didn't we fix this to grpc.RPCError?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
grundprinzip commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1027288685
##########
python/pyspark/sql/connect/column.py:
##########
@@ -263,6 +263,22 @@ def __str__(self) -> str:
return f"Column({self._unparsed_identifier})"
+class SQLExpression(Expression):
+ """Returns Expression which contains a string which is a SQL expression
+ and server side will parse it by Catalyst
+ """
+
+ def __init__(self, expr: str) -> None:
+ super().__init__()
Review Comment:
should we assert here that `expr` is string and not another expression?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #38723:
URL: https://github.com/apache/spark/pull/38723#issuecomment-1321183964
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 a diff in pull request #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1028931691
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -220,6 +220,29 @@ def test_create_global_temp_view(self):
with self.assertRaises(_MultiThreadedRendezvous):
self.connect.sql("SELECT 1 AS X LIMIT 0").createGlobalTempView("view_1")
+ def test_select_expr(self):
+ self.assert_eq(
Review Comment:
comment with a JIRA ID?
--
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 #38723: [SPARK-41201][CONNECT][PYTHON] Implement `DataFrame.SelectExpr` in Python client
Posted by GitBox <gi...@apache.org>.
amaliujia commented on code in PR #38723:
URL: https://github.com/apache/spark/pull/38723#discussion_r1029932471
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -220,6 +220,29 @@ def test_create_global_temp_view(self):
with self.assertRaises(_MultiThreadedRendezvous):
Review Comment:
hmmm I guess that was gone during code conflict and resolution then good fix is gone.
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -220,6 +220,29 @@ def test_create_global_temp_view(self):
with self.assertRaises(_MultiThreadedRendezvous):
self.connect.sql("SELECT 1 AS X LIMIT 0").createGlobalTempView("view_1")
+ def test_select_expr(self):
+ self.assert_eq(
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