-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-13839][SQL] Defer input evaluation and fix Cast issue in IsNotNull filtering for Filter codegen #11676
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.
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
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ import org.apache.spark.rdd.{PartitionwiseSampledRDD, RDD} | |
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, ExprCode, ExpressionCanonicalizer} | ||
| import org.apache.spark.sql.catalyst.planning.Casts | ||
| import org.apache.spark.sql.catalyst.plans.physical._ | ||
| import org.apache.spark.sql.execution.metric.{LongSQLMetricValue, SQLMetrics} | ||
| import org.apache.spark.sql.types.LongType | ||
|
|
@@ -80,12 +81,21 @@ 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) => | ||
| a match { | ||
| case Casts(a) if child.output.contains(a) => true | ||
| case _ => false | ||
| } | ||
| case _ => false | ||
| } | ||
|
|
||
| // The columns that will filtered out by `IsNotNull` could be considered as not nullable. | ||
| // The columns that will be filtered out by `IsNotNull` could be considered as not nullable. | ||
| private val notNullAttributes = notNullPreds.flatMap(_.references) | ||
|
|
||
| // only the attributes those will be filtered out by `IsNotNull` should be evaluated | ||
| // before this plan, otherwise we could defer the evaluation until filtering out nulls. | ||
| override def usedInputs: AttributeSet = AttributeSet(notNullAttributes) | ||
|
|
||
| override def output: Seq[Attribute] = { | ||
| child.output.map { a => | ||
| if (a.nullable && notNullAttributes.contains(a)) { | ||
|
|
@@ -110,6 +120,9 @@ case class Filter(condition: Expression, child: SparkPlan) | |
| override def doConsume(ctx: CodegenContext, input: Seq[ExprCode], row: String): String = { | ||
| val numOutput = metricTerm(ctx, "numOutputRows") | ||
|
|
||
| val evaluated = | ||
| evaluateRequiredVariables(child.output, input, references -- usedInputs) | ||
|
|
||
| // filter out the nulls | ||
| val filterOutNull = notNullAttributes.map { a => | ||
| val idx = child.output.indexOf(a) | ||
|
|
@@ -142,6 +155,7 @@ case class Filter(condition: Expression, child: SparkPlan) | |
| } | ||
| s""" | ||
| |$filterOutNull | ||
| |$evaluated | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd like not to make this even complicated for this tiny benefits.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok. then let me close this. |
||
| |$predicates | ||
| |$numOutput.add(1); | ||
| |${consume(ctx, resultVars)} | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not add these corner cases here, they should be handled by constraints.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok. I will send other PR for this.