This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 933f17d13f6e [SPARK-45300][SQL][TESTS] Remove JDK 8 workaround in
TimestampFormatterSuite
933f17d13f6e is described below
commit 933f17d13f6e72a687a383b8fc1797a9ba700a98
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Mon Sep 25 20:15:03 2023 -0700
[SPARK-45300][SQL][TESTS] Remove JDK 8 workaround in TimestampFormatterSuite
### What changes were proposed in this pull request?
This PR removes the legacy workaround for JDK 8 in
https://github.com/apache/spark/pull/28736.
### Why are the changes needed?
- We still need the main code for completeness, and in case there are other
diff in the future JDK versions so this PR only fixes the tests.
- We dropped JDK 11/8 at SPARK-44112
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Fixed unittests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #43085 from HyukjinKwon/SPARK-45300.
Authored-by: Hyukjin Kwon <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../sql/catalyst/util/TimestampFormatterSuite.scala | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
index eb173bc7f8c8..ecd849dd3af9 100644
---
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
+++
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
@@ -19,8 +19,6 @@ package org.apache.spark.sql.catalyst.util
import java.time.{DateTimeException, LocalDateTime}
-import org.apache.commons.lang3.{JavaVersion, SystemUtils}
-
import org.apache.spark.SparkUpgradeException
import org.apache.spark.sql.catalyst.util.DateTimeTestUtils._
import org.apache.spark.sql.catalyst.util.DateTimeUtils._
@@ -333,14 +331,8 @@ class TimestampFormatterSuite extends
DatetimeFormatterSuite {
val micros1 = formatter.parse("2009-12-12 00 am")
assert(micros1 === date(2009, 12, 12))
- // JDK-8223773: DateTimeFormatter Fails to throw an Exception on Invalid
HOUR_OF_AMPM
// For `KK`, "12:00:00 am" is the same as "00:00:00 pm".
- if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)) {
- intercept[DateTimeException](formatter.parse("2009-12-12 12 am"))
- } else {
- val micros2 = formatter.parse("2009-12-12 12 am")
- assert(micros2 === date(2009, 12, 12, 12))
- }
+ intercept[DateTimeException](formatter.parse("2009-12-12 12 am"))
val micros3 = formatter.parse("2009-12-12 00 pm")
assert(micros3 === date(2009, 12, 12, 12))
@@ -410,15 +402,7 @@ class TimestampFormatterSuite extends
DatetimeFormatterSuite {
val formatter = TimestampFormatter("DD", UTC, isParsing = false)
assert(formatter.format(date(1970, 1, 3)) == "03")
assert(formatter.format(date(1970, 4, 9)) == "99")
-
- if (SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_1_8)) {
- // https://bugs.openjdk.java.net/browse/JDK-8079628
- intercept[SparkUpgradeException] {
- formatter.format(date(1970, 4, 10))
- }
- } else {
- assert(formatter.format(date(1970, 4, 10)) == "100")
- }
+ assert(formatter.format(date(1970, 4, 10)) == "100")
}
test("SPARK-32424: avoid silent data change when timestamp overflows") {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
