Skip to content

[SPARK-46558][CONNECT] Extract a helper function to eliminate the duplicate code that retrieves MessageParameters from ErrorParams in GrpcExceptionConverter #44554

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
LuciferYang wants to merge 3 commits into from
Closed

[SPARK-46558][CONNECT] Extract a helper function to eliminate the duplicate code that retrieves MessageParameters from ErrorParams in GrpcExceptionConverter #44554

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06dac88
init
LuciferYang Jan 2, 2024
382d85e
for ga
LuciferYang Jan 2, 2024
5884f8e
format
LuciferYang Jan 2, 2024
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
52 changes: 24 additions & 28 deletions ...ct/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,7 @@ private[client] object GrpcExceptionConverter {
errorConstructor(params =>
new AnalysisException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3100"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
cause = params.cause,
context = params.queryContext)),
errorConstructor(params =>
Expand All @@ -227,50 +224,32 @@ private[client] object GrpcExceptionConverter {
errorConstructor[NumberFormatException](params =>
new SparkNumberFormatException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3104"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
params.queryContext)),
errorConstructor[IllegalArgumentException](params =>
new SparkIllegalArgumentException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3105"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
params.queryContext,
cause = params.cause.orNull)),
errorConstructor[ArithmeticException](params =>
new SparkArithmeticException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3106"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
params.queryContext)),
errorConstructor[UnsupportedOperationException](params =>
new SparkUnsupportedOperationException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3107"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
})),
messageParameters = errorParamsToMessageParameters(params))),
errorConstructor[ArrayIndexOutOfBoundsException](params =>
new SparkArrayIndexOutOfBoundsException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3108"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
params.queryContext)),
errorConstructor[DateTimeException](params =>
new SparkDateTimeException(
errorClass = params.errorClass.getOrElse("_LEGACY_ERROR_TEMP_3109"),
messageParameters = params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
},
messageParameters = errorParamsToMessageParameters(params),
params.queryContext)),
errorConstructor(params =>
new SparkRuntimeException(
Expand Down Expand Up @@ -389,4 +368,21 @@ private[client] object GrpcExceptionConverter {

errorsToThrowable(0, Seq(builder.build()))
}

/**
* This method is used to convert error parameters to message parameters.
*
* @param params
* The error parameters to be converted.
* @return
* A Map of message parameters. If the error class is defined in the params, it returns the
* message parameters from the params. If the error class is not defined, it returns a new Map
* with a single entry where the key is "message" and the value is the message from the
* params.
*/
private def errorParamsToMessageParameters(params: ErrorParams): Map[String, String] =
params.errorClass match {
case Some(_) => params.messageParameters
case None => Map("message" -> params.message)
}
}