Skip to content

[SPARK-17098][SQL] Fix NullPropagation optimizer to handle COUNT(NULL) OVER correctly #14689

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-17098][SQL] Fix NullPropagation optimizer to handle COUNT(NULL) OVER correctly #14689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6927c5
[SPARK-17098][SQL] Fix `NullPropagation` optimizer to handle `COUNT(N…
dongjoon-hyun Aug 17, 2016
25aa91d
Move testcase to `null-propagation.sql`.
dongjoon-hyun Aug 18, 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
2 changes: 2 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,8 @@ object NullPropagation extends Rule[LogicalPlan] {

def apply(plan: LogicalPlan): LogicalPlan = plan transform {
case q: LogicalPlan => q transformExpressionsUp {
case e @ WindowExpression(Cast(Literal(0L, _), _), _) =>

@rxin rxin Aug 18, 2016

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.

is there a unit test suite for NullPropagation?

@dongjoon-hyun dongjoon-hyun Aug 18, 2016

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.

I can't find that. I think there does not exist.

@dongjoon-hyun dongjoon-hyun Aug 18, 2016

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.

Thank you for review, @rxin .

Cast(Literal(0L), e.dataType)
case e @ AggregateExpression(Count(exprs), _, _, _) if !exprs.exists(nonNullLiteral) =>
Cast(Literal(0L), e.dataType)
case e @ IsNull(c) if !c.nullable => Literal.create(false, BooleanType)
Expand Down
9 changes: 9 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/null-propagation.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

-- count(null) should be 0
SELECT COUNT(NULL) FROM VALUES 1, 2, 3;
SELECT COUNT(1 + NULL) FROM VALUES 1, 2, 3;

-- count(null) on window should be 0
SELECT COUNT(NULL) OVER () FROM VALUES 1, 2, 3;
SELECT COUNT(1 + NULL) OVER () FROM VALUES 1, 2, 3;

38 changes: 38 additions & 0 deletions sql/core/src/test/resources/sql-tests/results/null-propagation.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 4


-- !query 0
SELECT COUNT(NULL) FROM VALUES 1, 2, 3
-- !query 0 schema
struct<count(NULL):bigint>
-- !query 0 output
0


-- !query 1
SELECT COUNT(1 + NULL) FROM VALUES 1, 2, 3
-- !query 1 schema
struct<count((1 + CAST(NULL AS INT))):bigint>
-- !query 1 output
0


-- !query 2
SELECT COUNT(NULL) OVER () FROM VALUES 1, 2, 3
-- !query 2 schema
struct<count(NULL) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING):bigint>
-- !query 2 output
0
0
0


-- !query 3
SELECT COUNT(1 + NULL) OVER () FROM VALUES 1, 2, 3
-- !query 3 schema
struct<count((1 + CAST(NULL AS INT))) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING):bigint>
-- !query 3 output
0
0
0