From b8a1be052e8ef4e50f0e8591dcffa56d8ecc61de Mon Sep 17 00:00:00 2001 From: Sudharshann D Date: Sun, 5 Jul 2020 23:18:02 -0700 Subject: [PATCH 1/2] replaced floorDiv to Div --- .../org/apache/spark/sql/catalyst/util/RebaseDateTime.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala index 24fe9fa42c19f..b4da700d12c68 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala @@ -186,7 +186,7 @@ object RebaseDateTime { .setTimeZone(TimeZoneUTC) .setDate(localDate.getYear, localDate.getMonthValue - 1, localDate.getDayOfMonth) .build() - Math.toIntExact(Math.floorDiv(utcCal.getTimeInMillis, MILLIS_PER_DAY)) + Math.toIntExact(utcCal.getTimeInMillis/MILLIS_PER_DAY) } /** From 02cfa895aee27c0ba9493a264647b0082680dc15 Mon Sep 17 00:00:00 2001 From: Sudharshann D Date: Thu, 9 Jul 2020 20:55:58 -0700 Subject: [PATCH 2/2] assert stmt --- .../org/apache/spark/sql/catalyst/util/RebaseDateTime.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala index b4da700d12c68..1a78422e57a4c 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/RebaseDateTime.scala @@ -186,7 +186,8 @@ object RebaseDateTime { .setTimeZone(TimeZoneUTC) .setDate(localDate.getYear, localDate.getMonthValue - 1, localDate.getDayOfMonth) .build() - Math.toIntExact(utcCal.getTimeInMillis/MILLIS_PER_DAY) + assert(utcCal.getTimeInMillis % MILLIS_PER_DAY == 0) + Math.toIntExact(utcCal.getTimeInMillis / MILLIS_PER_DAY) } /**