Skip to content

[SPARK-52049] Fix the bug that XML attributes can't be parsed as Variant #50840

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 2 commits into from
Closed

[SPARK-52049] Fix the bug that XML attributes can't be parsed as Variant #50840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a869673
draft
xiaonanyang-db May 9, 2025
f3741d8
u
xiaonanyang-db May 9, 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
5 changes: 5 additions & 0 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 @@ -544,6 +544,11 @@ class StaxXmlParser(
case ShortType => castTo(value, ShortType)
case IntegerType => signSafeToInt(value)
case dt: DecimalType => castTo(value, dt)
case VariantType =>
val builder = new VariantBuilder(false)
StaxXmlParser.appendXMLCharacterToVariant(builder, value, options)
val v = builder.result()
new VariantVal(v.getValue, v.getMetadata)
case _ => throw new SparkIllegalArgumentException(
errorClass = "_LEGACY_ERROR_TEMP_3246",
messageParameters = Map("dataType" -> dataType.toString))
Expand Down
11 changes: 9 additions & 2 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 @@ -418,7 +418,9 @@ class XmlVariantSuite extends QueryTest with SharedSparkSession with TestXmlData
val df = createDSLDataFrame(
fileName = "books-complicated.xml",
schemaDDL = Some(
"_id string, author string, title string, " +
"_id variant, " + // Attribute as variant
"author string, " +
"title string, " +
"genre struct<genreid int, name variant>, " + // Struct with variant
"price variant, " + // Scalar as variant
"publish_dates struct<publish_date array<variant>>" // Array with variant
Expand All @@ -427,11 +429,16 @@ class XmlVariantSuite extends QueryTest with SharedSparkSession with TestXmlData
)
checkAnswer(
df.select(
variant_get(col("_id"), "$", "string"),
variant_get(col("genre.name"), "$", "string"),
variant_get(col("price"), "$", "double"),
variant_get(col("publish_dates.publish_date").getItem(0), "$.month", "int")
),
Seq(Row("Computer", 44.95, 10), Row("Fantasy", 5.95, 12), Row("Fantasy", null, 11))
Seq(
Row("bk101", "Computer", 44.95, 10),
Row("bk102", "Fantasy", 5.95, 12),
Row("bk103", "Fantasy", null, 11)
)
)
}

Expand Down