You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "yhosny (via GitHub)" <gi...@apache.org> on 2024/03/08 19:02:32 UTC
[PR] [SPARK-47330][SQL] XML: Added XmlExpressionsSuite [spark]
yhosny opened a new pull request, #45445:
URL: https://github.com/apache/spark/pull/45445
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Replicated JsonExpressionsSuite to XmlExpressionsSuite for additional XML unit test coverage .
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Improve XML Expressions unit testing coverage.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Uni tests.
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47330][SQL][TESTS] XML: Added XmlExpressionsSuite [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon closed pull request #45445: [SPARK-47330][SQL][TESTS] XML: Added XmlExpressionsSuite
URL: https://github.com/apache/spark/pull/45445
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47330][SQL][TESTS] XML: Added XmlExpressionsSuite [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #45445:
URL: https://github.com/apache/spark/pull/45445#issuecomment-2008569121
Merged to master.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47330][SQL][TESTS] XML: Added XmlExpressionsSuite [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #45445:
URL: https://github.com/apache/spark/pull/45445#issuecomment-2005315851
@sandip-db does it LG to you?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47330][SQL][TESTS] XML: Added XmlExpressionsSuite [spark]
Posted by "sandip-db (via GitHub)" <gi...@apache.org>.
sandip-db commented on code in PR #45445:
URL: https://github.com/apache/spark/pull/45445#discussion_r1529478176
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/XmlExpressionsSuite.scala:
##########
@@ -0,0 +1,463 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions
+
+import java.text.{DecimalFormat, DecimalFormatSymbols, SimpleDateFormat}
+import java.util.{Calendar, Locale, TimeZone}
+
+import org.scalatest.exceptions.TestFailedException
+
+import org.apache.spark.{SparkException, SparkFunSuite}
+import org.apache.spark.sql.{AnalysisException, Row}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection
+import org.apache.spark.sql.catalyst.plans.PlanTestBase
+import org.apache.spark.sql.catalyst.util._
+import org.apache.spark.sql.catalyst.util.DateTimeTestUtils.{PST, UTC, UTC_OPT}
+import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
+
+class XmlExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with PlanTestBase {
+ test("from_xml escaping") {
+ val schema = StructType(StructField("\"quote", IntegerType) :: Nil)
+ GenerateUnsafeProjection.generate(
+ XmlToStructs(schema, Map.empty, Literal("\"quote"), UTC_OPT) :: Nil)
+ }
+
+ test("from_xml") {
+ val xmlData = """<row><a>1</a></row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(1)
+ )
+ }
+
+ test("from_xml- invalid data") {
+ val xmlData = """<row><a>1</row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+
+ val exception = intercept[TestFailedException] {
+ checkEvaluation(
+ XmlToStructs(schema, Map("mode" -> FailFastMode.name), Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+ }.getCause
+ checkError(
+ exception = exception.asInstanceOf[SparkException],
+ errorClass = "MALFORMED_RECORD_IN_PARSING.WITHOUT_SUGGESTION",
+ parameters = Map("badRecord" -> "[null]", "failFastMode" -> "FAILFAST")
+ )
+ }
+
+ test("from_xml - input=array, schema=array, output=row of array") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1, 2))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=single element, schema=array, output=array of single element") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty row, schema=array, output=empty") {
+ val input = "<row> </row>"
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty, schema=array, output=empty") {
+ val input = """<?xml version="1.0"?>"""
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=array, schema=struct, output=single row") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val corrupted = "corrupted"
+ val schema = new StructType().add("a", IntegerType).add(corrupted, StringType)
+ val output = InternalRow(2, null)
+ val options = Map("columnNameOfCorruptRecord" -> corrupted)
+ checkEvaluation(XmlToStructs(schema, options, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty array, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty object, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(JsonToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml null input column") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(null, StringType), UTC_OPT),
+ null
+ )
+ }
+
+ test("from_xml with timestamp") {
+ val schema = StructType(StructField("t", TimestampType) :: Nil)
+ val xmlData1 = s"""
+ |<row>
+ | <t>2016-01-01T00:00:00.123Z</t>
+ |</row>""".stripMargin
+ var c = Calendar.getInstance(TimeZone.getTimeZone(UTC))
+ c.set(2016, 0, 1, 0, 0, 0)
+ c.set(Calendar.MILLISECOND, 123)
+
+
+ // The result doesn't change because the xml string includes timezone string ("Z" here),
+ // which means the string represents the timestamp string in the timezone regardless of
+ // the timeZoneId parameter.
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(xmlData1, StringType), UTC_OPT),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+
+ val xmlData2 = s"""
+ |<row>
+ | <t>2016-01-01T00:00:00</t>
+ |</row>""".stripMargin
+ for (zid <- DateTimeTestUtils.outstandingZoneIds) {
+ c = Calendar.getInstance(TimeZone.getTimeZone(zid))
+ c.set(2016, 0, 1, 0, 0, 0)
+ c.set(Calendar.MILLISECOND, 0)
+
+ checkEvaluation(
+ XmlToStructs(
+ schema,
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss"),
+ Literal.create(xmlData2, StringType),
+ Option(zid.getId)),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+ checkEvaluation(
+ XmlToStructs(
+ schema,
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss",
+ DateTimeUtils.TIMEZONE_OPTION -> zid.getId),
+ Literal.create(xmlData2, StringType),
+ UTC_OPT),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+ }
+ }
+
+ test("from_xml empty input column") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(" ", StringType), UTC_OPT),
+ InternalRow(null)
+ )
+ }
+
+ test("to_xml escaping") {
+ val schema = StructType(StructField("\"quote", IntegerType) :: Nil)
+ val struct = Literal.create(create_row(1), schema)
+ GenerateUnsafeProjection.generate(
+ StructsToXml(Map.empty, struct, UTC_OPT) :: Nil)
+ }
+
+ test("to_xml - struct") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val struct = Literal.create(create_row(1), schema)
+ checkEvaluation(
+ StructsToXml(Map.empty, struct, UTC_OPT),
+ s"""|<ROW>
+ | <a>1</a>
+ |</ROW>""".stripMargin
+ )
+ }
+
+ test("to_xml - array") {
+ val inputSchema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val input = Row(Array(1, 2))
+ val output = s"""|<ROW>
+ | <a>1</a>
+ | <a>2</a>
+ |</ROW>""".stripMargin
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("to_xml - row with empty array") {
+ val inputSchema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val input = Row(Array(null))
+ val output = """<ROW/>""" // yhosny: self closing empty row?
Review Comment:
```suggestion
val output = """<ROW/>"""
```
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/XmlExpressionsSuite.scala:
##########
@@ -0,0 +1,463 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions
+
+import java.text.{DecimalFormat, DecimalFormatSymbols, SimpleDateFormat}
+import java.util.{Calendar, Locale, TimeZone}
+
+import org.scalatest.exceptions.TestFailedException
+
+import org.apache.spark.{SparkException, SparkFunSuite}
+import org.apache.spark.sql.{AnalysisException, Row}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection
+import org.apache.spark.sql.catalyst.plans.PlanTestBase
+import org.apache.spark.sql.catalyst.util._
+import org.apache.spark.sql.catalyst.util.DateTimeTestUtils.{PST, UTC, UTC_OPT}
+import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
+
+class XmlExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with PlanTestBase {
+ test("from_xml escaping") {
+ val schema = StructType(StructField("\"quote", IntegerType) :: Nil)
+ GenerateUnsafeProjection.generate(
+ XmlToStructs(schema, Map.empty, Literal("\"quote"), UTC_OPT) :: Nil)
+ }
+
+ test("from_xml") {
+ val xmlData = """<row><a>1</a></row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(1)
+ )
+ }
+
+ test("from_xml- invalid data") {
+ val xmlData = """<row><a>1</row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+
+ val exception = intercept[TestFailedException] {
+ checkEvaluation(
+ XmlToStructs(schema, Map("mode" -> FailFastMode.name), Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+ }.getCause
+ checkError(
+ exception = exception.asInstanceOf[SparkException],
+ errorClass = "MALFORMED_RECORD_IN_PARSING.WITHOUT_SUGGESTION",
+ parameters = Map("badRecord" -> "[null]", "failFastMode" -> "FAILFAST")
+ )
+ }
+
+ test("from_xml - input=array, schema=array, output=row of array") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1, 2))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=single element, schema=array, output=array of single element") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty row, schema=array, output=empty") {
+ val input = "<row> </row>"
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty, schema=array, output=empty") {
+ val input = """<?xml version="1.0"?>"""
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=array, schema=struct, output=single row") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val corrupted = "corrupted"
+ val schema = new StructType().add("a", IntegerType).add(corrupted, StringType)
+ val output = InternalRow(2, null)
+ val options = Map("columnNameOfCorruptRecord" -> corrupted)
+ checkEvaluation(XmlToStructs(schema, options, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty array, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty object, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(JsonToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
Review Comment:
```suggestion
checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
```
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/XmlExpressionsSuite.scala:
##########
@@ -0,0 +1,463 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions
+
+import java.text.{DecimalFormat, DecimalFormatSymbols, SimpleDateFormat}
+import java.util.{Calendar, Locale, TimeZone}
+
+import org.scalatest.exceptions.TestFailedException
+
+import org.apache.spark.{SparkException, SparkFunSuite}
+import org.apache.spark.sql.{AnalysisException, Row}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection
+import org.apache.spark.sql.catalyst.plans.PlanTestBase
+import org.apache.spark.sql.catalyst.util._
+import org.apache.spark.sql.catalyst.util.DateTimeTestUtils.{PST, UTC, UTC_OPT}
+import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
+
+class XmlExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with PlanTestBase {
+ test("from_xml escaping") {
+ val schema = StructType(StructField("\"quote", IntegerType) :: Nil)
+ GenerateUnsafeProjection.generate(
+ XmlToStructs(schema, Map.empty, Literal("\"quote"), UTC_OPT) :: Nil)
+ }
+
+ test("from_xml") {
+ val xmlData = """<row><a>1</a></row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(1)
+ )
+ }
+
+ test("from_xml- invalid data") {
+ val xmlData = """<row><a>1</row>"""
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+
+ val exception = intercept[TestFailedException] {
+ checkEvaluation(
+ XmlToStructs(schema, Map("mode" -> FailFastMode.name), Literal(xmlData), UTC_OPT),
+ InternalRow(null)
+ )
+ }.getCause
+ checkError(
+ exception = exception.asInstanceOf[SparkException],
+ errorClass = "MALFORMED_RECORD_IN_PARSING.WITHOUT_SUGGESTION",
+ parameters = Map("badRecord" -> "[null]", "failFastMode" -> "FAILFAST")
+ )
+ }
+
+ test("from_xml - input=array, schema=array, output=row of array") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1, 2))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=single element, schema=array, output=array of single element") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(Array(1))
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty row, schema=array, output=empty") {
+ val input = "<row> </row>"
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty, schema=array, output=empty") {
+ val input = """<?xml version="1.0"?>"""
+ val schema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val output = Row(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=array, schema=struct, output=single row") {
+ val input = s"""
+ |<row>
+ | <a>1</a>
+ | <a>2</a>
+ |</row>""".stripMargin
+ val corrupted = "corrupted"
+ val schema = new StructType().add("a", IntegerType).add(corrupted, StringType)
+ val output = InternalRow(2, null)
+ val options = Map("columnNameOfCorruptRecord" -> corrupted)
+ checkEvaluation(XmlToStructs(schema, options, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty array, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(XmlToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml - input=empty object, schema=struct, output=single row with null") {
+ val input = s"""
+ |<row>
+ | <a></a>
+ | <a></a>
+ |</row>""".stripMargin
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val output = InternalRow(null)
+ checkEvaluation(JsonToStructs(schema, Map.empty, Literal(input), UTC_OPT), output)
+ }
+
+ test("from_xml null input column") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(null, StringType), UTC_OPT),
+ null
+ )
+ }
+
+ test("from_xml with timestamp") {
+ val schema = StructType(StructField("t", TimestampType) :: Nil)
+ val xmlData1 = s"""
+ |<row>
+ | <t>2016-01-01T00:00:00.123Z</t>
+ |</row>""".stripMargin
+ var c = Calendar.getInstance(TimeZone.getTimeZone(UTC))
+ c.set(2016, 0, 1, 0, 0, 0)
+ c.set(Calendar.MILLISECOND, 123)
+
+
+ // The result doesn't change because the xml string includes timezone string ("Z" here),
+ // which means the string represents the timestamp string in the timezone regardless of
+ // the timeZoneId parameter.
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(xmlData1, StringType), UTC_OPT),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+
+ val xmlData2 = s"""
+ |<row>
+ | <t>2016-01-01T00:00:00</t>
+ |</row>""".stripMargin
+ for (zid <- DateTimeTestUtils.outstandingZoneIds) {
+ c = Calendar.getInstance(TimeZone.getTimeZone(zid))
+ c.set(2016, 0, 1, 0, 0, 0)
+ c.set(Calendar.MILLISECOND, 0)
+
+ checkEvaluation(
+ XmlToStructs(
+ schema,
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss"),
+ Literal.create(xmlData2, StringType),
+ Option(zid.getId)),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+ checkEvaluation(
+ XmlToStructs(
+ schema,
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss",
+ DateTimeUtils.TIMEZONE_OPTION -> zid.getId),
+ Literal.create(xmlData2, StringType),
+ UTC_OPT),
+ InternalRow(c.getTimeInMillis * 1000L)
+ )
+ }
+ }
+
+ test("from_xml empty input column") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ checkEvaluation(
+ XmlToStructs(schema, Map.empty, Literal.create(" ", StringType), UTC_OPT),
+ InternalRow(null)
+ )
+ }
+
+ test("to_xml escaping") {
+ val schema = StructType(StructField("\"quote", IntegerType) :: Nil)
+ val struct = Literal.create(create_row(1), schema)
+ GenerateUnsafeProjection.generate(
+ StructsToXml(Map.empty, struct, UTC_OPT) :: Nil)
+ }
+
+ test("to_xml - struct") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val struct = Literal.create(create_row(1), schema)
+ checkEvaluation(
+ StructsToXml(Map.empty, struct, UTC_OPT),
+ s"""|<ROW>
+ | <a>1</a>
+ |</ROW>""".stripMargin
+ )
+ }
+
+ test("to_xml - array") {
+ val inputSchema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val input = Row(Array(1, 2))
+ val output = s"""|<ROW>
+ | <a>1</a>
+ | <a>2</a>
+ |</ROW>""".stripMargin
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("to_xml - row with empty array") {
+ val inputSchema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val input = Row(Array(null))
+ val output = """<ROW/>""" // yhosny: self closing empty row?
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("to_xml - empty row") {
+ val inputSchema = StructType(StructField("a", ArrayType(IntegerType)) :: Nil)
+ val input = Row(null)
+ val output = """<ROW/>"""
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("to_xml null input column") {
+ val schema = StructType(StructField("a", IntegerType) :: Nil)
+ val struct = Literal.create(null, schema)
+ checkEvaluation(
+ StructsToXml(Map.empty, struct, UTC_OPT),
+ null
+ )
+ }
+
+ test("to_xml with timestamp") {
+ val schema = StructType(StructField("t", TimestampType) :: Nil)
+ val c = Calendar.getInstance(TimeZone.getTimeZone(UTC))
+ c.set(2016, 0, 1, 0, 0, 0)
+ c.set(Calendar.MILLISECOND, 0)
+ val struct = Literal.create(create_row(c.getTimeInMillis * 1000L), schema)
+
+ checkEvaluation(
+ StructsToXml(Map.empty, struct, UTC_OPT),
+ s"""|<ROW>
+ | <t>2016-01-01T00:00:00.000Z</t>
+ |</ROW>""".stripMargin
+ )
+ checkEvaluation(
+ StructsToXml(Map.empty, struct, Option(PST.getId)),
+ s"""|<ROW>
+ | <t>2015-12-31T16:00:00.000-08:00</t>
+ |</ROW>""".stripMargin
+ )
+
+ checkEvaluation(
+ StructsToXml(
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss",
+ DateTimeUtils.TIMEZONE_OPTION -> UTC_OPT.get),
+ struct,
+ UTC_OPT),
+ s"""|<ROW>
+ | <t>2016-01-01T00:00:00</t>
+ |</ROW>""".stripMargin
+ )
+ checkEvaluation(
+ StructsToXml(
+ Map("timestampFormat" -> "yyyy-MM-dd'T'HH:mm:ss",
+ DateTimeUtils.TIMEZONE_OPTION -> PST.getId),
+ struct,
+ UTC_OPT),
+ s"""|<ROW>
+ | <t>2015-12-31T16:00:00</t>
+ |</ROW>""".stripMargin
+ )
+ }
+
+ test("to_xml - row with array of maps") {
+ val inputSchema = StructType(
+ StructField("f", ArrayType(MapType(StringType, IntegerType))) :: Nil)
+ val input = Row(Array(Map("a" -> 1), Map("a" -> 2)))
+ val output = s"""|<ROW>
+ | <f>
+ | <a>1</a>
+ | </f>
+ | <f>
+ | <a>2</a>
+ | </f>
+ |</ROW>""".stripMargin
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("to_xml - row with single map") {
+ val inputSchema = StructType(StructField("f", MapType(StringType, IntegerType)) :: Nil)
+ val input = Row(Map("a" -> 1))
+ val output = s"""|<ROW>
+ | <f>
+ | <a>1</a>
+ | </f>
+ |</ROW>""".stripMargin
+ checkEvaluation(
+ StructsToXml(Map.empty, Literal.create(input, inputSchema), UTC_OPT),
+ output)
+ }
+
+ test("from/to xml - interval support") {
Review Comment:
remove this test as CalendarIntervalType is not supported yet.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org