Add DOW/dayofweek

Author: wangyum

sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4

@@ -592,7 +592,7 @@ primaryExpression
     | identifier                                                                               #columnReference
     | base=primaryExpression '.' fieldName=identifier                                          #dereference
     | '(' expression ')'                                                                       #parenthesizedExpression
-    | EXTRACT '(' field=(YEAR | QUARTER | MONTH | WEEK | DAY | HOUR | MINUTE | SECOND) FROM source=valueExpression ')'           #extract
+    | EXTRACT '(' field=identifier FROM source=valueExpression ')'                             #extract
     ;
 
 constant
@@ -740,7 +740,7 @@ nonReserved
     | VIEW | REPLACE
     | IF
     | POSITION
-    | EXTRACT | YEAR | QUARTER | MONTH | WEEK | DAY | HOUR | MINUTE | SECOND
+    | EXTRACT | YEAR | QUARTER | MONTH | WEEK | DAY | DOW | HOUR | MINUTE | SECOND
     | NO | DATA
     | START | TRANSACTION | COMMIT | ROLLBACK | IGNORE
     | SORT | CLUSTER | DISTRIBUTE | UNSET | TBLPROPERTIES | SKEWED | STORED | DIRECTORIES | LOCATION
@@ -886,6 +886,7 @@ QUARTER: 'QUARTER';
 MONTH: 'MONTH';
 WEEK: 'WEEK';
 DAY: 'DAY';
+DOW: 'DOW';
 HOUR: 'HOUR';
 MINUTE: 'MINUTE';
 SECOND: 'SECOND';

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -1210,23 +1210,34 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
    * Create a Extract expression.
    */
   override def visitExtract(ctx: ExtractContext): Expression = withOrigin(ctx) {
-    ctx.field.getType match {
-      case SqlBaseParser.YEAR =>
-        Year(expression(ctx.source))
-      case SqlBaseParser.QUARTER =>
-        Quarter(expression(ctx.source))
-      case SqlBaseParser.MONTH =>
-        Month(expression(ctx.source))
-      case SqlBaseParser.WEEK =>
-        WeekOfYear(expression(ctx.source))
-      case SqlBaseParser.DAY =>
-        DayOfMonth(expression(ctx.source))
-      case SqlBaseParser.HOUR =>
-        Hour(expression(ctx.source))
-      case SqlBaseParser.MINUTE =>
-        Minute(expression(ctx.source))
-      case SqlBaseParser.SECOND =>
-        Second(expression(ctx.source))
+    val extractType = ctx.field.getText.toUpperCase(Locale.ROOT)
+    try {
+      extractType match {
+        case "YEAR" =>
+          Year(expression(ctx.source))
+        case "QUARTER" =>
+          Quarter(expression(ctx.source))
+        case "MONTH" =>
+          Month(expression(ctx.source))
+        case "WEEK" =>
+          WeekOfYear(expression(ctx.source))
+        case "DAY" =>
+          DayOfMonth(expression(ctx.source))
+        case "DOW" =>
+          DayOfWeek(expression(ctx.source))
+        case "HOUR" =>
+          Hour(expression(ctx.source))
+        case "MINUTE" =>
+          Minute(expression(ctx.source))
+        case "SECOND" =>
+          Second(expression(ctx.source))
+        case other =>
+          throw new ParseException(s"Literals of type '$other' are currently not supported.", ctx)
+      }
+    } catch {
+      case e: IllegalArgumentException =>
+        val message = Option(e.getMessage).getOrElse(s"Exception parsing $extractType")
+        throw new ParseException(message, ctx)
     }
   }
 

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/TableIdentifierParserSuite.scala

@@ -52,7 +52,7 @@ class TableIdentifierParserSuite extends SparkFunSuite {
     "true", "truncate", "update", "user", "values", "with", "regexp", "rlike",
     "bigint", "binary", "boolean", "current_date", "current_timestamp", "date", "double", "float",
     "int", "smallint", "timestamp", "at", "position", "both", "leading", "trailing",
-    "extract", "year", "quarter", "month", "week", "day", "hour", "minute", "second")
+    "extract", "year", "quarter", "month", "week", "day", "dow", "hour", "minute", "second")
 
   val hiveStrictNonReservedKeyword = Seq("anti", "full", "inner", "left", "semi", "right",
     "natural", "union", "intersect", "except", "database", "on", "join", "cross", "select", "from",

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

@@ -10,8 +10,12 @@ select extract(week from c) from t;
 
 select extract(day from c) from t;
 
+select extract(dow from c) from t;
+
 select extract(hour from c) from t;
 
 select extract(minute from c) from t;
 
 select extract(second from c) from t;
+
+select extract(not_supported from c) from t;

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

@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 9
+-- Number of queries: 11
 
 
 -- !query 0
@@ -51,24 +51,46 @@ struct<dayofmonth(CAST(c AS DATE)):int>
 
 
 -- !query 6
-select extract(hour from c) from t
+select extract(dow from c) from t
 -- !query 6 schema
-struct<hour(CAST(c AS TIMESTAMP)):int>
+struct<dayofweek(CAST(c AS DATE)):int>
 -- !query 6 output
-7
+6
 
 
 -- !query 7
-select extract(minute from c) from t
+select extract(hour from c) from t
 -- !query 7 schema
-struct<minute(CAST(c AS TIMESTAMP)):int>
+struct<hour(CAST(c AS TIMESTAMP)):int>
 -- !query 7 output
-8
+7
 
 
 -- !query 8
-select extract(second from c) from t
+select extract(minute from c) from t
 -- !query 8 schema
-struct<second(CAST(c AS TIMESTAMP)):int>
+struct<minute(CAST(c AS TIMESTAMP)):int>
 -- !query 8 output
+8
+
+
+-- !query 9
+select extract(second from c) from t
+-- !query 9 schema
+struct<second(CAST(c AS TIMESTAMP)):int>
+-- !query 9 output
 9
+
+
+-- !query 10
+select extract(not_supported from c) from t
+-- !query 10 schema
+struct<>
+-- !query 10 output
+org.apache.spark.sql.catalyst.parser.ParseException
+
+Literals of type 'NOT_SUPPORTED' are currently not supported.(line 1, pos 7)
+
+== SQL ==
+select extract(not_supported from c) from t
+-------^^^