Skip to content

[SPARK-48662][SQL] Fix StructsToXml expression with collations #47053

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
mihailomilosevic2001 wants to merge 9 commits into from
Closed

[SPARK-48662][SQL] Fix StructsToXml expression with collations #47053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d54453e
Fix OracleIntegrationSuite for JDK8
mihailomilosevic2001 May 30, 2024
7d00764
Revert "Fix OracleIntegrationSuite for JDK8"
mihailomilosevic2001 May 30, 2024
ad01ff9
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 4, 2024
1592c78
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 11, 2024
7fe2a4d
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 14, 2024
8e811d4
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 15, 2024
7586b5f
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 18, 2024
92ac42b
Merge remote-tracking branch 'upstream/master'
mihailomilosevic2001 Jun 20, 2024
b96eb86
Fix to_xml
mihailomilosevic2001 Jun 21, 2024
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
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ class StaxXmlGenerator(

def writeElement(dt: DataType, v: Any, options: XmlOptions): Unit = (dt, v) match {
case (_, null) | (NullType, _) => gen.writeCharacters(options.nullValue)
case (StringType, v: UTF8String) => gen.writeCharacters(v.toString)
case (StringType, v: String) => gen.writeCharacters(v)
case (_: StringType, v: UTF8String) => gen.writeCharacters(v.toString)
case (_: StringType, v: String) => gen.writeCharacters(v)
case (TimestampType, v: Timestamp) =>
gen.writeCharacters(timestampFormatter.format(v.toInstant()))
case (TimestampType, v: Long) =>
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,16 @@ class CollationSQLExpressionsSuite
| <A>true</A>
| <B>2.0</B>
|</ROW>""".stripMargin),
StructsToXmlTestCase("named_struct('A', 'aa', 'B', 'bb')", "UTF8_LCASE",
s"""<ROW>
| <A>aa</A>
| <B>bb</B>
|</ROW>""".stripMargin),
StructsToXmlTestCase("named_struct('A', 'aa', 'B', 'bb')", "UTF8_BINARY",
s"""<ROW>
| <A>aa</A>
| <B>bb</B>
|</ROW>""".stripMargin),
StructsToXmlTestCase("named_struct()", "UNICODE",
"<ROW/>"),
StructsToXmlTestCase("named_struct('time', to_timestamp('2015-08-26'))", "UNICODE_CI",
Expand Down