Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ object FunctionRegistryBase {
.filter(_.getParameterTypes.forall(_ == classOf[Expression]))
.map(_.getParameterCount).distinct.sorted
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
validParametersCount, name, params.length)
expressions,
validParametersCount,
name,
params.length)
}
try {
f.newInstance(expressions : _*).asInstanceOf[T]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ object TryAverageExpressionBuilder extends ExpressionBuilder {
if (numArgs == 1) {
Average(expressions.head, EvalMode.TRY)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(1, 2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(1, 2), funcName, numArgs)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ object TrySumExpressionBuilder extends ExpressionBuilder {
if (numArgs == 1) {
Sum(expressions.head, EvalMode.TRY)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(1, 2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(1, 2), funcName, numArgs)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ object CurDateExpressionBuilder extends ExpressionBuilder {
CurrentDate()
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
Seq.empty, funcName, expressions.length)
expressions, Seq.empty, funcName, expressions.length)
}
}
}
Expand Down Expand Up @@ -1143,7 +1143,8 @@ object ParseToTimestampNTZExpressionBuilder extends ExpressionBuilder {
if (numArgs == 1 || numArgs == 2) {
ParseToTimestamp(expressions(0), expressions.drop(1).lastOption, TimestampNTZType)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(1, 2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(1, 2), funcName, numArgs)
}
}
}
Expand Down Expand Up @@ -1180,7 +1181,8 @@ object ParseToTimestampLTZExpressionBuilder extends ExpressionBuilder {
if (numArgs == 1 || numArgs == 2) {
ParseToTimestamp(expressions(0), expressions.drop(1).lastOption, TimestampType)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(1, 2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(1, 2), funcName, numArgs)
}
}
}
Expand Down Expand Up @@ -1224,7 +1226,8 @@ object TryToTimestampExpressionBuilder extends ExpressionBuilder {
SQLConf.get.timestampType,
failOnError = false)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(1, 2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(1, 2), funcName, numArgs)
}
}
}
Expand Down Expand Up @@ -2518,7 +2521,8 @@ object MakeTimestampNTZExpressionBuilder extends ExpressionBuilder {
expressions(5),
dataType = TimestampNTZType)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(6), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(6), funcName, numArgs)
}
}
}
Expand Down Expand Up @@ -2566,7 +2570,8 @@ object MakeTimestampLTZExpressionBuilder extends ExpressionBuilder {
expressions.drop(6).lastOption,
dataType = TimestampType)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(6), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(6), funcName, numArgs)
}
}
}
Expand Down Expand Up @@ -2837,7 +2842,8 @@ object DatePartExpressionBuilder extends ExpressionBuilder {
val source = expressions(1)
Extract(field, source, Extract.createExpr(funcName, field, source))
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(2), funcName, numArgs)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ trait CeilFloorExpressionBuilderBase extends ExpressionBuilder {
}
buildWithTwoParams(expressions(0), scale)
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(2), funcName, numArgs)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,8 @@ trait StringBinaryPredicateExpressionBuilderBase extends ExpressionBuilder {
createStringPredicate(expressions(0), expressions(1))
}
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(2), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(2), funcName, numArgs)
}
}

Expand Down Expand Up @@ -1518,7 +1519,8 @@ trait PadExpressionBuilderBase extends ExpressionBuilder {
createStringPad(expressions(0), expressions(1), expressions(2))
}
} else {
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(Seq(2, 3), funcName, numArgs)
throw QueryCompilationErrors.invalidFunctionArgumentNumberError(
expressions, Seq(2, 3), funcName, numArgs)
}
}

Expand Down Expand Up @@ -2451,7 +2453,8 @@ object Decode {
def createExpr(params: Seq[Expression]): Expression = {
params.length match {
case 0 | 1 =>
throw QueryCompilationErrors.invalidFunctionArgumentsError("decode", "2", params.length)
throw QueryCompilationErrors.invalidFunctionArgumentsError(
params, "decode", "2", params.length)
case 2 => StringDecode(params.head, params.last)
case _ =>
val input = params.head
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,17 +637,21 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase {
}

def invalidFunctionArgumentsError(
name: String, expectedNum: String, actualNum: Int): Throwable = {
sqlExpr: Seq[Expression], name: String, expectedNum: String, actualNum: Int): Throwable = {
new AnalysisException(
errorClass = "WRONG_NUM_ARGS",
messageParameters = Map(
"sqlExpr" -> sqlExpr.map(toSQLExpr(_)).mkString(","),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed anymore. Could you remove it, please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, seems like it's duplicated to #38707 ?

Can we just close this ticket ?

"functionName" -> toSQLId(name),
"expectedNum" -> expectedNum,
"actualNum" -> actualNum.toString))
}

def invalidFunctionArgumentNumberError(
validParametersCount: Seq[Int], name: String, actualNumber: Int): Throwable = {
sqlExpr: Seq[Expression],
validParametersCount: Seq[Int],
name: String,
actualNumber: Int): Throwable = {
if (validParametersCount.length == 0) {
new AnalysisException(
errorClass = "_LEGACY_ERROR_TEMP_1043",
Expand All @@ -658,7 +662,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase {
} else {
validParametersCount.mkString("[", ", ", "]")
}
invalidFunctionArgumentsError(name, expectedNumberOfParameters, actualNumber)
invalidFunctionArgumentsError(sqlExpr, name, expectedNumberOfParameters, actualNumber)
}
}

Expand Down
Loading