You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "gdhuper (via GitHub)" <gi...@apache.org> on 2023/07/09 04:11:11 UTC
[GitHub] [spark] gdhuper opened a new pull request, #41904: [SPARK-43389] [PySpark, SQL] Added a null check for lineSep option
gdhuper opened a new pull request, #41904:
URL: https://github.com/apache/spark/pull/41904
<!--
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.
-->
### 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.
-->
### 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] srowen commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1261808987
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
I'd just require() it for consistency, unless there's an argument for other handling. (If there is, it'd probably apply to the "" case 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] gdhuper commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "gdhuper (via GitHub)" <gi...@apache.org>.
gdhuper commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1259340808
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
As far as my understanding, `None` when passed through python (`lineSep: None)` ends up being `null` in this function. Hence, I have a check for null.
--
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] srowen commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1261781671
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
Hm, but generated code would not need to set 'None' right? that isn't meaningful at the point you actually use Spark
--
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] gdhuper commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "gdhuper (via GitHub)" <gi...@apache.org>.
gdhuper commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1261777186
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
@srowen I can see that it should be an error just like an empty value `''`.
However, one of the use cases where this might be helpful is where someone might need to dynamically switch the value for `lineSep` from `None` to something else. For example, code generation is one example that comes to mind, where a base template with `lineSep: None` is used that can be replaced with appropriate values as desired.
--
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] srowen commented on pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on PR #41904:
URL: https://github.com/apache/spark/pull/41904#issuecomment-1635047095
@gdhuper what's your JIRA handle? I can assign it to 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
[GitHub] [spark] srowen closed pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen closed pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
URL: https://github.com/apache/spark/pull/41904
--
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] srowen commented on a diff in pull request #41904: [SPARK-43389] [PySpark, SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1257505488
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
Is a null line separator even valid? I'd imagine that should be an error, if an empty one is
--
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] gdhuper commented on pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "gdhuper (via GitHub)" <gi...@apache.org>.
gdhuper commented on PR #41904:
URL: https://github.com/apache/spark/pull/41904#issuecomment-1635048865
> @gdhuper what's your JIRA handle? I can assign it to you
gdhuper
--
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] gdhuper commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "gdhuper (via GitHub)" <gi...@apache.org>.
gdhuper commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1262174669
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] srowen commented on pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on PR #41904:
URL: https://github.com/apache/spark/pull/41904#issuecomment-1635045853
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] gdhuper commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "gdhuper (via GitHub)" <gi...@apache.org>.
gdhuper commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1261808401
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
I see your point. I guess we could also use another placeholder value instead of `None` in that scenario.
I can revert the changes and add a `require` clause for null check instead of letting it through. Or would you rather have it throw an `NullPointerException`?
--
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] srowen commented on a diff in pull request #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "srowen (via GitHub)" <gi...@apache.org>.
srowen commented on code in PR #41904:
URL: https://github.com/apache/spark/pull/41904#discussion_r1259650448
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVOptions.scala:
##########
@@ -253,16 +253,18 @@ class CSVOptions(
/**
* A string between two consecutive JSON records.
*/
- val lineSeparator: Option[String] = parameters.get(LINE_SEP).map { sep =>
- require(sep.nonEmpty, "'lineSep' cannot be an empty string.")
- // Intentionally allow it up to 2 for Window's CRLF although multiple
- // characters have an issue with quotes. This is intentionally undocumented.
- require(sep.length <= 2, "'lineSep' can contain only 1 character.")
- if (sep.length == 2) logWarning("It is not recommended to set 'lineSep' " +
- "with 2 characters due to the limitation of supporting multi-char 'lineSep' within quotes.")
- sep
+ val lineSeparator: Option[String] = parameters.get(LINE_SEP) match {
+ case Some(sep) if sep != null =>
Review Comment:
None isn't the default, right? if a user passes None, it feels like that should be an error
--
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 #41904: [SPARK-43389][SQL] Added a null check for lineSep option
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #41904:
URL: https://github.com/apache/spark/pull/41904#issuecomment-1628329084
and I actually think we might need to check every option. In some options, `None` might make sense as a valid option but others do not.
--
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