MaxGekk commented on code in PR #41252:
URL: https://github.com/apache/spark/pull/41252#discussion_r1200543805
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala:
##########
@@ -85,26 +85,28 @@ trait CheckAnalysis extends PredicateHelper with
LookupCatalog with QueryErrorsB
private def checkLimitLikeClause(name: String, limitExpr: Expression): Unit
= {
limitExpr match {
case e if !e.foldable => limitExpr.failAnalysis(
- errorClass = "LIMIT_LIKE_EXPRESSION_IS_UNFOLDABLE",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.IS_UNFOLDABLE",
messageParameters = Map(
"name" -> name,
- "limitExpr" -> toSQLExpr(limitExpr)))
+ "expr" -> toSQLExpr(limitExpr)))
case e if e.dataType != IntegerType => limitExpr.failAnalysis(
- errorClass = "_LEGACY_ERROR_TEMP_2401",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.DATA_TYPE",
messageParameters = Map(
"name" -> name,
+ "expr" -> toSQLExpr(limitExpr),
"dataType" -> e.dataType.catalogString))
Review Comment:
Please, wrap it by `toSQLType()`
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala:
##########
@@ -85,26 +85,28 @@ trait CheckAnalysis extends PredicateHelper with
LookupCatalog with QueryErrorsB
private def checkLimitLikeClause(name: String, limitExpr: Expression): Unit
= {
limitExpr match {
case e if !e.foldable => limitExpr.failAnalysis(
- errorClass = "LIMIT_LIKE_EXPRESSION_IS_UNFOLDABLE",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.IS_UNFOLDABLE",
messageParameters = Map(
"name" -> name,
- "limitExpr" -> toSQLExpr(limitExpr)))
+ "expr" -> toSQLExpr(limitExpr)))
case e if e.dataType != IntegerType => limitExpr.failAnalysis(
- errorClass = "_LEGACY_ERROR_TEMP_2401",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.DATA_TYPE",
messageParameters = Map(
"name" -> name,
+ "expr" -> toSQLExpr(limitExpr),
"dataType" -> e.dataType.catalogString))
case e =>
e.eval() match {
case null => limitExpr.failAnalysis(
- errorClass = "_LEGACY_ERROR_TEMP_2402",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.IS_NULL",
messageParameters = Map(
"name" -> name,
- "limitExpr" -> limitExpr.sql))
+ "expr" -> toSQLExpr(limitExpr)))
case v: Int if v < 0 => limitExpr.failAnalysis(
- errorClass = "_LEGACY_ERROR_TEMP_2403",
+ errorClass = "INVALID_LIMIT_LIKE_EXPRESSION.IS_NEGATIVE",
messageParameters = Map(
"name" -> name,
+ "expr" -> toSQLExpr(limitExpr),
"v" -> v.toString))
Review Comment:
Wrap it by `toSQLValue(v, IntegerType)`
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisErrorSuite.scala:
##########
@@ -653,7 +654,8 @@ class AnalysisErrorSuite extends AnalysisTest {
errorTest(
Review Comment:
The same, please, use `errorClassTest`.
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisErrorSuite.scala:
##########
@@ -629,7 +629,8 @@ class AnalysisErrorSuite extends AnalysisTest {
errorTest(
Review Comment:
Could you migrate the test onto `errorClassTest()`
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
