LuciferYang commented on code in PR #39625:
URL: https://github.com/apache/spark/pull/39625#discussion_r1073058711
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala:
##########
@@ -657,29 +657,38 @@ private[sql] object QueryCompilationErrors extends
QueryErrorsBase {
origin = context)
}
- def invalidFunctionArgumentsError(
- name: String, expectedNum: String, actualNum: Int): Throwable = {
- new AnalysisException(
- errorClass = "WRONG_NUM_ARGS.WITH_SUGGESTION",
- messageParameters = Map(
- "functionName" -> toSQLId(name),
- "expectedNum" -> expectedNum,
- "actualNum" -> actualNum.toString))
- }
-
- def invalidFunctionArgumentNumberError(
- validParametersCount: Seq[Int], name: String, actualNumber: Int):
Throwable = {
- if (validParametersCount.isEmpty) {
+ def wrongNumArgsError(
+ name: String,
+ validParametersCount: Seq[Any],
+ actualNumber: Int,
+ legacyNum: String = "",
+ legacyConfKey: String = "",
+ legacyConfValue: String = ""): Throwable = {
+ val expectedNumberOfParameters = if (validParametersCount.isEmpty) {
+ "0"
+ } else if (validParametersCount.length == 1) {
+ validParametersCount.head.toString
+ } else {
+ validParametersCount.mkString("[", ", ", "]")
+ }
+ if (legacyNum.isEmpty) {
new AnalysisException(
errorClass = "WRONG_NUM_ARGS.WITHOUT_SUGGESTION",
- messageParameters = Map("functionName" -> toSQLId(name)))
+ messageParameters = Map(
+ "functionName" -> toSQLId(name),
+ "expectedNum" -> expectedNumberOfParameters,
+ "actualNum" -> actualNumber.toString))
} else {
- val expectedNumberOfParameters = if (validParametersCount.length == 1) {
- validParametersCount.head.toString
- } else {
- validParametersCount.mkString("[", ", ", "]")
- }
- invalidFunctionArgumentsError(name, expectedNumberOfParameters,
actualNumber)
+ new AnalysisException(
+ errorClass = "WRONG_NUM_ARGS.WITH_SUGGESTION",
+ messageParameters = Map(
+ "functionName" -> toSQLId(name),
+ "expectedNum" -> expectedNumberOfParameters,
+ "actualNum" -> actualNumber.toString,
+ "legacyNum" -> legacyNum.toString,
Review Comment:
`legacyNum`, `legacyConfKey`, `legacyConfValue` called redundant `toString`
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -1719,7 +1708,7 @@
},
"WRONG_NUM_ARGS" : {
"message" : [
- "Invalid number of arguments for the function <functionName>."
+ "The <functionName> requires <expectedNum> parameters but the actual
number is <actualNum>."
Review Comment:
`DATATYPE_MISMATCH` will print
```
"Cannot resolve <sqlExpr> due to data type mismatch:"
```
Is it unnecessary here?
##########
core/src/main/resources/error/error-classes.json:
##########
@@ -1719,7 +1708,7 @@
},
"WRONG_NUM_ARGS" : {
"message" : [
- "Invalid number of arguments for the function <functionName>."
+ "The <functionName> requires <expectedNum> parameters but the actual
number is <actualNum>."
],
"subClass" : {
"WITHOUT_SUGGESTION" : {
Review Comment:
I think the error class name `WRONG_ NUM_ ARGS.WITHOUT_ SUGGESTION` is not
very accurate after this pr because `expectedNum` and `actualNum` have been
pointed out in the message。
--
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]
