Skip to content

[SPARK-12577][SQL] Better support of parentheses in partition by and order by clause of window function's over clause #10620

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
viirya wants to merge 5 commits into from
Closed

[SPARK-12577][SQL] Better support of parentheses in partition by and order by clause of window function's over clause #10620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae1aa8a
Better support of parentheses in partition by.
viirya Jan 6, 2016
419992f
Merge remote-tracking branch 'upstream/master' into fix-parentheses
viirya Jan 7, 2016
d0511c0
Remove old ExpressionParser.g.
viirya Jan 7, 2016
b87240e
Merge remote-tracking branch 'upstream/master' into fix-parentheses
viirya Jan 9, 2016
119a055
Move test cases.
viirya Jan 9, 2016
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
7 changes: 6 additions & 1 deletion sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/ExpressionParser.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@ precedenceUnaryPrefixExpression
;

precedenceUnarySuffixExpression
: precedenceUnaryPrefixExpression (a=KW_IS nullCondition)?
:
(
(LPAREN precedenceUnaryPrefixExpression RPAREN) => LPAREN precedenceUnaryPrefixExpression (a=KW_IS nullCondition)? RPAREN
Copy link
Contributor

@davies davies Jan 8, 2016

Choose a reason for hiding this comment

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

Does this support (a is null) ?

Copy link
Member Author

@viirya viirya Jan 9, 2016

Choose a reason for hiding this comment

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

Yes. I think so.

|
precedenceUnaryPrefixExpression (a=KW_IS nullCondition)?
)
-> {$a != null}? ^(TOK_FUNCTION nullCondition precedenceUnaryPrefixExpression)
-> precedenceUnaryPrefixExpression
;
Expand Down
36 changes: 26 additions & 10 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,33 @@ package org.apache.spark.sql.catalyst
import org.apache.spark.sql.catalyst.plans.PlanTest

class CatalystQlSuite extends PlanTest {
val parser = new CatalystQl()

test("parse union/except/intersect") {
val paresr = new CatalystQl()
paresr.createPlan("select * from t1 union all select * from t2")
paresr.createPlan("select * from t1 union distinct select * from t2")
paresr.createPlan("select * from t1 union select * from t2")
paresr.createPlan("select * from t1 except select * from t2")
paresr.createPlan("select * from t1 intersect select * from t2")
paresr.createPlan("(select * from t1) union all (select * from t2)")
paresr.createPlan("(select * from t1) union distinct (select * from t2)")
paresr.createPlan("(select * from t1) union (select * from t2)")
paresr.createPlan("select * from ((select * from t1) union (select * from t2)) t")
parser.createPlan("select * from t1 union all select * from t2")
parser.createPlan("select * from t1 union distinct select * from t2")
parser.createPlan("select * from t1 union select * from t2")
parser.createPlan("select * from t1 except select * from t2")
parser.createPlan("select * from t1 intersect select * from t2")
parser.createPlan("(select * from t1) union all (select * from t2)")
parser.createPlan("(select * from t1) union distinct (select * from t2)")
parser.createPlan("(select * from t1) union (select * from t2)")
parser.createPlan("select * from ((select * from t1) union (select * from t2)) t")
}

test("window function: better support of parentheses") {
parser.createPlan("select sum(product + 1) over (partition by ((1) + (product / 2)) " +
"order by 2) from windowData")
parser.createPlan("select sum(product + 1) over (partition by (1 + (product / 2)) " +
"order by 2) from windowData")
parser.createPlan("select sum(product + 1) over (partition by ((product / 2) + 1) " +
"order by 2) from windowData")

parser.createPlan("select sum(product + 1) over (partition by ((product) + (1)) order by 2) " +
"from windowData")
parser.createPlan("select sum(product + 1) over (partition by ((product) + 1) order by 2) " +
"from windowData")
parser.createPlan("select sum(product + 1) over (partition by (product + (1)) order by 2) " +
"from windowData")
}
}