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/09/24 16:27:42 UTC
[GitHub] [spark] lvshaokang opened a new pull request, #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
lvshaokang opened a new pull request, #37986:
URL: https://github.com/apache/spark/pull/37986
<!--
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 window 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 *Window*Suite"
```
--
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 #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #37986:
URL: https://github.com/apache/spark/pull/37986#issuecomment-1257107320
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] MaxGekk closed pull request #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk closed pull request #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
URL: https://github.com/apache/spark/pull/37986
--
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 #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #37986:
URL: https://github.com/apache/spark/pull/37986#issuecomment-1257478094
@MaxGekk I have addressed, please take a look, thk!
--
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 #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on PR #37986:
URL: https://github.com/apache/spark/pull/37986#issuecomment-1257206608
@MaxGekk Thanks for you review. I'm already addressing 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] lvshaokang commented on a diff in pull request #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
lvshaokang commented on code in PR #37986:
URL: https://github.com/apache/spark/pull/37986#discussion_r979990464
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +66,27 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(errorSubClass = "UNSPECIFIED_FRAME")
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(errorSubClass = "RANGE_FRAME_WITHOUT_ORDER")
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
orderSpec.size > 1 =>
- TypeCheckFailure(
- s"A range window frame with value boundaries cannot be used in a window specification " +
- s"with multiple order by expressions: ${orderSpec.mkString(",")}")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_MULTI_ORDER",
+ messageParameters = Map(
+ "orderSpec" -> orderSpec.mkString(",")
+ )
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
!isValidFrameType(f.valueBoundary.head.dataType) =>
- TypeCheckFailure(
- s"The data type '${orderSpec.head.dataType.catalogString}' used in the order " +
- "specification does not match the data type " +
- s"'${f.valueBoundary.head.dataType.catalogString}' which is used in the range frame.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_INVALID_TYPE",
+ messageParameters = Map(
+ "orderSpecType" -> toSQLType(orderSpec.head.dataType.catalogString),
+ "valueBoundaryType" -> toSQLType(f.valueBoundary.head.dataType.catalogString)
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] MaxGekk commented on pull request #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on PR #37986:
URL: https://github.com/apache/spark/pull/37986#issuecomment-1258305825
The failures in YarnClusterSuite are not related to the changes. 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 #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on code in PR #37986:
URL: https://github.com/apache/spark/pull/37986#discussion_r979869283
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +66,27 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(errorSubClass = "UNSPECIFIED_FRAME")
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(errorSubClass = "RANGE_FRAME_WITHOUT_ORDER")
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
orderSpec.size > 1 =>
- TypeCheckFailure(
- s"A range window frame with value boundaries cannot be used in a window specification " +
- s"with multiple order by expressions: ${orderSpec.mkString(",")}")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_MULTI_ORDER",
+ messageParameters = Map(
+ "orderSpec" -> orderSpec.mkString(",")
+ )
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
!isValidFrameType(f.valueBoundary.head.dataType) =>
- TypeCheckFailure(
- s"The data type '${orderSpec.head.dataType.catalogString}' used in the order " +
- "specification does not match the data type " +
- s"'${f.valueBoundary.head.dataType.catalogString}' which is used in the range frame.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_INVALID_TYPE",
+ messageParameters = Map(
+ "orderSpecType" -> toSQLType(orderSpec.head.dataType.catalogString),
+ "valueBoundaryType" -> toSQLType(f.valueBoundary.head.dataType.catalogString)
Review Comment:
```suggestion
"orderSpecType" -> toSQLType(orderSpec.head.dataType),
"valueBoundaryType" -> toSQLType(f.valueBoundary.head.dataType)
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -262,11 +281,22 @@ case class SpecifiedWindowFrame(
private def checkBoundary(b: Expression, location: String): TypeCheckResult = b match {
case _: SpecialFrameBoundary => TypeCheckSuccess
case e: Expression if !e.foldable =>
- TypeCheckFailure(s"Window frame $location bound '$e' is not a literal.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "location" -> location,
+ "expression" -> toSQLExpr(e)
+ )
+ )
case e: Expression if !frameType.inputType.acceptsType(e.dataType) =>
- TypeCheckFailure(
- s"The data type of the $location bound '${e.dataType.catalogString}' does not match " +
- s"the expected data type '${frameType.inputType.simpleString}'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE",
+ messageParameters = Map(
+ "location" -> location,
+ "exprType" -> toSQLType(e.dataType.catalogString),
+ "expectedType" -> toSQLType(frameType.inputType.simpleString)
Review Comment:
```suggestion
"exprType" -> toSQLType(e.dataType),
"expectedType" -> toSQLType(frameType.inputType)
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -215,17 +219,32 @@ case class SpecifiedWindowFrame(
// Check combination (of expressions).
(lower, upper) match {
case (l: Expression, u: Expression) if !isValidFrameBoundary(l, u) =>
- TypeCheckFailure(s"Window frame upper bound '$upper' does not follow the lower bound " +
- s"'$lower'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_INVALID_BOUND",
+ messageParameters = Map(
+ "upper" -> toSQLExpr(upper),
+ "lower" -> toSQLExpr(lower)
+ )
+ )
case (l: SpecialFrameBoundary, _) => TypeCheckSuccess
case (_, u: SpecialFrameBoundary) => TypeCheckSuccess
case (l: Expression, u: Expression) if l.dataType != u.dataType =>
- TypeCheckFailure(
- s"Window frame bounds '$lower' and '$upper' do no not have the same data type: " +
- s"'${l.dataType.catalogString}' <> '${u.dataType.catalogString}'")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_DIFF_TYPES",
+ messageParameters = Map(
+ "lower" -> toSQLExpr(lower),
+ "upper" -> toSQLExpr(upper),
+ "lowerType" -> toSQLType(l.dataType.catalogString),
+ "upperType" -> toSQLType(u.dataType.catalogString)
Review Comment:
```suggestion
"lowerType" -> toSQLType(l.dataType),
"upperType" -> toSQLType(u.dataType)
```
--
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 #37986: [SPARK-40357][SQL] Migrate window type check failures onto error classes
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on code in PR #37986:
URL: https://github.com/apache/spark/pull/37986#discussion_r979293197
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -421,7 +454,12 @@ sealed abstract class FrameLessOffsetWindowFunction
if (check.isFailure) {
check
} else if (!offset.foldable) {
- TypeCheckFailure(s"Offset expression '$offset' must be a literal.")
+ DataTypeMismatch(
+ errorSubClass = "FRAME_LESS_OFFSET_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "offset" -> s"$offset"
Review Comment:
Since offset is an expression, please, wrap it by toSQLExpr()
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +65,31 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(
+ errorSubClass = "UNSPECIFIED_FRAME"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_WITHOUT_ORDER"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
orderSpec.size > 1 =>
- TypeCheckFailure(
- s"A range window frame with value boundaries cannot be used in a window specification " +
- s"with multiple order by expressions: ${orderSpec.mkString(",")}")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_MULTI_ORDER",
+ messageParameters = Map(
+ "orderSpec" -> s"${orderSpec.mkString(",")}"
+ )
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
!isValidFrameType(f.valueBoundary.head.dataType) =>
- TypeCheckFailure(
- s"The data type '${orderSpec.head.dataType.catalogString}' used in the order " +
- "specification does not match the data type " +
- s"'${f.valueBoundary.head.dataType.catalogString}' which is used in the range frame.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_INVALID_TYPE",
+ messageParameters = Map(
+ "orderSpecType" -> s"${orderSpec.head.dataType.catalogString}",
+ "valueBoundaryType" -> s"${f.valueBoundary.head.dataType.catalogString}"
Review Comment:
The same, toSQLType
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +65,31 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(
+ errorSubClass = "UNSPECIFIED_FRAME"
+ )
Review Comment:
```suggestion
DataTypeMismatch(errorSubClass = "UNSPECIFIED_FRAME")
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -262,11 +284,22 @@ case class SpecifiedWindowFrame(
private def checkBoundary(b: Expression, location: String): TypeCheckResult = b match {
case _: SpecialFrameBoundary => TypeCheckSuccess
case e: Expression if !e.foldable =>
- TypeCheckFailure(s"Window frame $location bound '$e' is not a literal.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "location" -> s"$location",
+ "expression" -> s"$e"
Review Comment:
Use toSQLExpr()
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -262,11 +284,22 @@ case class SpecifiedWindowFrame(
private def checkBoundary(b: Expression, location: String): TypeCheckResult = b match {
case _: SpecialFrameBoundary => TypeCheckSuccess
case e: Expression if !e.foldable =>
- TypeCheckFailure(s"Window frame $location bound '$e' is not a literal.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "location" -> s"$location",
+ "expression" -> s"$e"
+ )
+ )
case e: Expression if !frameType.inputType.acceptsType(e.dataType) =>
- TypeCheckFailure(
- s"The data type of the $location bound '${e.dataType.catalogString}' does not match " +
- s"the expected data type '${frameType.inputType.simpleString}'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE",
+ messageParameters = Map(
+ "location" -> s"$location",
+ "exprType" -> s"${e.dataType.catalogString}",
+ "expectedType" -> s"${frameType.inputType.simpleString}"
Review Comment:
Please, use toSQLType
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_INVALID_BOUND" : {
+ "message" : [
+ "Window frame upper bound '<upper>' does not follow the lower bound '<lower>'."
Review Comment:
```suggestion
"Window frame upper bound <upper> does not follow the lower bound <lower>."
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_INVALID_BOUND" : {
+ "message" : [
+ "Window frame upper bound '<upper>' does not follow the lower bound '<lower>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE" : {
+ "message" : [
+ "The data type of the <location> bound '<exprType>' does not match the expected data type '<expectedType>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE" : {
+ "message" : [
+ "Window frame <location> bound '<expression>' is not a literal."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_WRONG_COMPARISON" : {
+ "message" : [
+ "The lower bound of a window frame must be <comparison> to the upper bound"
+ ]
+ },
"UNEXPECTED_INPUT_TYPE" : {
"message" : [
"parameter <paramIndex> requires <requiredType> type, however, <inputSql> is of <inputType> type."
]
},
+ "UNSPECIFIED_FRAME" : {
+ "message" : [
+ "cannot use an UnspecifiedFrame.",
+ "This should have been converted during analysis."
Review Comment:
```suggestion
"Cannot use an UnspecifiedFrame. This should have been converted during analysis."
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCheckResult.scala:
##########
@@ -51,7 +51,7 @@ object TypeCheckResult {
*/
case class DataTypeMismatch(
errorSubClass: String,
- messageParameters: Map[String, String])
+ messageParameters: Map[String, String] = Map())
Review Comment:
nit:
```suggestion
messageParameters: Map[String, String] = Map.empty)
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +65,31 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(
+ errorSubClass = "UNSPECIFIED_FRAME"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_WITHOUT_ORDER"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
orderSpec.size > 1 =>
- TypeCheckFailure(
- s"A range window frame with value boundaries cannot be used in a window specification " +
- s"with multiple order by expressions: ${orderSpec.mkString(",")}")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_MULTI_ORDER",
+ messageParameters = Map(
+ "orderSpec" -> s"${orderSpec.mkString(",")}"
Review Comment:
```suggestion
"orderSpec" -> orderSpec.mkString(",")
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +65,31 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(
+ errorSubClass = "UNSPECIFIED_FRAME"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_WITHOUT_ORDER"
+ )
Review Comment:
```suggestion
DataTypeMismatch(errorSubClass = "RANGE_FRAME_WITHOUT_ORDER")
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -65,24 +65,31 @@ case class WindowSpecDefinition(
override def checkInputDataTypes(): TypeCheckResult = {
frameSpecification match {
case UnspecifiedFrame =>
- TypeCheckFailure(
- "Cannot use an UnspecifiedFrame. This should have been converted during analysis. " +
- "Please file a bug report.")
+ DataTypeMismatch(
+ errorSubClass = "UNSPECIFIED_FRAME"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && !f.isUnbounded &&
orderSpec.isEmpty =>
- TypeCheckFailure(
- "A range window frame cannot be used in an unordered window specification.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_WITHOUT_ORDER"
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
orderSpec.size > 1 =>
- TypeCheckFailure(
- s"A range window frame with value boundaries cannot be used in a window specification " +
- s"with multiple order by expressions: ${orderSpec.mkString(",")}")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_MULTI_ORDER",
+ messageParameters = Map(
+ "orderSpec" -> s"${orderSpec.mkString(",")}"
+ )
+ )
case f: SpecifiedWindowFrame if f.frameType == RangeFrame && f.isValueBound &&
!isValidFrameType(f.valueBoundary.head.dataType) =>
- TypeCheckFailure(
- s"The data type '${orderSpec.head.dataType.catalogString}' used in the order " +
- "specification does not match the data type " +
- s"'${f.valueBoundary.head.dataType.catalogString}' which is used in the range frame.")
+ DataTypeMismatch(
+ errorSubClass = "RANGE_FRAME_INVALID_TYPE",
+ messageParameters = Map(
+ "orderSpecType" -> s"${orderSpec.head.dataType.catalogString}",
Review Comment:
Could you wrap the datatype by toSQLType()
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -215,17 +222,32 @@ case class SpecifiedWindowFrame(
// Check combination (of expressions).
(lower, upper) match {
case (l: Expression, u: Expression) if !isValidFrameBoundary(l, u) =>
- TypeCheckFailure(s"Window frame upper bound '$upper' does not follow the lower bound " +
- s"'$lower'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_INVALID_BOUND",
+ messageParameters = Map(
+ "upper" -> s"$upper",
+ "lower" -> s"${lower}"
Review Comment:
Use toSQLExpr(), please.
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_INVALID_BOUND" : {
+ "message" : [
+ "Window frame upper bound '<upper>' does not follow the lower bound '<lower>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE" : {
+ "message" : [
+ "The data type of the <location> bound '<exprType>' does not match the expected data type '<expectedType>'."
Review Comment:
```suggestion
"The data type of the <location> bound <exprType> does not match the expected data type <expectedType>."
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -215,17 +222,32 @@ case class SpecifiedWindowFrame(
// Check combination (of expressions).
(lower, upper) match {
case (l: Expression, u: Expression) if !isValidFrameBoundary(l, u) =>
- TypeCheckFailure(s"Window frame upper bound '$upper' does not follow the lower bound " +
- s"'$lower'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_INVALID_BOUND",
+ messageParameters = Map(
+ "upper" -> s"$upper",
+ "lower" -> s"${lower}"
+ )
+ )
case (l: SpecialFrameBoundary, _) => TypeCheckSuccess
case (_, u: SpecialFrameBoundary) => TypeCheckSuccess
case (l: Expression, u: Expression) if l.dataType != u.dataType =>
- TypeCheckFailure(
- s"Window frame bounds '$lower' and '$upper' do no not have the same data type: " +
- s"'${l.dataType.catalogString}' <> '${u.dataType.catalogString}'")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_DIFF_TYPES",
+ messageParameters = Map(
+ "lower" -> s"$lower",
+ "upper" -> s"$upper",
+ "lowerType" -> s"${l.dataType.catalogString}",
+ "upperType" -> s"${u.dataType.catalogString}"
Review Comment:
Use toSQLExpr and toSQLType
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -262,11 +284,22 @@ case class SpecifiedWindowFrame(
private def checkBoundary(b: Expression, location: String): TypeCheckResult = b match {
case _: SpecialFrameBoundary => TypeCheckSuccess
case e: Expression if !e.foldable =>
- TypeCheckFailure(s"Window frame $location bound '$e' is not a literal.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "location" -> s"$location",
Review Comment:
```suggestion
"location" -> location,
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/windowExpressions.scala:
##########
@@ -262,11 +284,22 @@ case class SpecifiedWindowFrame(
private def checkBoundary(b: Expression, location: String): TypeCheckResult = b match {
case _: SpecialFrameBoundary => TypeCheckSuccess
case e: Expression if !e.foldable =>
- TypeCheckFailure(s"Window frame $location bound '$e' is not a literal.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE",
+ messageParameters = Map(
+ "location" -> s"$location",
+ "expression" -> s"$e"
+ )
+ )
case e: Expression if !frameType.inputType.acceptsType(e.dataType) =>
- TypeCheckFailure(
- s"The data type of the $location bound '${e.dataType.catalogString}' does not match " +
- s"the expected data type '${frameType.inputType.simpleString}'.")
+ DataTypeMismatch(
+ errorSubClass = "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE",
+ messageParameters = Map(
+ "location" -> s"$location",
Review Comment:
```suggestion
"location" -> location,
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
Review Comment:
```suggestion
"The data type '<orderSpecType>' used in the order specification does not match the data type '<valueBoundaryType>' which is used in the range frame."
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_INVALID_BOUND" : {
+ "message" : [
+ "Window frame upper bound '<upper>' does not follow the lower bound '<lower>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE" : {
+ "message" : [
+ "The data type of the <location> bound '<exprType>' does not match the expected data type '<expectedType>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE" : {
+ "message" : [
+ "Window frame <location> bound '<expression>' is not a literal."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_WRONG_COMPARISON" : {
+ "message" : [
+ "The lower bound of a window frame must be <comparison> to the upper bound"
Review Comment:
```suggestion
"The lower bound of a window frame must be <comparison> to the upper bound."
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
Review Comment:
```suggestion
"Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'."
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
+ ]
+ },
+ "RANGE_FRAME_WITHOUT_ORDER" : {
+ "message" : [
+ "A range window frame cannot be used in an unordered window specification."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_DIFF_TYPES" : {
+ "message" : [
+ "Window frame bounds '<lower>' and '<upper>' do not have the same type: '<lowerType>' <> '<upperType>'"
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_INVALID_BOUND" : {
+ "message" : [
+ "Window frame upper bound '<upper>' does not follow the lower bound '<lower>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_UNACCEPTED_TYPE" : {
+ "message" : [
+ "The data type of the <location> bound '<exprType>' does not match the expected data type '<expectedType>'."
+ ]
+ },
+ "SPECIFIED_WINDOW_FRAME_WITHOUT_FOLDABLE" : {
+ "message" : [
+ "Window frame <location> bound '<expression>' is not a literal."
Review Comment:
```suggestion
"Window frame <location> bound <expression> is not a literal."
```
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -138,11 +143,59 @@
"all arguments must be strings."
]
},
+ "RANGE_FRAME_INVALID_TYPE" : {
+ "message" : [
+ "The data type '<orderSpecType>' used in the order specification does not match ",
+ "the data type '<valueBoundaryType>' which is used in the range frame."
+ ]
+ },
+ "RANGE_FRAME_MULTI_ORDER" : {
+ "message" : [
+ "A range window frame with value boundaries cannot be used in a window specification ",
+ "with multiple order by expressions: <orderSpec>."
Review Comment:
```suggestion
"A range window frame with value boundaries cannot be used in a window specification with multiple order by expressions: <orderSpec>."
```
--
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