This is an automated email from the ASF dual-hosted git repository.
uros-b pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new 5dbd2fd77e65 [SPARK-58585][SQL] Extract a helper for
INVALID_EXTERNAL_VALUE errors in CatalystTypeConverters
5dbd2fd77e65 is described below
commit 5dbd2fd77e65f41efb3bac5e0c96aaff23191a72
Author: Uros Bojanic <[email protected]>
AuthorDate: Thu Aug 6 09:53:13 2026 +0000
[SPARK-58585][SQL] Extract a helper for INVALID_EXTERNAL_VALUE errors in
CatalystTypeConverters
### What changes were proposed in this pull request?
Extracts a private helper `throwInvalidExternalValue(value, dataType):
Nothing` in `CatalystTypeConverters` and routes the eight byte-identical
`INVALID_EXTERNAL_VALUE` throw sites through it.
### Why are the changes needed?
The eight throw blocks were identical apart from the trailing `dataType`
argument, so the same six lines were repeated eight times. Factoring them into
one helper removes about 31 lines of duplication with no behavior change: the
same error class and the same three message parameters (`other`, `otherClass`,
`dataType`) are produced, and the `Nothing` return type keeps every match arm's
result type unchanged.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Behavior-preserving refactor. Existing conversion tests, which assert the
error condition and its parameters via `checkError`, cover these paths. No new
tests needed.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.8)
Closes #57786 from uros-b/helper-invalid-external-value.
Authored-by: Uros Bojanic <[email protected]>
Signed-off-by: Uros Bojanic <[email protected]>
(cherry picked from commit c5f06a31c24f411badb1027b0ffb27f95a5e8090)
Signed-off-by: Uros Bojanic <[email protected]>
---
.../sql/catalyst/CatalystTypeConverters.scala | 65 ++++++----------------
1 file changed, 17 insertions(+), 48 deletions(-)
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
index 97804d1e8463..cab367b4badf 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
+++
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
@@ -61,6 +61,15 @@ object CatalystTypeConverters {
}
}
+ private def throwInvalidExternalValue(value: Any, dataType: String): Nothing
= {
+ throw new SparkIllegalArgumentException(
+ errorClass = "INVALID_EXTERNAL_VALUE",
+ messageParameters = scala.collection.immutable.Map(
+ "other" -> value.toString,
+ "otherClass" -> value.getClass.getCanonicalName,
+ "dataType" -> dataType))
+ }
+
private def getConverterForType(dataType: DataType):
CatalystTypeConverter[Any, Any, Any] = {
TypeUtils.failUnsupportedDataType(dataType, SQLConf.get)
TypeOps(dataType)
@@ -296,12 +305,7 @@ object CatalystTypeConverters {
idx += 1
}
new GenericInternalRow(ar)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> structType.catalogString))
+ case other => throwInvalidExternalValue(other, structType.catalogString)
}
override def toScala(row: InternalRow): Row = {
@@ -355,12 +359,7 @@ object CatalystTypeConverters {
case utf8: UTF8String => utf8
case chr: Char => UTF8String.fromString(chr.toString)
case ac: Array[Char] => UTF8String.fromString(String.valueOf(ac))
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> StringType.sql))
+ case other => throwInvalidExternalValue(other, StringType.sql)
}
override def toScala(catalystValue: UTF8String): String =
if (catalystValue == null) null else catalystValue.toString
@@ -381,12 +380,7 @@ object CatalystTypeConverters {
override def toCatalystImpl(scalaValue: Any): BinaryView = scalaValue
match {
case g: org.apache.spark.sql.types.Geometry if
SQLConf.get.geospatialEnabled =>
STUtils.serializeGeomFromWKB(g, dataType)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> StringType.sql))
+ case other => throwInvalidExternalValue(other, StringType.sql)
}
override def toScala(catalystValue: BinaryView):
org.apache.spark.sql.types.Geometry = {
assertGeospatialEnabled()
@@ -406,12 +400,7 @@ object CatalystTypeConverters {
override def toCatalystImpl(scalaValue: Any): BinaryView = scalaValue
match {
case g: org.apache.spark.sql.types.Geography if
SQLConf.get.geospatialEnabled =>
STUtils.serializeGeogFromWKB(g, dataType)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> StringType.sql))
+ case other => throwInvalidExternalValue(other, StringType.sql)
}
override def toScala(catalystValue: BinaryView):
org.apache.spark.sql.types.Geography = {
assertGeospatialEnabled()
@@ -430,12 +419,7 @@ object CatalystTypeConverters {
override def toCatalystImpl(scalaValue: Any): Int = scalaValue match {
case d: Date => DateTimeUtils.fromJavaDate(d)
case l: LocalDate => DateTimeUtils.localDateToDays(l)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> DateType.sql))
+ case other => throwInvalidExternalValue(other, DateType.sql)
}
override def toScala(catalystValue: Any): Date =
if (catalystValue == null) null else
DateTimeUtils.toJavaDate(catalystValue.asInstanceOf[Int])
@@ -470,12 +454,7 @@ object CatalystTypeConverters {
override def toCatalystImpl(scalaValue: Any): Long = scalaValue match {
case t: Timestamp => DateTimeUtils.fromJavaTimestamp(t)
case i: Instant => DateTimeUtils.instantToMicros(i)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> TimestampType.sql))
+ case other => throwInvalidExternalValue(other, TimestampType.sql)
}
override def toScala(catalystValue: Any): Timestamp =
if (catalystValue == null) null
@@ -498,12 +477,7 @@ object CatalystTypeConverters {
extends CatalystTypeConverter[Any, LocalDateTime, Any] {
override def toCatalystImpl(scalaValue: Any): Any = scalaValue match {
case l: LocalDateTime => DateTimeUtils.localDateTimeToMicros(l)
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> TimestampNTZType.sql))
+ case other => throwInvalidExternalValue(other, TimestampNTZType.sql)
}
override def toScala(catalystValue: Any): LocalDateTime =
@@ -525,12 +499,7 @@ object CatalystTypeConverters {
case d: JavaBigDecimal => Decimal(d)
case d: JavaBigInteger => Decimal(d)
case d: Decimal => d
- case other => throw new SparkIllegalArgumentException(
- errorClass = "INVALID_EXTERNAL_VALUE",
- messageParameters = scala.collection.immutable.Map(
- "other" -> other.toString,
- "otherClass" -> other.getClass.getCanonicalName,
- "dataType" -> dataType.catalogString))
+ case other => throwInvalidExternalValue(other, dataType.catalogString)
}
decimal.toPrecision(dataType.precision, dataType.scale,
Decimal.ROUND_HALF_UP, nullOnOverflow)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
