Skip to content

[SPARK-45300][SQL][TESTS] Remove JDK 8 workaround in TimestampFormatterSuite #43085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 2 commits into from
Closed

[SPARK-45300][SQL][TESTS] Remove JDK 8 workaround in TimestampFormatterSuite #43085

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d156b34
Remove JDK 8 workaround in TimestampFormatterSuite
HyukjinKwon Sep 25, 2023
33c7502
Unused imports
HyukjinKwon Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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"))
Copy link
Member Author

@HyukjinKwon HyukjinKwon Sep 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @wangyum from 412d86e


val micros3 = formatter.parse("2009-12-12 00 pm")
assert(micros3 === date(2009, 12, 12, 12))
Expand Down Expand Up @@ -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") {
Expand Down