Fix udts.

apache · Jul 11, 2018 · db254e5 · db254e5
1 parent 2ab025f
commit db254e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercion.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercion.scala
@@ -169,12 +169,6 @@ object TypeCoercion {
           }
         case _ => None
       }
-    case (udt1: UserDefinedType[_], udt2: UserDefinedType[_]) =>
-      findTypeFunc(udt1.sqlType, udt2.sqlType)
-    case (udt1: UserDefinedType[_], _) =>
-      findTypeFunc(udt1.sqlType, t2)
-    case (_, udt2: UserDefinedType[_]) =>
-      findTypeFunc(t1, udt2.sqlType)
     case _ => None
   }
 

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
@@ -186,7 +186,7 @@ object Literal {
     case map: MapType => create(Map(), map)
     case struct: StructType =>
       create(InternalRow.fromSeq(struct.fields.map(f => default(f.dataType).value)), struct)
-    case udt: UserDefinedType[_] => default(udt.sqlType)
+    case udt: UserDefinedType[_] => Literal(default(udt.sqlType).value, udt)
     case other =>
       throw new RuntimeException(s"no default for type $dataType")
   }