You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "nikolamand-db (via GitHub)" <gi...@apache.org> on 2024/02/28 15:52:55 UTC
[PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
nikolamand-db opened a new pull request, #45316:
URL: https://github.com/apache/spark/pull/45316
<!--
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
'common/utils/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.
-->
When using Connect with PySpark, string collation silently gets dropped:
```
Client connected to the Spark Connect server at localhost
SparkSession available as 'spark'.
>>> spark.sql("select 'abc' collate 'UNICODE'")
DataFrame[collate(abc): string]
>>> from pyspark.sql.types import StructType, StringType, StructField
>>> spark.createDataFrame([], StructType([StructField('id', StringType(2))]))
DataFrame[id: string]
```
Instead of `string` type in dataframe, we should be seeing `string COLLATE 'UNICODE'`.
Fix the issue by adding collation info to conversions under connect `UnparsedDataType`.
### 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.
-->
To enable correct behavior with PySpark connect collated strings.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes, with these changes the user gets correct string collation from PySpark connect session.
### 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.
-->
Added test which simulates the described scenario.
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No.
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506883576
##########
python/pyspark/sql/tests/connect/test_parity_types.py:
##########
@@ -86,6 +86,9 @@ def test_rdd_with_udt(self):
def test_udt(self):
super().test_udt()
+ def test_collated_string(self):
Review Comment:
We can actually just remove this. It will automatically run the tests (by inheritance)
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "nikolamand-db (via GitHub)" <gi...@apache.org>.
nikolamand-db commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506828009
##########
python/pyspark/sql/connect/types.py:
##########
@@ -139,7 +139,7 @@ def pyspark_types_to_proto_types(data_type: DataType) -> pb2.DataType:
if isinstance(data_type, NullType):
ret.null.CopyFrom(pb2.DataType.NULL())
elif isinstance(data_type, StringType):
- ret.string.CopyFrom(pb2.DataType.String())
+ ret.string.collation_id = data_type.collationId
Review Comment:
@amaliujia New changes should cover conversions in both directions (both get invoked during testing), please check.
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "nikolamand-db (via GitHub)" <gi...@apache.org>.
nikolamand-db commented on PR #45316:
URL: https://github.com/apache/spark/pull/45316#issuecomment-1970744506
> @nikolamand-db seems you need to enable the Github Action?
I'm having trouble with Github Actions, it's disabled for my account. Already filed a ticket with Github support.
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "xinrong-meng (via GitHub)" <gi...@apache.org>.
xinrong-meng commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1508107339
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -3397,6 +3397,14 @@ def test_df_caache(self):
self.assert_eq(10, df.count())
self.assertTrue(df.is_cached)
+ def test_collated_string(self):
Review Comment:
Just fyi we don't need to add the test to `test_parity_types`, it will inherit automatically.
Thanks @HyukjinKwon for the fix.
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "xinrong-meng (via GitHub)" <gi...@apache.org>.
xinrong-meng commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1508105692
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -3397,6 +3397,14 @@ def test_df_caache(self):
self.assert_eq(10, df.count())
self.assertTrue(df.is_cached)
+ def test_collated_string(self):
Review Comment:
Looks good, thank you!
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #45316:
URL: https://github.com/apache/spark/pull/45316#issuecomment-1972236137
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "nikolamand-db (via GitHub)" <gi...@apache.org>.
nikolamand-db commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506828591
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -3397,6 +3397,14 @@ def test_df_caache(self):
self.assert_eq(10, df.count())
self.assertTrue(df.is_cached)
+ def test_collated_string(self):
Review Comment:
@xinrong-meng Moved the test and added to `test_parity_types`, please check.
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon closed pull request #45316: [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation
URL: https://github.com/apache/spark/pull/45316
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on PR #45316:
URL: https://github.com/apache/spark/pull/45316#issuecomment-1970655550
@nikolamand-db seems you need to enable the Github Action?
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506883754
##########
python/pyspark/sql/tests/connect/test_parity_types.py:
##########
@@ -86,6 +86,9 @@ def test_rdd_with_udt(self):
def test_udt(self):
super().test_udt()
+ def test_collated_string(self):
+ super().test_collated_string()
+
Review Comment:
```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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "amaliujia (via GitHub)" <gi...@apache.org>.
amaliujia commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506639369
##########
python/pyspark/sql/connect/types.py:
##########
@@ -139,7 +139,7 @@ def pyspark_types_to_proto_types(data_type: DataType) -> pb2.DataType:
if isinstance(data_type, NullType):
ret.null.CopyFrom(pb2.DataType.NULL())
elif isinstance(data_type, StringType):
- ret.string.CopyFrom(pb2.DataType.String())
+ ret.string.collation_id = data_type.collationId
Review Comment:
Is this change tested? The added UT seems to test proto -> type conversion but not vice verse?
--
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
Re: [PR] [SPARK-47211][CONNECT][PYTHON] Fix ignored PySpark Connect string collation [spark]
Posted by "xinrong-meng (via GitHub)" <gi...@apache.org>.
xinrong-meng commented on code in PR #45316:
URL: https://github.com/apache/spark/pull/45316#discussion_r1506452926
##########
python/pyspark/sql/tests/connect/test_connect_basic.py:
##########
@@ -3397,6 +3397,14 @@ def test_df_caache(self):
self.assert_eq(10, df.count())
self.assertTrue(df.is_cached)
+ def test_collated_string(self):
Review Comment:
Shall we add the test to `pyspark.sql.tests.test_types.TypesTestsMixin`, so that `pyspark.sql.tests.connect.test_parity_types` can inherit automatically?
--
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