Skip to content

[SPARK-18950][SQL] Report conflicting fields when merging two StructTypes #16365

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
jiayue-zhang wants to merge 4 commits into from
Closed

[SPARK-18950][SQL] Report conflicting fields when merging two StructTypes #16365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bc9f8a
[SPARK-18950][SQL] Report conflicting fields when merging two StructT…
jiayue-zhang Dec 20, 2016
54a898f
Add test for merge conflict message.
jiayue-zhang Jul 24, 2017
f500a11
JAVA try catch and test whole error message.
jiayue-zhang Jul 31, 2017
f4892c9
Fix scala style check
jiayue-zhang Jul 31, 2017
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
15 changes: 11 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.types

import scala.collection.mutable.ArrayBuffer
import scala.util.control.NonFatal
import scala.util.Try

import org.json4s.JsonDSL._
Expand Down Expand Up @@ -468,10 +469,16 @@ object StructType extends AbstractDataType {
leftFields.foreach {
case leftField @ StructField(leftName, leftType, leftNullable, _) =>
rightMapped.get(leftName)
.map { case rightField @ StructField(_, rightType, rightNullable, _) =>
leftField.copy(
dataType = merge(leftType, rightType),
nullable = leftNullable || rightNullable)
.map { case rightField @ StructField(rightName, rightType, rightNullable, _) =>
try {
leftField.copy(
dataType = merge(leftType, rightType),
nullable = leftNullable || rightNullable)
} catch {
case NonFatal(e) =>
throw new SparkException(s"Failed to merge fields '$leftName' and " +
s"'$rightName'. " + e.getMessage)
}
}
.orElse {
optionalMeta.putBoolean(metadataKeyForOptionalField, value = true)
Expand Down
6 changes: 4 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,11 @@ class DataTypeSuite extends SparkFunSuite {
val right = StructType(
StructField("b", LongType) :: Nil)

intercept[SparkException] {
val message = intercept[SparkException] {
left.merge(right)
}
}.getMessage
assert(message.equals("Failed to merge fields 'b' and 'b'. " +
"Failed to merge incompatible data types FloatType and LongType"))
}

test("existsRecursively") {
Expand Down