Skip to content

[SPARK-28143][SQL] Expressions without proper constructors should throw AnalysisException #24947

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
yaooqinn wants to merge 5 commits into from
Closed

[SPARK-28143][SQL] Expressions without proper constructors should throw AnalysisException #24947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4af96a1
[SPARK-28143][SQL]IN expression missing attribute should throw analys…
yaooqinn Jun 24, 2019
9ca1990
bring back filter logic and and an or condition
yaooqinn Jun 24, 2019
15c67d6
if valid paras count == 0
yaooqinn Jun 25, 2019
30ef47e
unified err msg
yaooqinn Jun 25, 2019
a0363de
add some hints when the registered function is defined wrong or misused
yaooqinn Jul 26, 2019
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
23 changes: 16 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,14 +580,23 @@ object FunctionRegistry {
// Otherwise, find a constructor method that matches the number of arguments, and use that.
val params = Seq.fill(expressions.size)(classOf[Expression])
val f = constructors.find(_.getParameterTypes.toSeq == params).getOrElse {
val validParametersCount = constructors
.filter(_.getParameterTypes.forall(_ == classOf[Expression]))
.map(_.getParameterCount).distinct.sorted
val expectedNumberOfParameters = if (validParametersCount.length == 1) {
validParametersCount.head.toString
val (validParameters, invalidParameters) = constructors
.partition(_.getParameterTypes.forall(_ == classOf[Expression]))
val validParametersCount = validParameters.map(_.getParameterCount).distinct.sorted

def getExpectedNumberOfParameters(parametersCount: Array[Int]): String = {
if (parametersCount.length == 1) {
parametersCount.head.toString
} else {
parametersCount.init.mkString("one of ", ", ", " and ") + parametersCount.last
}
}
val expectedNumberOfParameters = if (validParametersCount.isEmpty) {
val invalidParametersCount = invalidParameters.map(_.getParameterCount).distinct.sorted
getExpectedNumberOfParameters(invalidParametersCount) +
"(But none is valid, please check whether it is properly defined or misused)"
} else {
validParametersCount.init.mkString("one of ", ", ", " and ") +
validParametersCount.last
getExpectedNumberOfParameters(validParametersCount)
}
throw new AnalysisException(s"Invalid number of arguments for function $name. " +
s"Expected: $expectedNumberOfParameters; Found: ${params.length}")
Expand Down
7 changes: 7 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
checkKeywordsExist(sql("describe functioN abcadf"), "Function: abcadf not found.")
}

test("SPARK-28143: IN expression missing attribute should throw analysis exception") {
// missing attribute, which actually might be `select 1 where a in ()`
val query = "select 1 where in ()"
val e = intercept[AnalysisException](sql(query))
assert(e.getMessage.startsWith("Invalid number of arguments for function in"))
}

test("SPARK-14415: All functions should have own descriptions") {
for (f <- spark.sessionState.functionRegistry.listFunction()) {
if (!Seq("cube", "grouping", "grouping_id", "rollup", "window").contains(f.unquotedString)) {
Expand Down