Skip to content

[SPARK-28310][SQL] Support (FIRST_VALUE|LAST_VALUE)(expr[ (IGNORE|RESPECT) NULLS]?) syntax #25082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhulipeng wants to merge 4 commits into from
Closed

[SPARK-28310][SQL] Support (FIRST_VALUE|LAST_VALUE)(expr[ (IGNORE|RESPECT) NULLS]?) syntax #25082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
678ccb7
supprt ansi sql grammar:first_value/last_value(expression, [ignore/re…
zhulipeng Jul 9, 2019
b052522
typo and keywords list update
zhulipeng Jul 10, 2019
b3787f5
remove from ansi mode
zhulipeng Jul 10, 2019
353becd
first_value, last_value ansi is true
zhulipeng Jul 10, 2019
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
3 changes: 3 additions & 0 deletions docs/sql-keywords.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Below is a list of all the keywords in Spark SQL.
<tr><td>FIELDS</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>FILEFORMAT</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>FIRST</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>FIRST_VALUE</td><td>reserved</td><td>non-reserved</td><td>reserved</td></tr>
<tr><td>FOLLOWING</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>FOR</td><td>reserved</td><td>non-reserved</td><td>reserved</td></tr>
<tr><td>FOREIGN</td><td>reserved</td><td>non-reserved</td><td>reserved</td></tr>
Expand Down Expand Up @@ -151,6 +152,7 @@ Below is a list of all the keywords in Spark SQL.
<tr><td>JOIN</td><td>reserved</td><td>strict-non-reserved</td><td>reserved</td></tr>
<tr><td>KEYS</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>LAST</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>LAST_VALUE</td><td>reserved</td><td>non-reserved</td><td>reserved</td></tr>
<tr><td>LATERAL</td><td>non-reserved</td><td>non-reserved</td><td>reserved</td></tr>
<tr><td>LAZY</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>LEADING</td><td>reserved</td><td>non-reserved</td><td>reserved</td></tr>
Expand Down Expand Up @@ -219,6 +221,7 @@ Below is a list of all the keywords in Spark SQL.
<tr><td>REPAIR</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>REPLACE</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>RESET</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>RESPECT</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>RESTRICT</td><td>non-reserved</td><td>non-reserved</td><td>non-reserved</td></tr>
<tr><td>REVOKE</td><td>non-reserved</td><td>non-reserved</td><td>reserved</td></tr>
<tr><td>RIGHT</td><td>reserved</td><td>strict-non-reserved</td><td>reserved</td></tr>
Expand Down
11 changes: 9 additions & 2 deletions sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ primaryExpression
| CASE value=expression whenClause+ (ELSE elseExpression=expression)? END #simpleCase
| CAST '(' expression AS dataType ')' #cast
| STRUCT '(' (argument+=namedExpression (',' argument+=namedExpression)*)? ')' #struct
| FIRST '(' expression (IGNORE NULLS)? ')' #first
| LAST '(' expression (IGNORE NULLS)? ')' #last
| (FIRST | FIRST_VALUE) '(' expression ((IGNORE | RESPECT) NULLS)? ')' #first
| (LAST | LAST_VALUE) '(' expression ((IGNORE | RESPECT) NULLS)? ')' #last
| POSITION '(' substr=valueExpression IN str=valueExpression ')' #position
| constant #constantDefault
| ASTERISK #star
Expand Down Expand Up @@ -1023,6 +1023,7 @@ ansiNonReserved
| REPAIR
| REPLACE
| RESET
| RESPECT
| RESTRICT
| REVOKE
| RLIKE
Expand Down Expand Up @@ -1184,6 +1185,7 @@ nonReserved
| FIELDS
| FILEFORMAT
| FIRST
| FIRST_VALUE
| FOLLOWING
| FOR
| FOREIGN
Expand Down Expand Up @@ -1214,6 +1216,7 @@ nonReserved
| ITEMS
| KEYS
| LAST
| LAST_VALUE
| LATERAL
| LAZY
| LEADING
Expand Down Expand Up @@ -1278,6 +1281,7 @@ nonReserved
| REPAIR
| REPLACE
| RESET
| RESPECT
| RESTRICT
| REVOKE
| RLIKE
Expand Down Expand Up @@ -1435,6 +1439,7 @@ FETCH: 'FETCH';
FIELDS: 'FIELDS';
FILEFORMAT: 'FILEFORMAT';
FIRST: 'FIRST';
FIRST_VALUE: 'FIRST_VALUE';
FOLLOWING: 'FOLLOWING';
FOR: 'FOR';
FOREIGN: 'FOREIGN';
Expand Down Expand Up @@ -1469,6 +1474,7 @@ ITEMS: 'ITEMS';
JOIN: 'JOIN';
KEYS: 'KEYS';
LAST: 'LAST';
LAST_VALUE: 'LAST_VALUE';
LATERAL: 'LATERAL';
LAZY: 'LAZY';
LEADING: 'LEADING';
Expand Down Expand Up @@ -1536,6 +1542,7 @@ RENAME: 'RENAME';
REPAIR: 'REPAIR';
REPLACE: 'REPLACE';
RESET: 'RESET';
RESPECT: 'RESPECT';
RESTRICT: 'RESTRICT';
REVOKE: 'REVOKE';
RIGHT: 'RIGHT';
Expand Down
9 changes: 9 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,15 @@ class ExpressionParserSuite extends AnalysisTest {
assertEqual("last(a)", Last('a, Literal(false)).toAggregateExpression())
}

test("Support respect nulls keywords for first_value and last_value") {
assertEqual("first_value(a ignore nulls)", First('a, Literal(true)).toAggregateExpression())
assertEqual("first_value(a respect nulls)", First('a, Literal(false)).toAggregateExpression())
assertEqual("first_value(a)", First('a, Literal(false)).toAggregateExpression())
assertEqual("last_value(a ignore nulls)", Last('a, Literal(true)).toAggregateExpression())
assertEqual("last_value(a respect nulls)", Last('a, Literal(false)).toAggregateExpression())
assertEqual("last_value(a)", Last('a, Literal(false)).toAggregateExpression())
}

test("timestamp literals") {
DateTimeTestUtils.outstandingTimezones.foreach { timeZone =>
withSQLConf(SQLConf.SESSION_LOCAL_TIMEZONE.key -> timeZone.getID) {
Expand Down
5 changes: 5 additions & 0 deletions ...lyst/src/test/scala/org/apache/spark/sql/catalyst/parser/TableIdentifierParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ class TableIdentifierParserSuite extends SparkFunSuite with SQLHelper {
"fields",
"fileformat",
"first",
"first_value",
"following",
"for",
"foreign",
Expand Down Expand Up @@ -415,6 +416,7 @@ class TableIdentifierParserSuite extends SparkFunSuite with SQLHelper {
"join",
"keys",
"last",
"last_value",
"lateral",
"lazy",
"leading",
Expand Down Expand Up @@ -483,6 +485,7 @@ class TableIdentifierParserSuite extends SparkFunSuite with SQLHelper {
"repair",
"replace",
"reset",
"respect",
"restrict",
"revoke",
"right",
Expand Down Expand Up @@ -579,6 +582,7 @@ class TableIdentifierParserSuite extends SparkFunSuite with SQLHelper {
"except",
"false",
"fetch",
"first_value",
"for",
"foreign",
"from",
Expand All @@ -593,6 +597,7 @@ class TableIdentifierParserSuite extends SparkFunSuite with SQLHelper {
"into",
"join",
"is",
"last_value",
"leading",
"left",
"minute",
Expand Down