Skip to content

[SPARK-40856][SQL] Update the error template of WRONG_NUM_PARAMS #38319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
panbingkun wants to merge 2 commits into from
+27 −5
Closed

[SPARK-40856][SQL] Update the error template of WRONG_NUM_PARAMS #38319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8eabc4
[SPARK-40856][SQL] Update the error template of WRONG_NUM_PARAMS
panbingkun Oct 20, 2022
e04d1c2
[SPARK-40856][SQL] Update the error template of WRONG_NUM_PARAMS
panbingkun Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/resources/error/error-classes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
},
"WRONG_NUM_PARAMS" : {
"message" : [
"wrong number of parameters: <actualNum>."
"The <functionName> requires <expectedNum> parameters but the actual number is <actualNum>."
]
}
}
Expand Down
5 changes: 4 additions & 1 deletion ...st/src/main/scala/org/apache/spark/sql/catalyst/expressions/CallMethodViaReflection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ case class CallMethodViaReflection(children: Seq[Expression])
if (children.size < 2) {
DataTypeMismatch(
errorSubClass = "WRONG_NUM_PARAMS",
messageParameters = Map("actualNum" -> children.length.toString))
messageParameters = Map(
"functionName" -> prettyName,
"expectedNum" -> "> 1",
"actualNum" -> children.length.toString))
} else {
val unexpectedParameter = children.zipWithIndex.collectFirst {
case (e, 0) if !(e.dataType == StringType && e.foldable) =>
Expand Down
10 changes: 8 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,10 @@ case class Least(children: Seq[Expression]) extends ComplexTypeMergingExpression
if (children.length <= 1) {
DataTypeMismatch(
errorSubClass = "WRONG_NUM_PARAMS",
messageParameters = Map("actualNum" -> children.length.toString))
messageParameters = Map(
"functionName" -> prettyName,
"expectedNum" -> "> 1",
"actualNum" -> children.length.toString))
} else if (!TypeCoercion.haveSameType(inputTypesForMerging)) {
DataTypeMismatch(
errorSubClass = "DATA_DIFF_TYPES",
Expand Down Expand Up @@ -1290,7 +1293,10 @@ case class Greatest(children: Seq[Expression]) extends ComplexTypeMergingExpress
if (children.length <= 1) {
DataTypeMismatch(
errorSubClass = "WRONG_NUM_PARAMS",
messageParameters = Map("actualNum" -> children.length.toString))
messageParameters = Map(
"functionName" -> prettyName,
"expectedNum" -> "> 1",
"actualNum" -> children.length.toString))
} else if (!TypeCoercion.haveSameType(inputTypesForMerging)) {
DataTypeMismatch(
errorSubClass = "DATA_DIFF_TYPES",
Expand Down
5 changes: 4 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,10 @@ case class JsonTuple(children: Seq[Expression])
if (children.length < 2) {
DataTypeMismatch(
errorSubClass = "WRONG_NUM_PARAMS",
messageParameters = Map("actualNum" -> children.length.toString))
messageParameters = Map(
"functionName" -> prettyName,
"expectedNum" -> "> 1",
"actualNum" -> children.length.toString))
} else if (children.forall(child => StringType.acceptsType(child.dataType))) {
TypeCheckResult.TypeCheckSuccess
} else {
Expand Down
2 changes: 2 additions & 0 deletions ...t/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@ class ExpressionTypeCheckingSuite extends SparkFunSuite with SQLHelper with Quer
expr = expr1,
messageParameters = Map(
"sqlExpr" -> toSQLExpr(expr1),
"functionName" -> expr1.prettyName,
"expectedNum" -> "> 1",
"actualNum" -> "1")
)

Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4237,6 +4237,8 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
sqlState = None,
parameters = Map(
"sqlExpr" -> "\"greatest()\"",
"functionName" -> "greatest",
"expectedNum" -> "> 1",
"actualNum" -> "0")
)

Expand All @@ -4248,6 +4250,8 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
sqlState = None,
parameters = Map(
"sqlExpr" -> "\"greatest()\"",
"functionName" -> "greatest",
"expectedNum" -> "> 1",
"actualNum" -> "0"),
context = ExpectedContext(
fragment = "greatest()",
Expand All @@ -4263,6 +4267,8 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
sqlState = None,
parameters = Map(
"sqlExpr" -> "\"least()\"",
"functionName" -> "least",
"expectedNum" -> "> 1",
"actualNum" -> "0")
)

Expand All @@ -4274,6 +4280,8 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSparkSession {
sqlState = None,
parameters = Map(
"sqlExpr" -> "\"least()\"",
"functionName" -> "least",
"expectedNum" -> "> 1",
"actualNum" -> "0"),
context = ExpectedContext(
fragment = "least()",
Expand Down