Skip to content

[SPARK-39923][SQL] Multiple query contexts in Spark exceptions #37343

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
MaxGekk wants to merge 6 commits into from
Closed

[SPARK-39923][SQL] Multiple query contexts in Spark exceptions #37343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e44620e
Put QueryContext to array instead of Option
MaxGekk Jul 29, 2022
ed83552
Use classOf
MaxGekk Jul 29, 2022
4b347c7
Pass null to QueryExecutionErrors
MaxGekk Jul 30, 2022
18f09b9
null -> Array.empty
MaxGekk Jul 30, 2022
cdacf14
Invoke getContextOrNullCode
MaxGekk Jul 30, 2022
b926386
Replace null by Array.empty
MaxGekk Aug 1, 2022
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
28 changes: 14 additions & 14 deletions core/src/main/scala/org/apache/spark/SparkException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private[spark] class SparkArithmeticException(
errorClass: String,
errorSubClass: Option[String] = None,
messageParameters: Array[String],
context: Option[QueryContext],
context: Array[QueryContext],
summary: String)
extends ArithmeticException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary))
Expand All @@ -128,7 +128,7 @@ private[spark] class SparkArithmeticException(
override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand Down Expand Up @@ -195,7 +195,7 @@ private[spark] class SparkDateTimeException(
errorClass: String,
errorSubClass: Option[String] = None,
messageParameters: Array[String],
context: Option[QueryContext],
context: Array[QueryContext],
summary: String)
extends DateTimeException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary))
Expand All @@ -204,7 +204,7 @@ private[spark] class SparkDateTimeException(
override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand Down Expand Up @@ -244,7 +244,7 @@ private[spark] class SparkNumberFormatException(
errorClass: String,
errorSubClass: Option[String] = None,
messageParameters: Array[String],
context: Option[QueryContext],
context: Array[QueryContext],
summary: String)
extends NumberFormatException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary))
Expand All @@ -253,7 +253,7 @@ private[spark] class SparkNumberFormatException(
override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand Down Expand Up @@ -323,7 +323,7 @@ private[spark] class SparkRuntimeException(
errorSubClass: Option[String] = None,
messageParameters: Array[String],
cause: Throwable = null,
context: Option[QueryContext] = None,
context: Array[QueryContext] = Array.empty,
summary: String = "")
extends RuntimeException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary),
Expand All @@ -334,7 +334,7 @@ private[spark] class SparkRuntimeException(
errorSubClass: String,
messageParameters: Array[String],
cause: Throwable,
context: Option[QueryContext])
context: Array[QueryContext])
= this(errorClass = errorClass,
errorSubClass = Some(errorSubClass),
messageParameters = messageParameters,
Expand All @@ -348,12 +348,12 @@ private[spark] class SparkRuntimeException(
errorSubClass = Some(errorSubClass),
messageParameters = messageParameters,
cause = null,
context = None)
context = Array.empty[QueryContext])

override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand All @@ -379,7 +379,7 @@ private[spark] class SparkArrayIndexOutOfBoundsException(
errorClass: String,
errorSubClass: Option[String] = None,
messageParameters: Array[String],
context: Option[QueryContext],
context: Array[QueryContext],
summary: String)
extends ArrayIndexOutOfBoundsException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary))
Expand All @@ -388,7 +388,7 @@ private[spark] class SparkArrayIndexOutOfBoundsException(
override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand Down Expand Up @@ -420,7 +420,7 @@ private[spark] class SparkNoSuchElementException(
errorClass: String,
errorSubClass: Option[String] = None,
messageParameters: Array[String],
context: Option[QueryContext],
context: Array[QueryContext],
summary: String)
extends NoSuchElementException(
SparkThrowableHelper.getMessage(errorClass, errorSubClass.orNull, messageParameters, summary))
Expand All @@ -429,7 +429,7 @@ private[spark] class SparkNoSuchElementException(
override def getMessageParameters: Array[String] = messageParameters
override def getErrorClass: String = errorClass
override def getErrorSubClass: String = errorSubClass.orNull
override def getQueryContext: Array[QueryContext] = context.toArray
override def getQueryContext: Array[QueryContext] = context
}

/**
Expand Down
Loading