Skip to content
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

Jump to bottom

[window] Disable GPU for COUNT(exp) queries #666

Merged
merged 1 commit into from
Sep 5, 2020
Merged

[window] Disable GPU for COUNT(exp) queries #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuWindowExpression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,13 @@ class GpuWindowExpressionMeta(
windowFunction match {
case aggregateExpression : AggregateExpression =>
aggregateExpression.aggregateFunction match {
case Count(_) | Sum(_) | Min(_) | Max(_) => // Supported.
case Count(exp) => {
if (!exp.forall(x => x.isInstanceOf[Literal])) {
willNotWorkOnGpu(s"Currently, only COUNT(1) and COUNT(*) are supported. " +
s"COUNT($exp) is not supported in windowing.")
}
}
case Sum(_) | Min(_) | Max(_) => // Supported.
case other: AggregateFunction =>
willNotWorkOnGpu(s"AggregateFunction ${other.prettyName} " +
s"is not supported in windowing.")
Expand Down
Binary file modified tests/src/test/resources/window-function-test.orc
View file
Open in desktop
Binary file not shown.
32 changes: 29 additions & 3 deletions tests/src/test/scala/com/nvidia/spark/rapids/WindowFunctionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class WindowFunctionSuite extends SparkQueryCompareTestSuite {
sum("dollars").over(windowSpec),
min("dollars").over(windowSpec),
max("dollars").over(windowSpec),
count("dollars").over(windowSpec),
count("*").over(windowSpec)
)

Expand All @@ -36,7 +35,6 @@ class WindowFunctionSuite extends SparkQueryCompareTestSuite {
sum("dollars").over(windowSpec),
min("dollars").over(windowSpec),
max("dollars").over(windowSpec),
count("dollars").over(windowSpec),
row_number().over(windowSpec),
count("*").over(windowSpec)
)
Expand Down Expand Up @@ -130,7 +128,7 @@ class WindowFunctionSuite extends SparkQueryCompareTestSuite {
| SUM(dollars) OVER $windowClause,
| MIN(dollars) OVER $windowClause,
| MAX(dollars) OVER $windowClause,
| COUNT(dollars) OVER $windowClause,
| COUNT(1) OVER $windowClause,
| COUNT(*) OVER $windowClause
| FROM mytable
|
Expand Down Expand Up @@ -406,4 +404,32 @@ class WindowFunctionSuite extends SparkQueryCompareTestSuite {
// scalastyle:on line.size.limit
}
}

ALLOW_NON_GPU_testSparkResultsAreEqual(
"[Window] [RANGE] [ ASC] [-2 DAYS, 3 DAYS] ",
windowTestDfOrc,
Seq("AggregateExpression",
"Alias",
"AttributeReference",
"Count",
"Literal",
"SpecifiedWindowFrame",
"WindowExec",
"WindowExpression",
"WindowSpecDefinition")) {
(df : DataFrame) => {
df.createOrReplaceTempView("mytable")
// scalastyle:off line.size.limit
df.sparkSession.sql(
"""
| SELECT COUNT(dollars+1) OVER
| (PARTITION BY uid
| ORDER BY CAST(dateLong AS TIMESTAMP) ASC
| RANGE BETWEEN INTERVAL 2 DAYS PRECEDING AND INTERVAL 3 DAYS FOLLOWING)
| FROM mytable
|
|""".stripMargin)
// scalastyle:on line.size.limit
}
}
}