From 1dac0ef36744b736927e67d139f0b21477fa1a3d Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Sat, 23 May 2020 08:34:39 +0300 Subject: [PATCH] Format Java date-time types in Row.jsonValue directly --- .../src/main/scala/org/apache/spark/sql/Row.scala | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala index 4487a2d7f4358..5b17f1d65f1bf 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala @@ -571,14 +571,10 @@ trait Row extends Serializable { case (s: String, _) => JString(s) case (b: Array[Byte], BinaryType) => JString(Base64.getEncoder.encodeToString(b)) - case (d: LocalDate, _) => - JString(dateFormatter.format(DateTimeUtils.localDateToDays(d))) - case (d: Date, _) => - JString(dateFormatter.format(DateTimeUtils.fromJavaDate(d))) - case (i: Instant, _) => - JString(timestampFormatter.format(DateTimeUtils.instantToMicros(i))) - case (t: Timestamp, _) => - JString(timestampFormatter.format(DateTimeUtils.fromJavaTimestamp(t))) + case (d: LocalDate, _) => JString(dateFormatter.format(d)) + case (d: Date, _) => JString(dateFormatter.format(d)) + case (i: Instant, _) => JString(timestampFormatter.format(i)) + case (t: Timestamp, _) => JString(timestampFormatter.format(t)) case (i: CalendarInterval, _) => JString(i.toString) case (a: Array[_], ArrayType(elementType, _)) => iteratorToJsonArray(a.iterator, elementType)