Fix

apache · Aug 16, 2019 · d793f49 · d793f49
1 parent 1b2c8d4
commit d793f49
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 27 deletions.
diff --git a/...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
@@ -1964,6 +1964,38 @@ case class Epoch(child: Expression, timeZoneId: Option[String] = None)
   }
 }
 
+object DatePart {
+
+  def parseExtractField(
+      extractField: String,
+      source: Expression,
+      errorHandleFunc: => Unit): Expression = extractField.toUpperCase(Locale.ROOT) match {
+    case "MILLENNIUM" | "MILLENNIA" | "MIL" | "MILS" => Millennium(source)
+    case "CENTURY" | "CENTURIES" | "C" | "CENT" => Century(source)
+    case "DECADE" | "DECADES" | "DEC" | "DECS" => Decade(source)
+    case "YEAR" | "Y" | "YEARS" | "YR" | "YRS" => Year(source)
+    case "ISOYEAR" => IsoYear(source)
+    case "QUARTER" | "QTR" => Quarter(source)
+    case "MONTH" | "MON" | "MONS" | "MONTHS" => Month(source)
+    case "WEEK" | "W" | "WEEKS" => WeekOfYear(source)
+    case "DAY" | "D" | "DAYS" => DayOfMonth(source)
+    case "DAYOFWEEK" => DayOfWeek(source)
+    case "DOW" => Subtract(DayOfWeek(source), Literal(1))
+    case "ISODOW" => Add(WeekDay(source), Literal(1))
+    case "DOY" => DayOfYear(source)
+    case "HOUR" | "H" | "HOURS" | "HR" | "HRS" => Hour(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)
+    case "MICROSECONDS" | "USEC" | "USECS" | "USECONDS" | "MICROSECON" | "US" =>
+      Microseconds(source)
+    case "EPOCH" => Epoch(source)
+    case other =>
+      errorHandleFunc.asInstanceOf[Expression]
+  }
+}
+
 @ExpressionDescription(
   usage = "_FUNC_(field, source) - Extracts a part of the date/timestamp.",
   arguments = """
@@ -2005,32 +2037,11 @@ case class DatePart(field: Expression, source: Expression, child: Expression)
       if (!field.foldable) {
         throw new AnalysisException("The field parameter needs to be a foldable string value.")
       }
-      val extractField = field.eval().asInstanceOf[UTF8String].toString.toUpperCase(Locale.ROOT)
-      extractField match {
-        case "MILLENNIUM" | "MILLENNIA" | "MIL" | "MILS" => Millennium(source)
-        case "CENTURY" | "CENTURIES" | "C" | "CENT" => Century(source)
-        case "DECADE" | "DECADES" | "DEC" | "DECS" => Decade(source)
-        case "YEAR" | "Y" | "YEARS" | "YR" | "YRS" => Year(source)
-        case "ISOYEAR" => IsoYear(source)
-        case "QUARTER" | "QTR" => Quarter(source)
-        case "MONTH" | "MON" | "MONS" | "MONTHS" => Month(source)
-        case "WEEK" | "W" | "WEEKS" => WeekOfYear(source)
-        case "DAY" | "D" | "DAYS" => DayOfMonth(source)
-        case "DAYOFWEEK" => DayOfWeek(source)
-        case "DOW" => Subtract(DayOfWeek(source), Literal(1))
-        case "ISODOW" => Add(WeekDay(source), Literal(1))
-        case "DOY" => DayOfYear(source)
-        case "HOUR" | "H" | "HOURS" | "HR" | "HRS" => Hour(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)
-        case "MICROSECONDS" | "USEC" | "USECS" | "USECONDS" | "MICROSECON" | "US" =>
-          Microseconds(source)
-        case "EPOCH" => Epoch(source)
-        case other =>
-          throw new AnalysisException(s"Literals of type '$other' are currently not supported.")
-      }})
+      val fieldStr = field.eval().asInstanceOf[UTF8String].toString
+      DatePart.parseExtractField(fieldStr, source, {
+        throw new AnalysisException(s"Literals of type '$fieldStr' are currently not supported.")
+      })
+    })
   }
 
   override def flatArguments: Iterator[Any] = Iterator(field, source)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
@@ -1409,7 +1409,12 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
    * Create a Extract expression.
    */
   override def visitExtract(ctx: ExtractContext): Expression = withOrigin(ctx) {
-    new DatePart(Literal(ctx.field.getText), expression(ctx.source))
+    val fieldStr = ctx.field.getText
+    val source = expression(ctx.source)
+    val extractField = DatePart.parseExtractField(fieldStr, source, {
+      throw new ParseException(s"Literals of type '$fieldStr' are currently not supported.", ctx)
+    })
+    new DatePart(Literal(fieldStr), expression(ctx.source), extractField)
   }
 
   /**