MaxGekk commented on a change in pull request #28824:
URL: https://github.com/apache/spark/pull/28824#discussion_r440628505
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/RebaseDateTimeSuite.scala
##########
@@ -416,38 +418,39 @@ class RebaseDateTimeSuite extends SparkFunSuite with
Matchers with SQLHelper {
// clocks were moved backward to become Sunday, 18 November, 1945 01:00:00
AM.
// In this way, the overlap happened w/o Daylight Saving Time.
val hkZid = getZoneId("Asia/Hong_Kong")
+ var expected = "1945-11-18 01:30:00.0"
+ var ldt = LocalDateTime.of(1945, 11, 18, 1, 30, 0)
+ var earlierMicros =
instantToMicros(ldt.atZone(hkZid).withEarlierOffsetAtOverlap().toInstant)
+ var laterMicros =
instantToMicros(ldt.atZone(hkZid).withLaterOffsetAtOverlap().toInstant)
+ var overlapInterval = MICROS_PER_HOUR
+ if (earlierMicros + overlapInterval != laterMicros) {
+ // Old JDK might have an outdated time zone database.
+ // See https://bugs.openjdk.java.net/browse/JDK-8228469: "Hong Kong ...
Its 1945 transition
+ // from JST to HKT was on 11-18 at 02:00, not 09-15 at 00:00"
+ expected = "1945-09-14 23:30:00.0"
+ ldt = LocalDateTime.of(1945, 9, 14, 23, 30, 0)
+ earlierMicros =
instantToMicros(ldt.atZone(hkZid).withEarlierOffsetAtOverlap().toInstant)
+ laterMicros =
instantToMicros(ldt.atZone(hkZid).withLaterOffsetAtOverlap().toInstant)
+ // If time zone db doesn't have overlapping at all, set the overlap
interval to zero.
+ overlapInterval = laterMicros - earlierMicros
+ }
+ val hkTz = TimeZone.getTimeZone(hkZid)
+ val rebasedEarlierMicros = rebaseGregorianToJulianMicros(hkTz,
earlierMicros)
+ val rebasedLaterMicros = rebaseGregorianToJulianMicros(hkTz, laterMicros)
+ assert(rebasedEarlierMicros + overlapInterval === rebasedLaterMicros)
withDefaultTimeZone(hkZid) {
- var expected = "1945-11-18 01:30:00.0"
- var ldt = LocalDateTime.of(1945, 11, 18, 1, 30, 0)
- var earlierMicros =
instantToMicros(ldt.atZone(hkZid).withEarlierOffsetAtOverlap().toInstant)
- var laterMicros =
instantToMicros(ldt.atZone(hkZid).withLaterOffsetAtOverlap().toInstant)
- var overlapInterval = MICROS_PER_HOUR
- if (earlierMicros + overlapInterval != laterMicros) {
- // Old JDK might have an outdated time zone database.
- // See https://bugs.openjdk.java.net/browse/JDK-8228469: "Hong Kong
... Its 1945 transition
- // from JST to HKT was on 11-18 at 02:00, not 09-15 at 00:00"
- expected = "1945-09-14 23:30:00.0"
- ldt = LocalDateTime.of(1945, 9, 14, 23, 30, 0)
- earlierMicros =
instantToMicros(ldt.atZone(hkZid).withEarlierOffsetAtOverlap().toInstant)
- laterMicros =
instantToMicros(ldt.atZone(hkZid).withLaterOffsetAtOverlap().toInstant)
- // If time zone db doesn't have overlapping at all, set the overlap
interval to zero.
- overlapInterval = laterMicros - earlierMicros
- }
- val rebasedEarlierMicros = rebaseGregorianToJulianMicros(hkZid,
earlierMicros)
- val rebasedLaterMicros = rebaseGregorianToJulianMicros(hkZid,
laterMicros)
def toTsStr(micros: Long): String = toJavaTimestamp(micros).toString
assert(toTsStr(rebasedEarlierMicros) === expected)
assert(toTsStr(rebasedLaterMicros) === expected)
- assert(rebasedEarlierMicros + overlapInterval === rebasedLaterMicros)
// Check optimized rebasing
assert(rebaseGregorianToJulianMicros(earlierMicros) ===
rebasedEarlierMicros)
assert(rebaseGregorianToJulianMicros(laterMicros) === rebasedLaterMicros)
// Check reverse rebasing
assert(rebaseJulianToGregorianMicros(rebasedEarlierMicros) ===
earlierMicros)
assert(rebaseJulianToGregorianMicros(rebasedLaterMicros) === laterMicros)
// Check reverse not-optimized rebasing
Review comment:
No, they don't. Let me move them out of the default JVM time zone.
Thanks.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
