Skip to content

[SPARK-56862][SQL] Preserve SQL UDF call-site origin in input Cast for runtime error context #55980

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
mikhailnik-db wants to merge 1 commit into from
Closed

[SPARK-56862][SQL] Preserve SQL UDF call-site origin in input Cast for runtime error context #55980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2650,18 +2650,23 @@ class Analyzer(
// unresolved.
!f.inputs.exists(_.containsPattern(LATERAL_COLUMN_ALIAS_REFERENCE)) =>
withPosition(f) {
val plan = resolve(f)
// Extract the function input project list from the SQL function plan and
// inline the SQL function expression.
plan match {
case Project(body :: Nil, Project(aliases, _: OneRowRelation)) =>
val inputs = aliases.map(stripOuterReference)
projectList ++= inputs
SQLScalarFunction(f.function, inputs.map(_.toAttribute), body)
case o =>
throw new AnalysisException(
errorClass = "INVALID_SQL_FUNCTION_PLAN_STRUCTURE",
messageParameters = Map("plan" -> o.toString))
// Set CurrentOrigin to the SQL function call site so that input-binding
// Casts constructed inside makeSQLFunctionPlan capture the call-site
// position in their queryContext snapshot (see Cast.initQueryContext).
withOrigin(f.origin) {
val plan = resolve(f)
// Extract the function input project list from the SQL function plan and
// inline the SQL function expression.
plan match {
case Project(body :: Nil, Project(aliases, _: OneRowRelation)) =>
val inputs = aliases.map(stripOuterReference)
projectList ++= inputs
SQLScalarFunction(f.function, inputs.map(_.toAttribute), body)
case o =>
throw new AnalysisException(
errorClass = "INVALID_SQL_FUNCTION_PLAN_STRUCTURE",
messageParameters = Map("plan" -> o.toString))
}
}
}
case o => o.mapChildren(rewriteSQLFunctions(_, projectList))
Expand Down
32 changes: 24 additions & 8 deletions sql/core/src/test/resources/sql-tests/results/sql-udf.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,9 @@ org.apache.spark.SparkException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 14,
"fragment" : "foo51()"
} ]
}

Expand Down Expand Up @@ -956,7 +958,9 @@ org.apache.spark.SparkRuntimeException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 24,
"fragment" : "foo9a('Nonsense')"
} ]
}

Expand Down Expand Up @@ -1209,7 +1213,9 @@ org.apache.spark.SparkArithmeticException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 17,
"fragment" : "foo9f(999)"
} ]
}

Expand All @@ -1232,7 +1238,9 @@ org.apache.spark.SparkArithmeticException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 21,
"fragment" : "foo9f(999 + 1)"
} ]
}

Expand Down Expand Up @@ -1271,7 +1279,9 @@ org.apache.spark.SparkNumberFormatException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 26,
"fragment" : "foo9g('hello', '7')"
} ]
}

Expand All @@ -1294,7 +1304,9 @@ org.apache.spark.SparkNumberFormatException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 25,
"fragment" : "foo9g(123.23, 'q')"
} ]
}

Expand Down Expand Up @@ -1333,7 +1345,9 @@ org.apache.spark.SparkNumberFormatException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 26,
"fragment" : "foo9h('hello', '7')"
} ]
}

Expand All @@ -1356,7 +1370,9 @@ org.apache.spark.SparkNumberFormatException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"fragment" : ""
"startIndex" : 8,
"stopIndex" : 25,
"fragment" : "foo9h(123.23, 'q')"
} ]
}

Expand Down