make double boolean miss in jsonRDD compatibleType

tresata-opensource · Sep 4, 2014 · ef6f986 · ef6f986
1 parent c619f0a
commit ef6f986
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/json/JsonRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/json/JsonRDD.scala
@@ -135,7 +135,7 @@ private[sql] object JsonRDD extends Logging {
     if (returnType.isDefined) {
       returnType.get
     } else {
-      // t1 or t2 is a StructType, ArrayType, or an unexpected type.
+      // t1 or t2 is a StructType, ArrayType, BooleanType, or an unexpected type.
       (t1, t2) match {
         case (other: DataType, NullType) => other
         case (NullType, other: DataType) => other
@@ -155,6 +155,7 @@ private[sql] object JsonRDD extends Logging {
           ArrayType(compatibleType(elementType1, elementType2), containsNull1 || containsNull2)
         // TODO: We should use JsonObjectStringType to mark that values of field will be
         // strings and every string is a Json object.
+        case (BooleanType, BooleanType) => BooleanType
         case (_, _) => StringType
       }
     }