replace IntegerType with NumericType

apache · Aug 19, 2017 · 1647447 · 1647447
1 parent 627116a
commit 1647447
Showing 1 changed file with 4 additions and 4 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
@@ -127,10 +127,10 @@ object TypeCoercion {
     case (DateType, TimestampType) => Some(StringType)
     case (StringType, NullType) => Some(StringType)
     case (NullType, StringType) => Some(StringType)
-    case (l: StringType, r: AtomicType) if r != StringType =>
-      if (r == IntegerType || r == LongType) Some(DoubleType) else Some(r)
-    case (l: AtomicType, r: StringType) if l != StringType =>
-      if (l == IntegerType || l == LongType) Some(DoubleType) else Some(l)
+    case (StringType, r: NumericType) => Some(DoubleType)
+    case (l: NumericType, StringType) => Some(DoubleType)
+    case (l: StringType, r: AtomicType) if r != StringType => Some(r)
+    case (l: AtomicType, r: StringType) if l != StringType => Some(l)
     case (l, r) => None
   }