Skip to content

Commit fd522ea

Browse files
committed
rename ReuseMap methods
1 parent 8b50e81 commit fd522ea

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/util/ReuseMap.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ReuseMap[T <: QueryPlan[_]] {
4242
* @param plan the input plan
4343
* @return the matching plan or the input plan
4444
*/
45-
def lookup(plan: T): T = {
45+
def lookupOrElseAdd(plan: T): T = {
4646
val (firstSameSchemaPlan, sameResultPlans) = map.getOrElseUpdate(plan.schema, plan -> Map())
4747
if (firstSameSchemaPlan ne plan) {
4848
if (sameResultPlans.isEmpty) {
@@ -62,8 +62,8 @@ class ReuseMap[T <: QueryPlan[_]] {
6262
* @param f the function to apply
6363
* @return the matching plan with `f` applied or the input plan
6464
*/
65-
def addOrElse[T2 >: T](plan: T, f: T => T2): T2 = {
66-
val found = lookup(plan)
65+
def reuseOrElseAdd[T2 >: T](plan: T, f: T => T2): T2 = {
66+
val found = lookupOrElseAdd(plan)
6767
if (found eq plan) {
6868
plan
6969
} else {

sql/core/src/main/scala/org/apache/spark/sql/execution/reuse/ReuseExchangeAndSubquery.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ case class ReuseExchangeAndSubquery(conf: SQLConf) extends Rule[SparkPlan] {
3636

3737
def reuse(plan: SparkPlan): SparkPlan = plan.transformUp {
3838
case exchange: Exchange if conf.exchangeReuseEnabled =>
39-
exchanges.addOrElse(exchange, ReusedExchangeExec(exchange.output, _))
39+
exchanges.reuseOrElseAdd(exchange, ReusedExchangeExec(exchange.output, _))
4040

4141
case other => other.transformExpressionsUp {
4242
case sub: ExecSubqueryExpression =>
4343
val subquery = reuse(sub.plan).asInstanceOf[BaseSubqueryExec]
4444
sub.withNewPlan(
4545
if (conf.subqueryReuseEnabled) {
46-
subqueries.addOrElse(subquery, ReusedSubqueryExec(_))
46+
subqueries.reuseOrElseAdd(subquery, ReusedSubqueryExec(_))
4747
} else {
4848
subquery
4949
}

0 commit comments

Comments
 (0)