Add Minute

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

@@ -64,6 +64,8 @@ case class Day(child: Expression) extends IntervalPart(child, LongType, getDay,
 
 case class Hour(child: Expression) extends IntervalPart(child, ByteType, getHour, "getHour")
 
+case class Minute(child: Expression) extends IntervalPart(child, ByteType, getMinute, "getMinute")
+
 object IntervalPart {
 
   def parseExtractField(
@@ -78,7 +80,7 @@ object IntervalPart {
     case "MONTH" | "MON" | "MONS" | "MONTHS" => Month(source)
     case "DAY" | "D" | "DAYS" => Day(source)
     case "HOUR" | "H" | "HOURS" | "HR" | "HRS" => Hour(source)
-//    case "MINUTE" | "M" | "MIN" | "MINS" | "MINUTES" => Minute(source)
+    case "MINUTE" | "M" | "MIN" | "MINS" | "MINUTES" => Minute(source)
 //    case "SECOND" | "S" | "SEC" | "SECONDS" | "SECS" => Second(source)
 //    case "MILLISECONDS" | "MSEC" | "MSECS" | "MILLISECON" | "MSECONDS" | "MS" =>
 //      Milliseconds(source)

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

@@ -26,6 +26,7 @@ object IntervalUtils {
   val YEARS_PER_CENTURY: Int = 100
   val YEARS_PER_DECADE: Int = 10
   val MICROS_PER_HOUR: Long = DateTimeUtils.MILLIS_PER_HOUR * DateTimeUtils.MICROS_PER_MILLIS
+  val MICROS_PER_MINUTE: Long = DateTimeUtils.MILLIS_PER_MINUTE * DateTimeUtils.MICROS_PER_MILLIS
 
   def getYear(interval: CalendarInterval): Int = {
     interval.months / MONTHS_PER_YEAR
@@ -58,4 +59,8 @@ object IntervalUtils {
   def getHour(interval: CalendarInterval): Byte = {
     ((interval.microseconds % DateTimeUtils.MICROS_PER_DAY) / MICROS_PER_HOUR).toByte
   }
+
+  def getMinute(interval: CalendarInterval): Byte = {
+    ((interval.microseconds % MICROS_PER_HOUR) / MICROS_PER_MINUTE).toByte
+  }
 }

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/interval/IntervalExpressionsSuite.scala

@@ -122,4 +122,16 @@ class IntervalExpressionsSuite  extends SparkFunSuite with ExpressionEvalHelper
     checkEvaluation(Hour(
       "9999 years 11 months 31 days 11 hours 59 minutes 59 seconds"), 11.toByte)
   }
+
+  test("minute") {
+    checkEvaluation(Minute("0 minute"), 0.toByte)
+    checkEvaluation(Minute("1 minute"), 1.toByte)
+    checkEvaluation(Minute("-1 minute"), -1.toByte)
+    checkEvaluation(Minute("59 minute"), 59.toByte)
+    checkEvaluation(Minute("-59 minute"), -59.toByte)
+    // Years and months must not be taken into account
+    checkEvaluation(Minute("100 year 10 months 10 minutes"), 10.toByte)
+    checkEvaluation(Minute(
+      "9999 years 11 months 31 days 11 hours 59 minutes 59 seconds"), 59.toByte)
+  }
 }