From 0941cb1c23e0dcbc567aa5007d12db8a90ef4f51 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Sun, 23 Aug 2020 13:35:56 +0300 Subject: [PATCH 1/3] Fix DaysWritable for Hive v1.2 --- .../spark/sql/execution/datasources/orc/DaysWritable.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala b/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala index 1dccf0ca1fae..e0163effe8d6 100644 --- a/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala +++ b/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala @@ -59,7 +59,9 @@ class DaysWritable( } override def getDays: Int = julianDays - override def get(): Date = new Date(DateWritable.daysToMillis(julianDays)) + override def get(doesTimeMatter: Boolean): Date = { + new Date(DateWritable.daysToMillis(julianDays, doesTimeMatter)) + } override def set(d: Int): Unit = { gregorianDays = d From da2c4344cfd8d8e1d77af27771bcd82d735348bf Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Sun, 23 Aug 2020 18:07:10 +0300 Subject: [PATCH 2/3] Revert "Fix DaysWritable for Hive v1.2" This reverts commit 0941cb1c23e0dcbc567aa5007d12db8a90ef4f51. --- .../spark/sql/execution/datasources/orc/DaysWritable.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala b/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala index e0163effe8d6..1dccf0ca1fae 100644 --- a/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala +++ b/sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala @@ -59,9 +59,7 @@ class DaysWritable( } override def getDays: Int = julianDays - override def get(doesTimeMatter: Boolean): Date = { - new Date(DateWritable.daysToMillis(julianDays, doesTimeMatter)) - } + override def get(): Date = new Date(DateWritable.daysToMillis(julianDays)) override def set(d: Int): Unit = { gregorianDays = d From 0edd70f2904d22f82870870a03a848015591a285 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Sun, 23 Aug 2020 18:49:22 +0300 Subject: [PATCH 3/3] override def get: Date --- .../apache/spark/sql/execution/datasources/DaysWritable.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DaysWritable.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DaysWritable.scala index 56c176e024ac..a04c2fcbbac1 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DaysWritable.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DaysWritable.scala @@ -54,6 +54,9 @@ class DaysWritable( } override def getDays: Int = julianDays + override def get: Date = { + new Date(DateWritable.daysToMillis(julianDays)) + } override def get(doesTimeMatter: Boolean): Date = { new Date(DateWritable.daysToMillis(julianDays, doesTimeMatter)) }