Skip to content

fix: native error message not propagated to SparkException on empty errorClass #3727

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
manuzhang wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −7
Open

fix: native error message not propagated to SparkException on empty errorClass #3727

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
18 changes: 11 additions & 7 deletions spark/src/main/scala/org/apache/comet/SparkErrorConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ import org.apache.comet.exceptions.CometQueryExecutionException
object SparkErrorConverter extends ShimSparkErrorConverter {

implicit val formats: DefaultFormats.type = DefaultFormats
private val UNKNOWN_ERROR = "UNKNOWN_ERROR_TEMP_COMET"

case class QueryContextJson(
private case class QueryContextJson(
sqlText: String,
startIndex: Int,
stopIndex: Int,
Expand All @@ -53,7 +54,7 @@ object SparkErrorConverter extends ShimSparkErrorConverter {
line: Int,
startPosition: Int)

case class ErrorJson(
private case class ErrorJson(
errorType: String,
errorClass: Option[String],
params: Option[Map[String, Any]],
Expand Down Expand Up @@ -83,7 +84,8 @@ object SparkErrorConverter extends ShimSparkErrorConverter {
val json = parse(e.getMessage)
val errorJson = json.extract[ErrorJson]
val params = errorJson.params.getOrElse(Map.empty)
val errorClass = errorJson.errorClass.getOrElse("UNKNOWN_ERROR_TEMP_COMET")
val errorClass =
errorJson.errorClass.map(_.trim).filter(_.nonEmpty).getOrElse(UNKNOWN_ERROR)

// Build Spark SQLQueryContext if context is present (Not all errors carry the query context)
val sparkContext: Array[QueryContext] = errorJson.context match {
Expand Down Expand Up @@ -111,10 +113,12 @@ object SparkErrorConverter extends ShimSparkErrorConverter {

case None =>
// Unknown error type - fallback to generic SparkException
new SparkException(
errorClass = errorClass,
messageParameters = paramsToStringMap(params),
cause = null)
val msgParams = paramsToStringMap(params)
if (errorClass.equals(UNKNOWN_ERROR)) {
new SparkException(msgParams.mkString(", "))
} else {
new SparkException(errorClass = errorClass, messageParameters = msgParams, cause = null)
}
}
}

Expand Down
Loading