[spark] branch branch-2.4 updated: Revert "[SPARK-29494][SQL] Fix for ArrayOutofBoundsException while converting string to timestamp"

[zsxwing]

This is an automated email from the ASF dual-hosted git repository.

zsxwing pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new b094774  Revert "[SPARK-29494][SQL] Fix for ArrayOutofBoundsException 
while converting string to timestamp"
b094774 is described below

commit b09477415f8cbff5292066c4366668f65af15622
Author: Shixiong Zhu <zsxw...@gmail.com>
AuthorDate: Fri Oct 18 15:21:35 2019 -0700

    Revert "[SPARK-29494][SQL] Fix for ArrayOutofBoundsException while 
converting string to timestamp"
    
    This reverts commit 4d476ed44a36eadb0b21b88d0f6420d52a80cc9d.
---
 .../scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala    | 2 +-
 .../org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala     | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
index 5deb83e..cc3fcb2 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
@@ -378,7 +378,7 @@ object DateTimeUtils {
             i += 1
           }
         } else {
-          if (i < segments.length && (b == ':' || b == ' ')) {
+          if (b == ':' || b == ' ') {
             segments(i) = currentSegmentValue
             currentSegmentValue = 0
             i += 1
diff --git 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
index 4496ec8..abdb916 100644
--- 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
+++ 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
@@ -581,12 +581,6 @@ class DateTimeUtilsSuite extends SparkFunSuite {
     }
   }
 
-  test("trailing characters while converting string to timestamp") {
-    val s = UTF8String.fromString("2019-10-31T10:59:23Z:::")
-    val time = DateTimeUtils.stringToTimestamp(s, defaultZoneId)
-    assert(time == None)
-  }
-
   test("truncTimestamp") {
     def testTrunc(
         level: Int,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org