You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2018/07/28 15:40:14 UTC
spark git commit: [SPARK-24950][SQL] DateTimeUtilsSuite daysToMillis
and millisToDays fails w/java 8 181-b13
Repository: spark
Updated Branches:
refs/heads/master c6a3db2fb -> c5b8d54c6
[SPARK-24950][SQL] DateTimeUtilsSuite daysToMillis and millisToDays fails w/java 8 181-b13
## What changes were proposed in this pull request?
- Update DateTimeUtilsSuite so that when testing roundtripping in daysToMillis and millisToDays multiple skipdates can be specified.
- Updated test so that both new years eve 2014 and new years day 2015 are skipped for kiribati time zones. This is necessary as java versions pre 181-b13 considered new years day 2015 to be skipped while susequent versions corrected this to new years eve.
## How was this patch tested?
Unit tests
Author: Chris Martin <ch...@cmartinit.co.uk>
Closes #21901 from d80tb7/SPARK-24950_datetimeUtilsSuite_failures.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c5b8d54c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c5b8d54c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c5b8d54c
Branch: refs/heads/master
Commit: c5b8d54c61780af6e9e157e6c855718df972efad
Parents: c6a3db2
Author: Chris Martin <ch...@cmartinit.co.uk>
Authored: Sat Jul 28 10:40:10 2018 -0500
Committer: Sean Owen <sr...@gmail.com>
Committed: Sat Jul 28 10:40:10 2018 -0500
----------------------------------------------------------------------
.../sql/catalyst/util/DateTimeUtilsSuite.scala | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c5b8d54c/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
----------------------------------------------------------------------
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 cbf6106..2423668 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
@@ -662,18 +662,18 @@ class DateTimeUtilsSuite extends SparkFunSuite {
assert(daysToMillis(16800, TimeZoneGMT) === c.getTimeInMillis)
// There are some days are skipped entirely in some timezone, skip them here.
- val skipped_days = Map[String, Int](
- "Kwajalein" -> 8632,
- "Pacific/Apia" -> 15338,
- "Pacific/Enderbury" -> 9131,
- "Pacific/Fakaofo" -> 15338,
- "Pacific/Kiritimati" -> 9131,
- "Pacific/Kwajalein" -> 8632,
- "MIT" -> 15338)
+ val skipped_days = Map[String, Set[Int]](
+ "Kwajalein" -> Set(8632),
+ "Pacific/Apia" -> Set(15338),
+ "Pacific/Enderbury" -> Set(9130, 9131),
+ "Pacific/Fakaofo" -> Set(15338),
+ "Pacific/Kiritimati" -> Set(9130, 9131),
+ "Pacific/Kwajalein" -> Set(8632),
+ "MIT" -> Set(15338))
for (tz <- DateTimeTestUtils.ALL_TIMEZONES) {
- val skipped = skipped_days.getOrElse(tz.getID, Int.MinValue)
+ val skipped = skipped_days.getOrElse(tz.getID, Set.empty)
(-20000 to 20000).foreach { d =>
- if (d != skipped) {
+ if (!skipped.contains(d)) {
assert(millisToDays(daysToMillis(d, tz), tz) === d,
s"Round trip of ${d} did not work in tz ${tz}")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org