[SPARK-45562][SQL] XML: Make 'rowTag' a required option #43389
Closed
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
HyukjinKwon
approved these changes
Oct 17, 2023
… is not needed for from_xml/schema_of_xml.
|
Merged to master. |
beliefer
reviewed
Oct 17, 2023
| @@ -82,7 +82,7 @@ private Path getEmptyTempDir() throws IOException { | |||
| public void testXmlParser() { | |||
| Map<String, String> options = new HashMap<>(); | |||
| options.put("rowTag", booksFileTag); | |||
| Dataset<Row> df = spark.read().options(options).format("xml").load(booksFile); | |||
| Dataset<Row> df = spark.read().options(options).xml(booksFile); | |||
There was a problem hiding this comment.
Switched to shortened version for better code readability.
There was a problem hiding this comment.
Because this change is not related to the theme, it is not recommended to modify it. But it does simplify the code a bit and is also OK.
| @@ -92,7 +92,7 @@ public void testXmlParser() { | |||
| public void testLoad() { | |||
| Map<String, String> options = new HashMap<>(); | |||
| options.put("rowTag", booksFileTag); | |||
| Dataset<Row> df = spark.read().options(options).format("xml").load(booksFile); | |||
| Dataset<Row> df = spark.read().options(options).xml(booksFile); | |||
HyukjinKwon
pushed a commit
that referenced
this pull request
Oct 19, 2023
…sensitive ### What changes were proposed in this pull request? [PR 43389](#43389) made `rowTag` option required for XML read and write. However, the option check was done in a case sensitive manner. This PR makes the check case-insensitive. ### Why are the changes needed? Options are case-insensitive. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Unit test. ### Was this patch authored or co-authored using generative AI tooling? No Closes #43416 from sandip-db/xml-rowTagCaseInsensitive. Authored-by: Sandip Agarwala <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
HyukjinKwon
pushed a commit
that referenced
this pull request
Oct 20, 2023
…ption ### What changes were proposed in this pull request? #43389 makes `rowTag` a required option. But the xml API (please see https://github.com/apache/spark/blob/7057952f6bc2c5cf97dd408effd1b18bee1cb8f4/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala#L579C1-L579C1) is unrelated to `rowTag`. This PR also improves some code and remove one line of unused code. ### Why are the changes needed? Restore test case not require `rowTag` option. ### Does this PR introduce _any_ user-facing change? 'No'. ### How was this patch tested? Exists test cases. ### Was this patch authored or co-authored using generative AI tooling? 'No'. Closes #43455 from beliefer/SPARK-45562_followup. Authored-by: Jiaan Geng <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
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?
User can specify
rowTagoption that is the name of the XML element that maps to aDataFrame Row. A non-existentrowTagwill not infer any schema or generate anyDataFramerows. Currently, not specifyingrowTagoption results in picking up its default value ofROW, which won't match a real XML element in most scenarios. This results in an empty dataframe and confuse new users.This PR makes
rowTaga required option for both read and write. XML built-in functions (from_xml/schema_of_xml) ignorerowTagoption.Why are the changes needed?
See above
Does this PR introduce any user-facing change?
No
How was this patch tested?
New unit tests
Was this patch authored or co-authored using generative AI tooling?
No