-
Notifications
You must be signed in to change notification settings - Fork 29.3k
[SPARK-41049][SQL] Revisit stateful expression handling #39248
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.expressions | ||
|
|
||
| import org.apache.spark.sql.internal.SQLConf | ||
|
|
||
| // A helper class to evaluate expressions. | ||
| trait ExpressionsEvaluator { | ||
| protected lazy val runtime = | ||
| new SubExprEvaluationRuntime(SQLConf.get.subexpressionEliminationCacheMaxEntries) | ||
|
|
||
| protected def prepareExpressions( | ||
| exprs: Seq[Expression], | ||
| subExprEliminationEnabled: Boolean): Seq[Expression] = { | ||
| // We need to make sure that we do not reuse stateful expressions. | ||
| val cleanedExpressions = exprs.map(_.freshCopyIfContainsStatefulExpression()) | ||
| if (subExprEliminationEnabled) { | ||
| runtime.proxyExpressions(cleanedExpressions) | ||
|
Comment on lines
32
to
33
Member
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. Hmm, will sub-expr elimination extract common stateful expressions as common expr and break the rule (not reusing)?
Contributor
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. 2 stateful but deterministic expressions always produce the same result given the same input sequence. So it's OK to apply sub-expr elimination. |
||
| } else { | ||
| cleanedExpressions | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Initializes internal states given the current partition index. | ||
| * This is used by nondeterministic expressions to set initial states. | ||
| * The default implementation does nothing. | ||
| */ | ||
| def initialize(partitionIndex: Int): Unit = {} | ||
|
Member
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. This should be called after
Contributor
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. yes
Contributor
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. or more specifically, the implementation should initialize the final expression that it actually uses. |
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,18 +36,12 @@ class InterpretedMutableProjection(expressions: Seq[Expression]) extends Mutable | |
| this(bindReferences(expressions, inputSchema)) | ||
|
|
||
| private[this] val subExprEliminationEnabled = SQLConf.get.subexpressionEliminationEnabled | ||
| private[this] lazy val runtime = | ||
| new SubExprEvaluationRuntime(SQLConf.get.subexpressionEliminationCacheMaxEntries) | ||
| private[this] val exprs = if (subExprEliminationEnabled) { | ||
| runtime.proxyExpressions(expressions) | ||
| } else { | ||
| expressions | ||
| } | ||
| private[this] val exprs = prepareExpressions(expressions, subExprEliminationEnabled) | ||
|
|
||
| private[this] val buffer = new Array[Any](expressions.size) | ||
|
|
||
| override def initialize(partitionIndex: Int): Unit = { | ||
| expressions.foreach(_.foreach { | ||
| exprs.foreach(_.foreach { | ||
|
Contributor
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. This is a pre-existing bug. The final expressions we use is |
||
| case n: Nondeterministic => n.initialize(partitionIndex) | ||
| case _ => | ||
| }) | ||
|
|
@@ -117,10 +111,6 @@ object InterpretedMutableProjection { | |
| * Returns a [[MutableProjection]] for given sequence of bound Expressions. | ||
| */ | ||
| def createProjection(exprs: Seq[Expression]): MutableProjection = { | ||
| // We need to make sure that we do not reuse stateful expressions. | ||
| val cleanedExpressions = exprs.map(_.transform { | ||
| case s: Stateful => s.freshCopy() | ||
|
Contributor
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. The old usage of Let's say that we have a tree which looks like this:
where When the At the next level up, Middle will check whether any of its children have been changed in the recursive bottom-up transformation (see childrenFastEquals() in withNewChildren(), which is called from Finally, at the top level, In other words, the old In this PR I chose to fix this by adding a
Member
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. Oh, this is a nice catch! |
||
| }) | ||
| new InterpretedMutableProjection(cleanedExpressions) | ||
| new InterpretedMutableProjection(exprs) | ||
| } | ||
| } | ||
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.
The keys in
tagsstill refer to original tree node. Is it okay?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.
How is this possible? keys are basically strings, right?
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.
Note: the code here basically follows
TreeNode.withNewChildrenThere 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.
Yea, you're correct. It is just a string for node name.