Skip to content

[SPARK-54099][SQL] XML variant parser should fall back to string on decimal parsing errors #52801

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
wants to merge 4 commits into from
+33 −12
Closed

[SPARK-54099][SQL] XML variant parser should fall back to string on decimal parsing errors #52801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edc3885
draft
xiaonanyang-db Oct 30, 2025
28c63e5
add space
xiaonanyang-db Oct 30, 2025
ecf4a1f
address comments
xiaonanyang-db Oct 31, 2025
85e3ac3
address comments
xiaonanyang-db Oct 31, 2025
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
25 changes: 13 additions & 12 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,18 +1278,19 @@ object StaxXmlParser {

// Try parsing the value as decimal
val decimalParser = ExprUtils.getDecimalParser(options.locale)
Copy link
Contributor

@sandip-db sandip-db Oct 31, 2025

Choose a reason for hiding this comment

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

Unrelated to the issue at hand, decimalParser should be reused rather than initializing for every value.
Can the caller pass it instead?

Copy link
Contributor Author

@xiaonanyang-db xiaonanyang-db Oct 31, 2025

Choose a reason for hiding this comment

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

We may have had this conversation in the original PR. Yes, we can, but we need to change a few function signatures. We can improve it later.

allCatch opt decimalParser(value) match {
case Some(decimalValue) =>
var d = decimalValue
if (d.scale() < 0) {
d = d.setScale(0)
}
if (d.scale <= VariantUtil.MAX_DECIMAL16_PRECISION &&
d.precision <= VariantUtil.MAX_DECIMAL16_PRECISION) {
builder.appendDecimal(d)
return
}
case _ =>
try {
var d = decimalParser(value)
if (d.scale() < 0) {
d = d.setScale(0)
}
if (d.scale <= VariantUtil.MAX_DECIMAL16_PRECISION &&
d.precision <= VariantUtil.MAX_DECIMAL16_PRECISION) {
builder.appendDecimal(d)
return
}
} catch {
case NonFatal(_) =>
// Ignore the exception and parse it as a string below
}

// If the character is of other primitive types, parse it as a string
Expand Down
20 changes: 20 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlVariantSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,26 @@ class XmlVariantSuite extends QueryTest with SharedSparkSession with TestXmlData
.map(_.getString(0).replaceAll("\\s+", ""))
assert(xmlResult.head === xmlStr)
}

test(
"[SPARK-54099] XML variant parser should fall back to string " +
"when failing to parse decimal values"
) {
// Decimals with extreme exponents. The variant parser should throw ArithmeticException when
// parsing these values as Decimal:
val decimalString = Seq(
"1E+2147483647", // Maximum int exponent - scale would be -2147483647
"5E+1000000000", // 1 billion exponent
"1.23E+999999999", // Very large exponent
"0.001E+2147483640" // Still results in huge effective exponent
)
decimalString.foreach { str =>
testParser(
xml = s"<ROW><decimal>$str</decimal></ROW>",
expectedJsonStr = s"""{"decimal":"$str"}"""
)
}
}
}

class XmlVariantSuiteWithLegacyParser extends XmlVariantSuite {
Expand Down