[SPARK-46848] XML: Enhance XML bad record handling with partial results support #44875
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sandip-db
suggested changes
Jan 25, 2024
| try { | ||
| kvPairs += (key -> convertTo(c.getData, valueType)) | ||
| } catch { | ||
| case partialValueException: PartialValueException => |
There was a problem hiding this comment.
convertTo is not going to throw PartialValueException
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Outdated
Show resolved
Hide resolved
|
|
||
| test("return partial results for bad records") { | ||
| withTempDir { dir => | ||
| val xmlBadRecord1 = |
There was a problem hiding this comment.
Add a scenario with nested struct object with attributes and valueTag:
Correct data:
<ROW><struct attr=3.0>4.0<b>5.0</b><struct></ROW>
XML data with mismatches:
<ROW><struct attr=mismatch1>4.0<b>5.0</b><struct></ROW>
<ROW><struct attr=3.0>mismatch2<b>5.0</b><struct></ROW>
<ROW><struct attr=3.0>4.0<b>mismatch3</b><struct></ROW>
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlParser.scala
Outdated
Show resolved
Hide resolved
| @@ -429,6 +451,7 @@ class StaxXmlParser( | |||
| case e: SparkUpgradeException => throw e | |||
| case NonFatal(e) => | |||
| badRecordException = badRecordException.orElse(Some(e)) | |||
| StaxXmlParserUtils.skipChildren(parser) | |||
There was a problem hiding this comment.
Will this skip valid entities?
There was a problem hiding this comment.
It will not. It only skip the inner elements.
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Outdated
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Outdated
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
Outdated
Show resolved
Hide resolved
…StaxXmlParser.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlParser.scala # sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
…rces/xml/XmlSuite.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
…rces/xml/XmlSuite.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
…rces/xml/XmlSuite.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
…rces/xml/XmlSuite.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
…rces/xml/XmlSuite.scala Co-authored-by: Sandip Agarwala <131817656+sandip-db@users.noreply.github.com>
sandip-db
reviewed
Jan 26, 2024
| case (f, v) => | ||
| nameToIndex.get(f).foreach { row(_) = v } | ||
| try { | ||
| convertAttributes(rootAttributes, schema).toSeq.foreach { |
There was a problem hiding this comment.
If the first attribute has type mismatch, convertAttributes will drop the subsequent ones.
| row.update(index, partialValueException.partialResult) | ||
| } | ||
|
|
||
|
|
|
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Enhance XML bad record handling with partial results support
Why are the changes needed?
Otherwise, we will get an empty result if the parser throws an exception
Does this PR introduce any user-facing change?
Yes
How was this patch tested?
Unit tests
Was this patch authored or co-authored using generative AI tooling?
No