Infer date type before timestamp type

apache · Dec 3, 2018 · a6723f3 · a6723f3
1 parent 45958bd
commit a6723f3
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVInferSchema.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVInferSchema.scala
@@ -150,18 +150,6 @@ class CSVInferSchema(options: CSVOptions) extends Serializable {
   private def tryParseDouble(field: String): DataType = {
     if ((allCatch opt field.toDouble).isDefined || isInfOrNan(field)) {
       DoubleType
-    } else {
-      tryParseTimestamp(field)
-    }
-  }
-
-  private def tryParseTimestamp(field: String): DataType = {
-    // This case infers a custom `dataFormat` is set.
-    if ((allCatch opt options.timestampFormat.parse(field)).isDefined) {
-      TimestampType
-    } else if ((allCatch opt DateTimeUtils.stringToTime(field)).isDefined) {
-      // We keep this for backwards compatibility.
-      TimestampType
     } else {
       tryParseDate(field)
     }
@@ -177,6 +165,18 @@ class CSVInferSchema(options: CSVOptions) extends Serializable {
     }
     if (dateTry.isDefined) {
       DateType
+    } else {
+      tryParseTimestamp(field)
+    }
+  }
+
+  private def tryParseTimestamp(field: String): DataType = {
+    // This case infers a custom `dataFormat` is set.
+    if ((allCatch opt options.timestampFormat.parse(field)).isDefined) {
+      TimestampType
+    } else if ((allCatch opt DateTimeUtils.stringToTime(field)).isDefined) {
+      // We keep this for backwards compatibility.
+      TimestampType
     } else {
       tryParseBoolean(field)
     }