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

[SPARK-13996][SQL] Add more not null attributes for Filter codegen #11810

Closed
wants to merge 6 commits into from
Closed

[SPARK-13996][SQL] Add more not null attributes for Filter codegen #11810

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e59a74
Add more not null attributes for Filter codegen.
viirya Mar 18, 2016
376c6f0
Fix bug.
viirya Mar 18, 2016
3d73249
Fix it.
viirya Mar 18, 2016
662c4e3
Use exprId to deal with different qualifiers between child.outout and…
viirya Mar 19, 2016
65ea0dd
Merge remote-tracking branch 'upstream/master' into add-more-not-null…
viirya Apr 2, 2016
0c7afe7
Merge remote-tracking branch 'upstream/master' into add-more-not-null…
viirya Apr 2, 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
16 changes: 10 additions & 6 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ case class Filter(condition: Expression, child: SparkPlan)

// Split out all the IsNotNulls from condition.
private val (notNullPreds, otherPreds) = splitConjunctivePredicates(condition).partition {
case IsNotNull(a) if child.output.contains(a) => true
case IsNotNull(a) if a.references.subsetOf(child.outputSet) => true
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not correct, for example, IsNotNull(IsNull(a)) does not means a can not be null.

Copy link
Member Author

Choose a reason for hiding this comment

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

ah, you are right. With the NullIntolerant trait introduced in #11809, we can solve this easily. Wait for that PR to be ready then we can re-visit this. Thanks!

case _ => false
}

// The columns that will filtered out by `IsNotNull` could be considered as not nullable.
private val notNullAttributes = notNullPreds.flatMap(_.references)
private val notNullAttributes = notNullPreds.flatMap(_.references).distinct.map(_.exprId)
Copy link
Member Author

Choose a reason for hiding this comment

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

The attributes from conditions can have different qualifiers than child.output, which makes later indexOf call failed. So here use exprId instead.


override def output: Seq[Attribute] = {
child.output.map { a =>
if (a.nullable && notNullAttributes.contains(a)) {
if (a.nullable && notNullAttributes.contains(a.exprId)) {
a.withNullability(false)
} else {
a
Expand All @@ -112,8 +112,12 @@ case class Filter(condition: Expression, child: SparkPlan)

// filter out the nulls
val filterOutNull = notNullAttributes.map { a =>
val idx = child.output.indexOf(a)
s"if (${input(idx).isNull}) continue;"
val idx = child.output.map(_.exprId).indexOf(a)
if (idx != -1) {
s"if (${input(idx).isNull}) continue;"
} else {
""
}
}.mkString("\n")

ctx.currentVars = input
Expand All @@ -135,7 +139,7 @@ case class Filter(condition: Expression, child: SparkPlan)
// Reset the isNull to false for the not-null columns, then the followed operators could
// generate better code (remove dead branches).
val resultVars = input.zipWithIndex.map { case (ev, i) =>
if (notNullAttributes.contains(child.output(i))) {
if (notNullAttributes.contains(child.output(i).exprId)) {
ev.isNull = "false"
}
ev
Expand Down