MaxGekk commented on code in PR #38664:
URL: https://github.com/apache/spark/pull/38664#discussion_r1030185866
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala:
##########
@@ -637,17 +637,24 @@ private[sql] object QueryCompilationErrors extends
QueryErrorsBase {
}
def invalidFunctionArgumentsError(
- name: String, expectedInfo: String, actualNumber: Int): Throwable = {
+ sqlExpr: Seq[Expression],
+ name: String,
+ expectedInfo: String,
+ actualNumber: Int): Throwable = {
new AnalysisException(
- errorClass = "_LEGACY_ERROR_TEMP_1042",
+ errorClass = "DATATYPE_MISMATCH.WRONG_NUM_ARGS",
messageParameters = Map(
- "name" -> name,
- "expectedInfo" -> expectedInfo,
- "actualNumber" -> actualNumber.toString))
+ "sqlExpr" -> sqlExpr.map(toPrettySQL(_)).mkString(","),
+ "functionName" -> name,
Review Comment:
Add quoting by `toSQLId()`
##########
sql/core/src/test/resources/sql-tests/results/ansi/string-functions.sql.out:
##########
@@ -791,11 +791,12 @@ struct<>
-- !query output
org.apache.spark.sql.AnalysisException
{
- "errorClass" : "_LEGACY_ERROR_TEMP_1042",
+ "errorClass" : "DATATYPE_MISMATCH.WRONG_NUM_ARGS",
"messageParameters" : {
- "actualNumber" : "0",
- "expectedInfo" : "2",
- "name" : "decode"
+ "actualNum" : "0",
+ "expectedNum" : "2",
+ "functionName" : "decode",
Review Comment:
The function name should be quoted.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala:
##########
@@ -637,17 +637,24 @@ private[sql] object QueryCompilationErrors extends
QueryErrorsBase {
}
def invalidFunctionArgumentsError(
- name: String, expectedInfo: String, actualNumber: Int): Throwable = {
+ sqlExpr: Seq[Expression],
+ name: String,
+ expectedInfo: String,
+ actualNumber: Int): Throwable = {
new AnalysisException(
- errorClass = "_LEGACY_ERROR_TEMP_1042",
+ errorClass = "DATATYPE_MISMATCH.WRONG_NUM_ARGS",
messageParameters = Map(
- "name" -> name,
- "expectedInfo" -> expectedInfo,
- "actualNumber" -> actualNumber.toString))
+ "sqlExpr" -> sqlExpr.map(toPrettySQL(_)).mkString(","),
Review Comment:
Could you invoke `toSQLExpr()` instead of `toPrettySQL()`, please. Take a
look at the other exceptions in the file.
--
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]
