update

apache · Apr 29, 2021 · 35dd9f4 · 35dd9f4
1 parent 616380e
commit 35dd9f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
@@ -143,9 +143,8 @@ object IntervalUtils {
         }
       case daySecondStringPattern(_, null, _, _, _, _, _, _, _, _, _) =>
         val dtStr = daySecondNumPattern.findFirstIn(intervalStr).get
-        println(dtStr)
         fromDayTimeString(dtStr, DAY, SECOND)
-      case daySecondStringPattern(_, _, _, _, _, _, _, _, _, _, _) =>
+      case _ =>
         throw new IllegalArgumentException(
           s"Interval string must match day-time format of 'd h:m:s.n': ${input.toString}, " +
             s"$fallbackNotice")

diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
@@ -1781,22 +1781,15 @@ class CastSuite extends CastSuiteBase {
     checkEvaluation(cast(Literal.create("0 0:0:0"), DayTimeIntervalType), 0L)
     checkEvaluation(cast(Literal.create("INTERVAL '1 2:03:04' DAY TO SECOND"),
       DayTimeIntervalType), 7384000000L)
-    checkEvaluation(cast(Literal.create("INTERVAL '2:03:04' DAY TO SECOND"),
-      DayTimeIntervalType), 7384000000L)
-    checkEvaluation(cast(Literal.create("INTERVAL '03:04' DAY TO SECOND"),
-      DayTimeIntervalType), 7384000000L)
-    checkEvaluation(cast(Literal.create("INTERVAL '03:04.0000' DAY TO SECOND"),
-      DayTimeIntervalType), 7384000000L)
-    checkEvaluation(cast(Literal.create("INTERVAL '01:03:04.0000' DAY TO SECOND"),
-      DayTimeIntervalType), 7384000000L)
-    checkEvaluation(cast(Literal.create("INTERVAL '1 1:03:04.0000' DAY TO SECOND"),
-      DayTimeIntervalType), 7384000000L)
+    checkEvaluation(cast(Literal.create("INTERVAL '1 03:04:00' DAY TO SECOND"),
+      DayTimeIntervalType), 11040000000L)
+    checkEvaluation(cast(Literal.create("INTERVAL '1 03:04:00.0000' DAY TO SECOND"),
+      DayTimeIntervalType), 11040000000L)
     checkEvaluation(cast(Literal.create("1 2:03:04"), DayTimeIntervalType), 7384000000L)
     checkEvaluation(cast(Literal.create("INTERVAL '-10 2:03:04' DAY TO SECOND"),
       DayTimeIntervalType), -7384000000L)
 
     checkEvaluation(cast(Literal.create("-10 2:03:04"), DayTimeIntervalType), -7384000000L)
-    checkEvaluation(cast(Literal.create("null"), DayTimeIntervalType), null)
   }
 }