Skip to content

[SPARK-29213][SQL] Generate extra IsNotNull predicate in FilterExec #25902

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
wangshuo128 wants to merge 8 commits into from
Closed

[SPARK-29213][SQL] Generate extra IsNotNull predicate in FilterExec #25902

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad6df5c
[SPARK-29213] Make it consistent when get notnull output and generate…
wangshuo128 Sep 23, 2019
270172b
remove exprId both in notNullPreds and otherPreds when get notNullAtt…
wangshuo128 Sep 24, 2019
9ad9723
modify test table names
wangshuo128 Sep 24, 2019
c03dd95
Some slight modifications so we no longer depend on Hive.
wangshuo128 Sep 25, 2019
30e2ac7
Generate extra IsNotNull predicate for null check
wangshuo128 Sep 25, 2019
8480de2
Address some comments
wangshuo128 Sep 26, 2019
a8cb828
Code sytle modification
wangshuo128 Sep 26, 2019
124ad87
Refine test
wangshuo128 Sep 26, 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
Prev Previous commit
Next Next commit
Address some comments
  • Loading branch information
@wangshuo128
wangshuo128 committed Sep 27, 2019
commit 8480de279f283d0f5a8437f91a43b4e8a23e82b9
10 changes: 3 additions & 7 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/basicPhysicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,7 @@ case class FilterExec(condition: Expression, child: SparkPlan)
// TODO: revisit this. We can consider reordering predicates as well.
val generatedIsNotNullChecks = new Array[Boolean](notNullPreds.length)

val extraIsNotNullReferences = mutable.Set[Attribute]()

def outputContainsNotNull(ref: Attribute): Boolean = {
output.exists { attr => attr.exprId == ref.exprId }
}
val extraIsNotNullAttrs = mutable.Set[Attribute]()

val generated = otherPreds.map { c =>
val nullChecks = c.references.map { r =>
Expand All @@ -186,8 +182,8 @@ case class FilterExec(condition: Expression, child: SparkPlan)
generatedIsNotNullChecks(idx) = true
// Use the child's output. The nullability is what the child produced.
genPredicate(notNullPreds(idx), input, child.output)
} else if (outputContainsNotNull(r) && !extraIsNotNullReferences.contains(r)) {
extraIsNotNullReferences += r
} else if (notNullAttributes.contains(r.exprId) && !extraIsNotNullAttrs.contains(r)) {
extraIsNotNullAttrs += r
genPredicate(IsNotNull(r), input, child.output)
} else {
""
Expand Down
3 changes: 1 addition & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3234,8 +3234,7 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession {
}
}

test("SPARK-29213 Make it consistent when get notnull output and generate null " +
"checks in FilterExec") {
test("SPARK-29213: FilterExec should not throw NPE") {
withView("t1", "t2", "t3") {
Copy link
Member

@maropu maropu Sep 26, 2019

Choose a reason for hiding this comment

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

nit: withView -> withTempView

sql("select ''").as[String].map(identity).toDF("x").createOrReplaceTempView("t1")
sql("select * from values 0, cast(null as bigint)")
Expand Down