You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/10/14 06:29:07 UTC
[GitHub] [spark] lvshaokang opened a new pull request, #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
lvshaokang opened a new pull request, #38251:
URL: https://github.com/apache/spark/pull/38251
<!--
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.
-->
In the PR, I propose to use error classes in the case of type check failure in Bloom Filter expressions.
### 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.
-->
Migration onto error classes unifies Spark SQL error messages.
### 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. The PR changes user-facing error messages.
### 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.
-->
```
build/sbt "sql/testOnly *SQLQueryTestSuite"
build/sbt "test:testOnly org.apache.spark.SparkThrowableSuite"
build/sbt "test:testOnly *BloomFilterAggregateQuerySuite"
```
--
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] MaxGekk commented on pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1282373697
+1, LGTM. Merging to master.
Thank you, @lvshaokang.
--
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] MaxGekk commented on a diff in pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on code in PR #38251:
URL: https://github.com/apache/spark/pull/38251#discussion_r996638262
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BloomFilterMightContain.scala:
##########
@@ -59,12 +61,25 @@ case class BloomFilterMightContain(
if !subquery.containsPattern(OUTER_REFERENCE) =>
TypeCheckResult.TypeCheckSuccess
case _ =>
- TypeCheckResult.TypeCheckFailure(s"The Bloom filter binary input to $prettyName " +
- "should be either a constant value or a scalar subquery expression")
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "actual" -> toSQLType(bloomFilterExpression.dataType)
Review Comment:
Type itself is not a problem, correct? More useful would be to show the non-constant or non-scalar subquery expr. How about:
`toSQLExpr(bloomFilterExpression)`
--
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] lvshaokang commented on pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1278559395
cc @MaxGekk
--
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] lvshaokang commented on pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1280597967
CI execution has the following exception, I don't know what is the problem and whether is related to this PR, could you help me? Thank you. @MaxGekk
```
starting mypy annotations test...
annotations failed mypy checks:
python/pyspark/sql/connect/plan.py:325: error: unused "type: ignore" comment
python/pyspark/sql/connect/plan.py:327: error: unused "type: ignore" comment
python/pyspark/sql/connect/plan.py:331: error: unused "type: ignore" comment
python/pyspark/sql/connect/plan.py:342: error: unused "type: ignore" comment
python/pyspark/sql/connect/plan.py:346: error: unused "type: ignore" comment
python/pyspark/sql/connect/plan.py:348: error: unused "type: ignore" comment
Found 6 errors in 1 file (checked 366 source files)
```
--
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] lvshaokang commented on a diff in pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on code in PR #38251:
URL: https://github.com/apache/spark/pull/38251#discussion_r996646587
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BloomFilterMightContain.scala:
##########
@@ -59,12 +61,25 @@ case class BloomFilterMightContain(
if !subquery.containsPattern(OUTER_REFERENCE) =>
TypeCheckResult.TypeCheckSuccess
case _ =>
- TypeCheckResult.TypeCheckFailure(s"The Bloom filter binary input to $prettyName " +
- "should be either a constant value or a scalar subquery expression")
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "actual" -> toSQLType(bloomFilterExpression.dataType)
Review Comment:
> toSQLExpr(bloomFilterExpression)
Yes, I tested it and using `toSQLExpr` is more clearer and useful, it will return actual bloomFilterExpression.
--
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] MaxGekk commented on a diff in pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on code in PR #38251:
URL: https://github.com/apache/spark/pull/38251#discussion_r996009592
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BloomFilterMightContain.scala:
##########
@@ -59,12 +61,24 @@ case class BloomFilterMightContain(
if !subquery.containsPattern(OUTER_REFERENCE) =>
TypeCheckResult.TypeCheckSuccess
case _ =>
- TypeCheckResult.TypeCheckFailure(s"The Bloom filter binary input to $prettyName " +
- "should be either a constant value or a scalar subquery expression")
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "actual" -> toSQLType(bloomFilterExpression.dataType)
+ )
+ )
}
- case _ => TypeCheckResult.TypeCheckFailure(s"Input to function $prettyName should have " +
- s"been ${BinaryType.simpleString} followed by a value with ${LongType.simpleString}, " +
- s"but it's [${left.dataType.catalogString}, ${right.dataType.catalogString}].")
+ case _ =>
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "required" -> (s"${toSQLType(BinaryType)} followed by " +
Review Comment:
Could you pass only `toSQLType(BinaryType)` and `toSQLType(LongType)`, and move the text around to error-classes.json
##########
sql/core/src/test/scala/org/apache/spark/sql/BloomFilterAggregateQuerySuite.scala:
##########
@@ -170,19 +196,44 @@ class BloomFilterAggregateQuerySuite extends QueryTest with SharedSparkSession {
|FROM values (cast(1 as string)), (cast(2 as string)) as t(a)"""
.stripMargin)
}
- assert(exception1.getMessage.contains(
- "The Bloom filter binary input to might_contain should be either a constant value or " +
- "a scalar subquery expression"))
+ checkError(
+ exception = exception1,
+ errorClass = "DATATYPE_MISMATCH.BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ parameters = Map(
+ "sqlExpr" -> "\"might_contain(CAST(a AS BINARY), CAST(5 AS BIGINT))\"",
+ "functionName" -> "`might_contain`",
+ "actual" -> "\"BINARY\""
+ ),
+ context = ExpectedContext(
+ fragment = "might_contain(cast(a as binary), cast(5 as long))",
+ start = 8,
+ stop = 56
+ )
+ )
val exception2 = intercept[AnalysisException] {
spark.sql("""
|SELECT might_contain((select cast(a as binary)), cast(5 as long))
|FROM values (cast(1 as string)), (cast(2 as string)) as t(a)"""
.stripMargin)
}
- assert(exception2.getMessage.contains(
- "The Bloom filter binary input to might_contain should be either a constant value or " +
- "a scalar subquery expression"))
+ checkError(
+ exception = exception2,
+ errorClass = "DATATYPE_MISMATCH.BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ parameters = Map(
+ "sqlExpr" -> "\"might_contain(scalarsubquery(a), CAST(5 AS BIGINT))\"",
+ "functionName" -> "`might_contain`",
+ "actual" -> "\"BINARY\""
+ ),
+ context = ExpectedContext(
+ fragment = "might_contain((select cast(a as binary)), cast(5 as long))",
+ start = 8,
+ stop = 65
+ )
+ )
+// assert(exception2.getMessage.contains(
+// "The Bloom filter binary input to might_contain should be either a constant value or " +
+// "a scalar subquery expression"))
Review Comment:
Could you remove this, please.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BloomFilterMightContain.scala:
##########
@@ -59,12 +61,24 @@ case class BloomFilterMightContain(
if !subquery.containsPattern(OUTER_REFERENCE) =>
TypeCheckResult.TypeCheckSuccess
case _ =>
- TypeCheckResult.TypeCheckFailure(s"The Bloom filter binary input to $prettyName " +
- "should be either a constant value or a scalar subquery expression")
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_BINARY_OP_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "actual" -> toSQLType(bloomFilterExpression.dataType)
+ )
+ )
}
- case _ => TypeCheckResult.TypeCheckFailure(s"Input to function $prettyName should have " +
- s"been ${BinaryType.simpleString} followed by a value with ${LongType.simpleString}, " +
- s"but it's [${left.dataType.catalogString}, ${right.dataType.catalogString}].")
+ case _ =>
+ DataTypeMismatch(
+ errorSubClass = "BLOOM_FILTER_WRONG_TYPE",
+ messageParameters = Map(
+ "functionName" -> toSQLId(prettyName),
+ "required" -> (s"${toSQLType(BinaryType)} followed by " +
+ s"a value with ${toSQLType(LongType)}"),
+ "actual" -> s"[${toSQLType(left.dataType)}, ${toSQLType(right.dataType)}]"
Review Comment:
Leave only `toSQLType(left.dataType)`, and move `[]` to error-classes.json, please.
--
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 #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1279770634
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] lvshaokang commented on pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1280242143
@MaxGekk Please take a look in your free time, 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] MaxGekk closed pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk closed pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
URL: https://github.com/apache/spark/pull/38251
--
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] lvshaokang commented on pull request #38251: [SPARK-40368][SQL] Migrate Bloom Filter type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #38251:
URL: https://github.com/apache/spark/pull/38251#issuecomment-1282187028
All the problems have been solved. cc @MaxGekk
--
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