Skip to content

[SPARK-25979][SQL] Window function: allow parentheses around window reference #22987

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
gengliangwang wants to merge 3 commits into from
Closed

[SPARK-25979][SQL] Window function: allow parentheses around window reference #22987

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9d01df
fix
gengliangwang Nov 8, 2018
2da6f99
use window.sql for testing
gengliangwang Nov 9, 2018
471092d
add newline
gengliangwang Nov 9, 2018
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
1 change: 1 addition & 0 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 @@ -691,6 +691,7 @@ namedWindow

windowSpec
: name=identifier #windowRef
| '('name=identifier')' #windowRef
| '('
( CLUSTER BY partition+=expression (',' partition+=expression)*
| ((PARTITION | DISTRIBUTE) BY partition+=expression (',' partition+=expression)*)?
Expand Down
38 changes: 38 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/SQLWindowFunctionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import org.apache.spark.sql.test.SharedSQLContext

case class WindowData(month: Int, area: String, product: Int)
case class EmpSalary(empno: Int, depname: String, salary: Double)


/**
Expand All @@ -31,6 +32,19 @@ class SQLWindowFunctionSuite extends QueryTest with SharedSQLContext {

import testImplicits._

val empSalaryData = Seq(

@gengliangwang gengliangwang Nov 8, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

The table and data here is from: https://www.postgresql.org/docs/9.1/tutorial-window.html

The naming and data is easier to be understood. In case we need to compare more behavior, we can use this one as alternative.
I can use the WindowData and remove this as well.

@cloud-fan cloud-fan Nov 8, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we just add a new test in window.sql?

@cloud-fan cloud-fan Nov 8, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We really just need a simple test that proves over (w) works.

EmpSalary(11, "develop", 5200D),
EmpSalary(7, "develop", 4200D),
EmpSalary(9, "develop", 4500D),
EmpSalary(8, "develop", 6000D),
EmpSalary(10, "develop", 5200D),
EmpSalary(5, "personnel", 3500D),
EmpSalary(2, "personnel", 3900D),
EmpSalary(3, "sales", 4800D),
EmpSalary(1, "sales", 5000D),
EmpSalary(4, "sales", 4800D)
)

test("window function: udaf with aggregate expression") {
val data = Seq(
WindowData(1, "a", 5),
Expand Down Expand Up @@ -173,6 +187,30 @@ class SQLWindowFunctionSuite extends QueryTest with SharedSQLContext {
).map(i => Row(i._1, i._2, i._3, i._4)))
}

test("window function: allow parentheses around window reference") {
sparkContext.parallelize(empSalaryData).toDF().createOrReplaceTempView("empsalary")

checkAnswer(
sql(
"""
|SELECT sum(salary) OVER (w), avg(salary) OVER w
|FROM empsalary
|WINDOW w AS (PARTITION BY depname ORDER BY salary DESC)
""".stripMargin),
Seq(
(6000, 6000),
(16400, 5466.6666666666666667D),
(16400, 5466.6666666666666667),
(20900, 5225),
(25100, 5020),
(3900, 3900),
(7400, 3700),
(5000, 5000),
(14600, 4866.6666666666666667),
(14600, 4866.6666666666666667)
).map(i => Row(i._1, i._2)))
}

test("window function: distinct should not be silently ignored") {
val data = Seq(
WindowData(1, "a", 5),
Expand Down