Skip to content

[SPARK-55109][SQL] Enhance RaiseError to generate valid SQL #55115

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

Open
felipepessoto wants to merge 2 commits into
base: master
Choose a base branch
from
+25 −0
Open

[SPARK-55109][SQL] Enhance RaiseError to generate valid SQL #55115

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
a31d10f
[SQL] Enhance RaiseError.sql to support valid single-argument form
felipepessoto Mar 30, 2026
c354550
Only emit the single-argument raise_error(msg) SQL when the errorClas…
felipepessoto Apr 2, 2026
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
15 changes: 15 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,21 @@ case class RaiseError(errorClass: Expression, errorParms: Expression, dataType:

override def prettyName: String = "raise_error"

override def sql: String = {
// When constructed from the single-argument form (just an error message string),
// output only the original message to produce valid, roundtrippable SQL.
Copy link
Copy Markdown
Contributor

@cloud-fan cloud-fan Apr 2, 2026

Choose a reason for hiding this comment

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

shall we check the errorClass as well? to be _LEGACY_ERROR_USER_RAISED_EXCEPTION or USER_RAISED_EXCEPTION

Copy link
Copy Markdown
Author

@felipepessoto felipepessoto Apr 2, 2026

Choose a reason for hiding this comment

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

Fixed and tests are re-run:

image

(errorClass, errorParms) match {
case (Literal(cls, _), CreateMap(Seq(Literal(key, _), msg), _))
if cls != null &&
(cls.toString == "USER_RAISED_EXCEPTION" ||
cls.toString == "_LEGACY_ERROR_USER_RAISED_EXCEPTION") &&
key != null && key.toString == "errorMessage" =>
s"$prettyName(${msg.sql})"
case _ =>
super.sql
}
}

override def eval(input: InternalRow): Any = {
val error = errorClass.eval(input).asInstanceOf[UTF8String]
val parms: MapData = errorParms.eval(input).asInstanceOf[MapData]
Expand Down
10 changes: 10 additions & 0 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MiscExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ class MiscExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
)
}

test("SPARK-55109: RaiseError.sql uses single-argument form only for known error classes") {
assert(RaiseError(Literal("error!")).sql === "raise_error('error!')")

// A custom errorClass should NOT produce the single-argument form
val customError = RaiseError(
Literal("CUSTOM_ERROR"),
CreateMap(Seq(Literal("errorMessage"), Literal("error!"))))
assert(customError.sql === "raise_error('CUSTOM_ERROR', map('errorMessage', 'error!'))")
}

test("uuid") {
checkEvaluation(Length(Uuid(Some(0))), 36)
val r = new Random()
Expand Down