Skip to content

[SPARK-56032][SQL][FOLLOW-UP] Fix comments in FilterExec CSE #54975

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

Open
LuciferYang wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −2
Open

[SPARK-56032][SQL][FOLLOW-UP] Fix comments in FilterExec CSE #54975

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91cddde
address comments
LuciferYang Mar 24, 2026
dada1b4
fix style
LuciferYang Mar 24, 2026
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
11 changes: 9 additions & 2 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 @@ -259,8 +259,8 @@ case class FilterExec(condition: Expression, child: SparkPlan)
val boundOtherPreds = otherPreds.map(
BindReferences.bindReference(_, output))
// Pre-evaluate input variables before CSE analysis: CSE clears
// ctx.currentVars[i].code as a side effect, which causes "is not an rvalue"
// errors if notNullPreds reference the same inputs.
// ctx.currentVars[i].code as a side effect; without this pre-evaluation, Janino fails
// with "Unknown variable or type" when notNullPreds reference the same input columns.
val otherPredInputAttrs = AttributeSet(otherPreds.flatMap(_.references))
val inputVarsEvalCode = evaluateRequiredVariables(
child.output, input, otherPredInputAttrs)
Expand All @@ -275,6 +275,13 @@ case class FilterExec(condition: Expression, child: SparkPlan)
}
code
}
// Note: subExprs.exprCodesNeedEvaluate is intentionally not used here, unlike ProjectExec.
// evaluateRequiredVariables above cleared input[i].code = EmptyBlock for all
// otherPredInputAttrs before CSE analysis ran, so getLocalInputVariableValues never
// adds them to exprCodesNeedEvaluate -- it is always empty. Do NOT replace the
// pre-evaluation above with evaluateVariables(subExprs.exprCodesNeedEvaluate):
// that would leave notNullPreds referencing undeclared variables (Janino: "Unknown
// variable or type") for any input column shared between notNullPreds and otherPreds.
(inputVarsEvalCode, ctx.evaluateSubExprEliminationState(subExprs.states.values), predCode)
} else {
("", "", generatePredicateCode(
Expand Down