Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add support for date extract
  • Loading branch information
wangyum committed Jun 1, 2018
commit a1a4db3774e7e0911e710ed1a99694add29df545
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about EXTRACT '(' field=identifier FROM source=valueExpression ')' instead of introducing each term?

;

constant
Expand Down Expand Up @@ -739,6 +740,7 @@ nonReserved
| VIEW | REPLACE
| IF
| POSITION
| EXTRACT | YEAR | QUARTER | MONTH | WEEK | DAY | HOUR | MINUTE | SECOND
| NO | DATA
| START | TRANSACTION | COMMIT | ROLLBACK | IGNORE
| SORT | CLUSTER | DISTRIBUTE | UNSET | TBLPROPERTIES | SKEWED | STORED | DIRECTORIES | LOCATION
Expand Down Expand Up @@ -878,6 +880,15 @@ TRAILING: 'TRAILING';

IF: 'IF';
POSITION: 'POSITION';
EXTRACT: 'EXTRACT';
YEAR: 'YEAR';
QUARTER: 'QUARTER';
MONTH: 'MONTH';
WEEK: 'WEEK';
DAY: 'DAY';
HOUR: 'HOUR';
MINUTE: 'MINUTE';
SECOND: 'SECOND';

EQ : '=' | '==';
NSEQ: '<=>';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,30 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
new StringLocate(expression(ctx.substr), expression(ctx.str))
}

/**
* 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))
}
}

/**
* Create a (windowed) Function expression.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ class TableIdentifierParserSuite extends SparkFunSuite {
"rollup", "row", "rows", "set", "smallint", "table", "timestamp", "to", "trigger",
"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")
"int", "smallint", "timestamp", "at", "position", "both", "leading", "trailing",
"extract", "year", "quarter", "month", "week", "day", "hour", "minute", "second")

val hiveStrictNonReservedKeyword = Seq("anti", "full", "inner", "left", "semi", "right",
"natural", "union", "intersect", "except", "database", "on", "join", "cross", "select", "from",
Expand Down
17 changes: 17 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/extract.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CREATE TEMPORARY VIEW t AS select '2011-05-06 07:08:09.1234567' as c;

select extract(year from c) from t;

select extract(quarter from c) from t;

select extract(month from c) from t;

select extract(week from c) from t;

select extract(day 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;
74 changes: 74 additions & 0 deletions sql/core/src/test/resources/sql-tests/results/extract.sql.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 9


-- !query 0
CREATE TEMPORARY VIEW t AS select '2011-05-06 07:08:09.1234567' as c
-- !query 0 schema
struct<>
-- !query 0 output



-- !query 1
select extract(year from c) from t
-- !query 1 schema
struct<year(CAST(c AS DATE)):int>
-- !query 1 output
2011


-- !query 2
select extract(quarter from c) from t
-- !query 2 schema
struct<quarter(CAST(c AS DATE)):int>
-- !query 2 output
2


-- !query 3
select extract(month from c) from t
-- !query 3 schema
struct<month(CAST(c AS DATE)):int>
-- !query 3 output
5


-- !query 4
select extract(week from c) from t
-- !query 4 schema
struct<weekofyear(CAST(c AS DATE)):int>
-- !query 4 output
18


-- !query 5
select extract(day from c) from t
-- !query 5 schema
struct<dayofmonth(CAST(c AS DATE)):int>
-- !query 5 output
6


-- !query 6
select extract(hour from c) from t
-- !query 6 schema
struct<hour(CAST(c AS TIMESTAMP)):int>
-- !query 6 output
7


-- !query 7
select extract(minute from c) from t
-- !query 7 schema
struct<minute(CAST(c AS TIMESTAMP)):int>
-- !query 7 output
8


-- !query 8
select extract(second from c) from t
-- !query 8 schema
struct<second(CAST(c AS TIMESTAMP)):int>
-- !query 8 output
9