mv calendar interval toString to utils

common/unsafe/src/main/java/org/apache/spark/unsafe/types/CalendarInterval.java

@@ -18,7 +18,6 @@
 package org.apache.spark.unsafe.types;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.Duration;
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
@@ -80,39 +79,7 @@ public int compareTo(CalendarInterval that) {
 
   @Override
   public String toString() {
-    if (months == 0 && days == 0 && microseconds == 0) {
-      return "0 seconds";
-    }
-
-    StringBuilder sb = new StringBuilder();
-
-    if (months != 0) {
-      appendUnit(sb, months / 12, "years");
-      appendUnit(sb, months % 12, "months");
-    }
-
-    appendUnit(sb, days, "days");
-
-    if (microseconds != 0) {
-      long rest = microseconds;
-      appendUnit(sb, rest / MICROS_PER_HOUR, "hours");
-      rest %= MICROS_PER_HOUR;
-      appendUnit(sb, rest / MICROS_PER_MINUTE, "minutes");
-      rest %= MICROS_PER_MINUTE;
-      if (rest != 0) {
-        String s = BigDecimal.valueOf(rest, 6).stripTrailingZeros().toPlainString();
-        sb.append(s).append(" seconds ");
-      }
-    }
-
-    sb.setLength(sb.length() - 1);
-    return sb.toString();
-  }
-
-  private void appendUnit(StringBuilder sb, long value, String unit) {
-    if (value != 0) {
-      sb.append(value).append(' ').append(unit).append(' ');
-    }
+    return "CalendarInterval(months= " + months + ", days = " + days + ", microsecond = " + microseconds + ")";
   }
 
   /**

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala

@@ -30,6 +30,7 @@ import org.apache.spark.sql.catalyst.expressions.codegen.Block._
 import org.apache.spark.sql.catalyst.util._
 import org.apache.spark.sql.catalyst.util.DateTimeConstants._
 import org.apache.spark.sql.catalyst.util.DateTimeUtils._
+import org.apache.spark.sql.catalyst.util.IntervalUtils._
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.internal.SQLConf.IntervalStyle._
 import org.apache.spark.sql.types._
@@ -283,12 +284,12 @@ abstract class CastBase extends UnaryExpression with TimeZoneAwareExpression wit
   // UDFToString
   private[this] def castToString(from: DataType): Any => Any = from match {
     case CalendarIntervalType => SQLConf.get.intervalOutputStyle match {
-      case SQL_STANDARD => buildCast[CalendarInterval](_, i =>
-        UTF8String.fromString(IntervalUtils.toSqlStandardString(i)))
-      case ISO_8601 => buildCast[CalendarInterval](_, i =>
-        UTF8String.fromString(IntervalUtils.toIso8601String(i)))
-      case _ => buildCast[CalendarInterval](_, i =>
-        UTF8String.fromString(i.toString))
+      case SQL_STANDARD =>
+        buildCast[CalendarInterval](_, i => UTF8String.fromString(toSqlStandardString(i)))
+      case ISO_8601 =>
+        buildCast[CalendarInterval](_, i => UTF8String.fromString(toIso8601String(i)))
+      case _ =>
+        buildCast[CalendarInterval](_, i => UTF8String.fromString(toMultiUnitsString(i)))
     }
     case BinaryType => buildCast[Array[Byte]](_, UTF8String.fromBytes)
     case DateType => buildCast[Int](_, d => UTF8String.fromString(dateFormatter.format(d)))
@@ -994,6 +995,16 @@ abstract class CastBase extends UnaryExpression with TimeZoneAwareExpression wit
           timestampFormatter.getClass)
         (c, evPrim, evNull) => code"""$evPrim = UTF8String.fromString(
           org.apache.spark.sql.catalyst.util.DateTimeUtils.timestampToString($tf, $c));"""
+      case CalendarIntervalType =>
+        val iu = IntervalUtils.getClass.getCanonicalName.stripSuffix("$")
+        SQLConf.get.intervalOutputStyle match {
+        case SQL_STANDARD =>
+          (c, evPrim, _) => code"""$evPrim = UTF8String.fromString($iu.toSqlStandardString($c));"""
+        case ISO_8601 =>
+          (c, evPrim, _) => code"""$evPrim = UTF8String.fromString($iu.toIso8601String($c));"""
+        case _ =>
+          (c, evPrim, _) => code"""$evPrim = UTF8String.fromString($iu.toMultiUnitsString($c));"""
+        }
       case ArrayType(et, _) =>
         (c, evPrim, evNull) => {
           val buffer = ctx.freshVariable("buffer", classOf[UTF8StringBuilder])

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala

@@ -409,6 +409,7 @@ case class Literal (value: Any, dataType: DataType) extends LeafExpression {
         DateTimeUtils.getZoneId(SQLConf.get.sessionLocalTimeZone))
       s"TIMESTAMP('${formatter.format(v)}')"
     case (v: Array[Byte], BinaryType) => s"X'${DatatypeConverter.printHexBinary(v)}'"
+    case (v: CalendarInterval, CalendarIntervalType) => IntervalUtils.toMultiUnitsString(v)
     case _ => value.toString
   }
 }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala

@@ -425,6 +425,35 @@ object IntervalUtils {
     fromDoubles(interval.months / num, interval.days / num, interval.microseconds / num)
   }
 
+  def toMultiUnitsString(interval: CalendarInterval): String = {
+    if (interval.months == 0 && interval.days == 0 && interval.microseconds == 0) {
+      return "0 seconds"
+    }
+    val sb = new StringBuilder
+    if (interval.months != 0) {
+      appendUnit(sb, interval.months / 12, "years")
+      appendUnit(sb, interval.months % 12, "months")
+    }
+    appendUnit(sb, interval.days, "days")
+    if (interval.microseconds != 0) {
+      var rest = interval.microseconds
+      appendUnit(sb, rest / MICROS_PER_HOUR, "hours")
+      rest %= MICROS_PER_HOUR
+      appendUnit(sb, rest / MICROS_PER_MINUTE, "minutes")
+      rest %= MICROS_PER_MINUTE
+      if (rest != 0) {
+        val s = BigDecimal.valueOf(rest, 6).stripTrailingZeros.toPlainString
+        sb.append(s).append(" seconds ")
+      }
+    }
+    sb.setLength(sb.length - 1)
+    sb.toString
+  }
+
+  private def appendUnit(sb: StringBuilder, value: Long, unit: String): Unit = {
+    if (value != 0) sb.append(value).append(' ').append(unit).append(' ')
+  }
+
   def toSqlStandardString(interval: CalendarInterval): String = {
     val yearMonthPart = if (interval.months != 0) {
       interval.months / 12 + "-" + math.abs(interval.months) % 12

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/IntervalUtilsSuite.scala

@@ -308,4 +308,26 @@ class IntervalUtilsSuite extends SparkFunSuite {
     val i9 = new CalendarInterval(0, 0, -3000 * MICROS_PER_HOUR)
     assert(IntervalUtils.toIso8601String(i9) === "PT-3000H")
   }
+
+  test("to multi units string") {
+    val i1 = new CalendarInterval(0, 0, 0)
+    assert(IntervalUtils.toMultiUnitsString(i1) === "0 seconds")
+    val i2 = new CalendarInterval(34, 0, 0)
+    assert(IntervalUtils.toMultiUnitsString(i2) === "2 years 10 months")
+    val i3 = new CalendarInterval(-34, 0, 0)
+    assert(IntervalUtils.toMultiUnitsString(i3) === "-2 years -10 months")
+    val i4 = new CalendarInterval(0, 31, 0)
+    assert(IntervalUtils.toMultiUnitsString(i4) === "31 days")
+    val i5 = new CalendarInterval(0, -31, 0)
+    assert(IntervalUtils.toMultiUnitsString(i5) === "-31 days")
+    val i6 = new CalendarInterval(0, 0, 3 * MICROS_PER_HOUR + 13 * MICROS_PER_MINUTE + 123)
+    assert(IntervalUtils.toMultiUnitsString(i6) === "3 hours 13 minutes 0.000123 seconds")
+    val i7 = new CalendarInterval(0, 0, -3 * MICROS_PER_HOUR - 13 * MICROS_PER_MINUTE - 123)
+    assert(IntervalUtils.toMultiUnitsString(i7) === "-3 hours -13 minutes -0.000123 seconds")
+    val i8 = new CalendarInterval(-34, 31, 3 * MICROS_PER_HOUR + 13 * MICROS_PER_MINUTE + 123)
+    assert(IntervalUtils.toMultiUnitsString(i8) ===
+      "-2 years -10 months 31 days 3 hours 13 minutes 0.000123 seconds")
+    val i9 = new CalendarInterval(0, 0, -3000 * MICROS_PER_HOUR)
+    assert(IntervalUtils.toMultiUnitsString(i9) === "-3000 hours")
+  }
 }

sql/core/src/main/scala/org/apache/spark/sql/execution/HiveResult.scala

@@ -21,7 +21,8 @@ import java.nio.charset.StandardCharsets
 import java.sql.{Date, Timestamp}
 
 import org.apache.spark.sql.Row
-import org.apache.spark.sql.catalyst.util.{DateFormatter, DateTimeUtils, IntervalUtils, TimestampFormatter}
+import org.apache.spark.sql.catalyst.util.{DateFormatter, DateTimeUtils, TimestampFormatter}
+import org.apache.spark.sql.catalyst.util.IntervalUtils._
 import org.apache.spark.sql.execution.command.{DescribeCommandBase, ExecutedCommandExec, ShowTablesCommand}
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.internal.SQLConf.IntervalStyle._
@@ -101,9 +102,9 @@ object HiveResult {
     case (decimal, DecimalType()) => decimal.toString
     case (interval: CalendarInterval, CalendarIntervalType) =>
       SQLConf.get.intervalOutputStyle match {
-        case SQL_STANDARD => IntervalUtils.toSqlStandardString(interval)
-        case ISO_8601 => IntervalUtils.toIso8601String(interval)
-        case _ => interval.toString
+        case SQL_STANDARD => toSqlStandardString(interval)
+        case ISO_8601 => toIso8601String(interval)
+        case _ => toMultiUnitsString(interval)
       }
     case (other, tpe) if primitiveTypes contains tpe => other.toString
   }
@@ -129,9 +130,9 @@ object HiveResult {
     case (decimal: java.math.BigDecimal, DecimalType()) => formatDecimal(decimal)
     case (interval: CalendarInterval, CalendarIntervalType) =>
       SQLConf.get.intervalOutputStyle match {
-        case SQL_STANDARD => IntervalUtils.toSqlStandardString(interval)
-        case ISO_8601 => IntervalUtils.toIso8601String(interval)
-        case _ => interval.toString
+        case SQL_STANDARD => toSqlStandardString(interval)
+        case ISO_8601 => toIso8601String(interval)
+        case _ => toMultiUnitsString(interval)
       }
     case (interval, CalendarIntervalType) => interval.toString
     case (other, _ : UserDefinedType[_]) => other.toString

sql/core/src/test/resources/sql-tests/inputs/datetime.sql

@@ -36,14 +36,3 @@ select date '2001-10-01' - 7;
 select date '2001-10-01' - date '2001-09-28';
 select date'2020-01-01' - timestamp'2019-10-06 10:11:12.345678';
 select timestamp'2019-10-06 10:11:12.345678' - date'2020-01-01';
-
--- interval operations
-select 3 * (timestamp'2019-10-15 10:11:12.001002' - date'2019-10-15');
-select interval 4 month 2 weeks 3 microseconds * 1.5;
-select (timestamp'2019-10-15' - timestamp'2019-10-14') / 1.5;
-
--- interval operation with null and zero case
-select interval '2 seconds' / 0;
-select interval '2 seconds' / null;
-select interval '2 seconds' * null;
-select null * interval '2 seconds';

sql/core/src/test/resources/sql-tests/results/datetime.sql.out

@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 24
+-- Number of queries: 17
 
 
 -- !query 0
@@ -145,59 +145,3 @@ select timestamp'2019-10-06 10:11:12.345678' - date'2020-01-01'
 struct<subtracttimestamps(TIMESTAMP('2019-10-06 10:11:12.345678'), CAST(DATE '2020-01-01' AS TIMESTAMP)):interval>
 -- !query 16 output
 -2078 hours -48 minutes -47.654322 seconds
-
-
--- !query 17
-select 3 * (timestamp'2019-10-15 10:11:12.001002' - date'2019-10-15')
--- !query 17 schema
-struct<multiply_interval(subtracttimestamps(TIMESTAMP('2019-10-15 10:11:12.001002'), CAST(DATE '2019-10-15' AS TIMESTAMP)), CAST(3 AS DOUBLE)):interval>
--- !query 17 output
-30 hours 33 minutes 36.003006 seconds
-
-
--- !query 18
-select interval 4 month 2 weeks 3 microseconds * 1.5
--- !query 18 schema
-struct<multiply_interval(4 months 14 days 0.000003 seconds, CAST(1.5 AS DOUBLE)):interval>
--- !query 18 output
-6 months 21 days 0.000005 seconds
-
-
--- !query 19
-select (timestamp'2019-10-15' - timestamp'2019-10-14') / 1.5
--- !query 19 schema
-struct<divide_interval(subtracttimestamps(TIMESTAMP('2019-10-15 00:00:00'), TIMESTAMP('2019-10-14 00:00:00')), CAST(1.5 AS DOUBLE)):interval>
--- !query 19 output
-16 hours
-
-
--- !query 20
-select interval '2 seconds' / 0
--- !query 20 schema
-struct<divide_interval(2 seconds, CAST(0 AS DOUBLE)):interval>
--- !query 20 output
-NULL
-
-
--- !query 21
-select interval '2 seconds' / null
--- !query 21 schema
-struct<divide_interval(2 seconds, CAST(NULL AS DOUBLE)):interval>
--- !query 21 output
-NULL
-
-
--- !query 22
-select interval '2 seconds' * null
--- !query 22 schema
-struct<multiply_interval(2 seconds, CAST(NULL AS DOUBLE)):interval>
--- !query 22 output
-NULL
-
-
--- !query 23
-select null * interval '2 seconds'
--- !query 23 schema
-struct<multiply_interval(2 seconds, CAST(NULL AS DOUBLE)):interval>
--- !query 23 output
-NULL