You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "shujingyang-db (via GitHub)" <gi...@apache.org> on 2023/11/08 19:50:22 UTC
[PR] [SPARK-45844] Implement case-insensitivity for XML [spark]
shujingyang-db opened a new pull request, #43722:
URL: https://github.com/apache/spark/pull/43722
<!--
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
'core/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.
-->
This PR addresses the current lack of support for case-insensitive schema handling in XML file formats. Our approach now follows the `SQLConf` case insensitivity setting in both schema inference and file read operations.
We handle duplicate keys in the following behavior:
1. When we encounter duplicates (whether case-sensitive or not) in a row, we will convert them into an array and pick the first one we encounter as the array's name.
2. When we encounter duplicates across rows, we will also respect the first one we encounter
We exclude map-type data from case-insensitive key handling for two reasons:
1. MapType does not allow ArrayType elements, which eliminates the possibility of duplicate keys within a row.
2. Keys are string types and are not treated as field names, thereby not requiring case sensitivity checks.
### 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.
4. If you fix a bug, you can clarify why it is a bug.
-->
To keep consistent with other file formats and reduce maintenance efforts.
### 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.
-->
Unit 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-45844] Implement case-insensitivity for XML [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1390575622
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -115,7 +119,8 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
}
}
- def infer(xml: String,
+ def infer(
+ xml: String,
xsdSchema: Option[Schema] = None): Option[DataType] = {
Review Comment:
```suggestion
def infer(xml: String, xsdSchema: Option[Schema] = None): Option[DataType] = {
```
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1390572193
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -50,7 +52,8 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
options.zoneId,
options.locale,
legacyFormat = FAST_DATE_FORMAT,
- isParsing = true)
+ isParsing = true
+ )
Review Comment:
Please revert the change.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -97,20 +100,21 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
* 2. Merge types by choosing the lowest type necessary to cover equal keys
* 3. Replace any remaining null fields with string, the top type
*/
- def infer(xml: RDD[String], caseSensitive: Boolean): StructType = {
+ def infer(xml: RDD[String]): StructType = {
val schemaData = if (options.samplingRatio < 1.0) {
xml.sample(withReplacement = false, options.samplingRatio, 1)
} else {
xml
}
// perform schema inference on each row and merge afterwards
- val rootType = schemaData.mapPartitions { iter =>
- val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
+ val rootType = schemaData
+ .mapPartitions { iter =>
+ val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
- iter.flatMap { xml =>
- infer(xml, caseSensitive, xsdSchema)
+ iter.flatMap { xml =>
Review Comment:
Please revert this line.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -97,20 +100,21 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
* 2. Merge types by choosing the lowest type necessary to cover equal keys
* 3. Replace any remaining null fields with string, the top type
*/
- def infer(xml: RDD[String], caseSensitive: Boolean): StructType = {
+ def infer(xml: RDD[String]): StructType = {
val schemaData = if (options.samplingRatio < 1.0) {
xml.sample(withReplacement = false, options.samplingRatio, 1)
} else {
xml
}
// perform schema inference on each row and merge afterwards
- val rootType = schemaData.mapPartitions { iter =>
- val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
+ val rootType = schemaData
+ .mapPartitions { iter =>
+ val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
Review Comment:
Please revert the three lines.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -97,20 +100,21 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
* 2. Merge types by choosing the lowest type necessary to cover equal keys
* 3. Replace any remaining null fields with string, the top type
*/
- def infer(xml: RDD[String], caseSensitive: Boolean): StructType = {
+ def infer(xml: RDD[String]): StructType = {
val schemaData = if (options.samplingRatio < 1.0) {
xml.sample(withReplacement = false, options.samplingRatio, 1)
} else {
xml
}
// perform schema inference on each row and merge afterwards
- val rootType = schemaData.mapPartitions { iter =>
- val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
+ val rootType = schemaData
+ .mapPartitions { iter =>
+ val xsdSchema = Option(options.rowValidationXSDPath).map(ValidatorUtil.getSchema)
- iter.flatMap { xml =>
- infer(xml, caseSensitive, xsdSchema)
+ iter.flatMap { xml =>
+ infer(xml, xsdSchema)
Review Comment:
two indent.
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1389016848
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlParser.scala:
##########
@@ -274,7 +277,11 @@ class StaxXmlParser(
val convertedValuesMap = collection.mutable.Map.empty[String, Any]
val valuesMap = StaxXmlParserUtils.convertAttributesToValuesMap(attributes, options)
valuesMap.foreach { case (f, v) =>
- val nameToIndex = schema.map(_.name).zipWithIndex.toMap
+ val nameToIndex = if (caseSensitive) {
+ schema.map(_.name).zipWithIndex.toMap
+ } else {
+ CaseInsensitiveMap(schema.map(_.name).zipWithIndex.toMap)
+ }
Review Comment:
+1
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -32,7 +32,12 @@ import scala.util.control.NonFatal
import org.apache.spark.internal.Logging
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.expressions.ExprUtils
-import org.apache.spark.sql.catalyst.util.{DateFormatter, PermissiveMode, TimestampFormatter}
+import org.apache.spark.sql.catalyst.util.{
+ CaseInsensitiveMap,
+ DateFormatter,
+ PermissiveMode,
+ TimestampFormatter
+}
Review Comment:
```suggestion
import org.apache.spark.sql.catalyst.util.{CaseInsensitiveMap, DateFormatter, PermissiveMode, TimestampFormatter}
```
--
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-45844][SQL] Implement case-insensitivity for XML [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #43722:
URL: https://github.com/apache/spark/pull/43722#issuecomment-1809548724
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-45844] Implement case-insensitivity for XML [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1391022479
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -406,10 +443,16 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
}
case (StructType(fields1), StructType(fields2)) =>
- val newFields = (fields1 ++ fields2).groupBy(_.name).map {
- case (name, fieldTypes) =>
+ val newFields = (fields1 ++ fields2)
+ // normalize field name and pair it with original field
+ .map(field => (normalize(field.name), field))
+ .groupBy(_._1) // group by normalized field name
+ .map {
+ case (_: String, fields: Array[(String, StructField)]) =>
Review Comment:
```suggestion
.map { case (_: String, fields: Array[(String, StructField)]) =>
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -406,10 +443,16 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
}
case (StructType(fields1), StructType(fields2)) =>
- val newFields = (fields1 ++ fields2).groupBy(_.name).map {
- case (name, fieldTypes) =>
+ val newFields = (fields1 ++ fields2)
+ // normalize field name and pair it with original field
+ .map(field => (normalize(field.name), field))
+ .groupBy(_._1) // group by normalized field name
+ .map {
+ case (_: String, fields: Array[(String, StructField)]) =>
+ val fieldTypes = fields.map(_._2)
val dataType = fieldTypes.map(_.dataType).reduce(compatibleType)
- StructField(name, dataType, nullable = true)
+ // we pick up the first field name that we've encountered for the field
+ StructField(fields(0)._2.name, dataType)
Review Comment:
```suggestion
StructField(fields.head._2.name, dataType)
```
##########
sql/core/src/test/resources/test-data/xml-resources/attributes-case-sensitive.xml:
##########
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ROWSET>
+ <ROW>
+ <struct attr1="1">1</struct>
+ <array attr2="2">2</array>
+ <array Attr2="3">3</array>
+ <array aTTr2="4">4</array>
Review Comment:
The array element looks confused. cc @sandip-db
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "shujingyang-db (via GitHub)" <gi...@apache.org>.
shujingyang-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1390532119
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -198,30 +207,66 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
*/
private def inferObject(
parser: XMLEventReader,
+ caseSensitive: Boolean,
rootAttributes: Array[Attribute] = Array.empty): DataType = {
val builder = ArrayBuffer[StructField]()
val nameToDataType = collection.mutable.Map.empty[String, ArrayBuffer[DataType]]
+ // Initialize a map to hold field names with case sensitivity based on configuration.
+ // The map is only used in case *insensitive* mode
+ var fieldNames = if (caseSensitive) {
Review Comment:
We synced offline. I replaced it with the tree map. Thanks for the suggestion!
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "sandip-db (via GitHub)" <gi...@apache.org>.
sandip-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1388794901
##########
sql/api/src/main/scala/org/apache/spark/sql/types/StructType.scala:
##########
@@ -588,7 +588,7 @@ object StructType extends AbstractDataType {
.map { case rightField @ StructField(rightName, rightType, rightNullable, _) =>
try {
leftField.copy(
- dataType = merge(leftType, rightType),
+ dataType = merge(leftType, rightType, caseSensitive),
Review Comment:
can this be a separate PR? It would be easy to backport.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -198,30 +207,66 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
*/
private def inferObject(
parser: XMLEventReader,
+ caseSensitive: Boolean,
rootAttributes: Array[Attribute] = Array.empty): DataType = {
val builder = ArrayBuffer[StructField]()
val nameToDataType = collection.mutable.Map.empty[String, ArrayBuffer[DataType]]
+ // Initialize a map to hold field names with case sensitivity based on configuration.
+ // The map is only used in case *insensitive* mode
+ var fieldNames = if (caseSensitive) {
Review Comment:
Instead of using another `Map`, use `TreeMap` or define a new class "`CaseInsensitiveString`" as shown [here](https://stackoverflow.com/questions/8236945/case-insensitive-string-as-hashmap-key).
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/StaxXmlParser.scala:
##########
@@ -274,7 +277,11 @@ class StaxXmlParser(
val convertedValuesMap = collection.mutable.Map.empty[String, Any]
val valuesMap = StaxXmlParserUtils.convertAttributesToValuesMap(attributes, options)
valuesMap.foreach { case (f, v) =>
- val nameToIndex = schema.map(_.name).zipWithIndex.toMap
+ val nameToIndex = if (caseSensitive) {
+ schema.map(_.name).zipWithIndex.toMap
+ } else {
+ CaseInsensitiveMap(schema.map(_.name).zipWithIndex.toMap)
+ }
Review Comment:
Dedup this code by defining a function `getFieldNameToIndex(schema: StructType)`
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -231,21 +276,24 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
nestedBuilder += StructField(options.valueTag, dt, nullable = true)
valuesMap.foreach {
case (f, v) =>
- nestedBuilder += StructField(f, inferFrom(v), nullable = true)
+ nestedBuilder +=
+ StructField(getCaseSensitiveName(f), inferFrom(v), nullable = true)
}
StructType(nestedBuilder.sortBy(_.name).toArray)
case dt: DataType => dt
}
// Add the field and datatypes so that we can check if this is ArrayType.
val field = StaxXmlParserUtils.getName(e.asStartElement.getName, options)
- val dataTypes = nameToDataType.getOrElse(field, ArrayBuffer.empty[DataType])
+ val dataTypes =
+ nameToDataType.getOrElse(getCaseSensitiveName(field), ArrayBuffer.empty[DataType])
dataTypes += inferredType
Review Comment:
Instead of using `ArrayBuffer`, we should be able to call compatibleType here itself. That can be a separate PR.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -92,7 +97,7 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
* 2. Merge types by choosing the lowest type necessary to cover equal keys
* 3. Replace any remaining null fields with string, the top type
*/
- def infer(xml: RDD[String]): StructType = {
+ def infer(xml: RDD[String], caseSensitive: Boolean): StructType = {
Review Comment:
remove caseSensitive argument from all functions and add it to as an arg to class XmlInferSchema instead.
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "sandip-db (via GitHub)" <gi...@apache.org>.
sandip-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1391308502
##########
sql/core/src/test/resources/test-data/xml-resources/attributes-case-sensitive.xml:
##########
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ROWSET>
+ <ROW>
+ <struct attr1="1">1</struct>
+ <array attr2="2">2</array>
+ <array Attr2="3">3</array>
+ <array aTTr2="4">4</array>
Review Comment:
LGTM. Its a valid XML and intended to test case insentivity for attributes.
--
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-45844][SQL] Implement case-insensitivity for XML [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon closed pull request #43722: [SPARK-45844][SQL] Implement case-insensitivity for XML
URL: https://github.com/apache/spark/pull/43722
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "shujingyang-db (via GitHub)" <gi...@apache.org>.
shujingyang-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1389061607
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -198,30 +207,66 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
*/
private def inferObject(
parser: XMLEventReader,
+ caseSensitive: Boolean,
rootAttributes: Array[Attribute] = Array.empty): DataType = {
val builder = ArrayBuffer[StructField]()
val nameToDataType = collection.mutable.Map.empty[String, ArrayBuffer[DataType]]
+ // Initialize a map to hold field names with case sensitivity based on configuration.
+ // The map is only used in case *insensitive* mode
+ var fieldNames = if (caseSensitive) {
Review Comment:
Can you please elaborate on this? I modified the map to make the usage more accurate.
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "sandip-db (via GitHub)" <gi...@apache.org>.
sandip-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1389999737
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -45,7 +47,8 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
options.zoneId,
options.locale,
legacyFormat = FAST_DATE_FORMAT,
- isParsing = true)
+ isParsing = true
+ )
Review Comment:
revert this change
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -200,7 +205,31 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
parser: XMLEventReader,
rootAttributes: Array[Attribute] = Array.empty): DataType = {
val builder = ArrayBuffer[StructField]()
- val nameToDataType = collection.mutable.Map.empty[String, ArrayBuffer[DataType]]
+
+ /**
+ * Retrieves the field name with respect to the case sensitivity setting.
+ * We pick the first name we encountered.
+ *
+ * If case sensitivity is enabled, the original field name is returned.
+ * If not, the field name is managed in a case-insensitive map.
+ *
+ * For instance, if we encounter the following field names:
+ * foo, Foo, FOO
+ *
+ * In case-sensitive mode: we will infer three fields: foo, Foo, FOO
+ * In case-insensitive mode, we will infer an array named by foo
+ * (as it's the first one we encounter)
+ */
+ val caseSensitivityOrdering: Ordering[String] = (x: String, y: String) =>
+ if (caseSensitive) {
+ x.compareTo(y)
+ } else {
+ x.compareToIgnoreCase(y)
Review Comment:
```suggestion
x.compareToIgnoreCase(y)
```
--
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-45844] Implement case-insensitivity for XML [spark]
Posted by "sandip-db (via GitHub)" <gi...@apache.org>.
sandip-db commented on code in PR #43722:
URL: https://github.com/apache/spark/pull/43722#discussion_r1389999737
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/xml/XmlInferSchema.scala:
##########
@@ -45,7 +47,8 @@ private[sql] class XmlInferSchema(options: XmlOptions) extends Serializable with
options.zoneId,
options.locale,
legacyFormat = FAST_DATE_FORMAT,
- isParsing = true)
+ isParsing = true
+ )
Review Comment:
revert this change
--
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