This is an automated email from the ASF dual-hosted git repository. wenchen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new ddb8a4036c2 [SPARK-39277][SQL] Make Optimizer extends SQLConfHelper and remove incorrect comment ddb8a4036c2 is described below commit ddb8a4036c28b7893713b1565cc0de3d60bd363b Author: Yuming Wang <yumw...@ebay.com> AuthorDate: Thu May 26 12:08:13 2022 +0800 [SPARK-39277][SQL] Make Optimizer extends SQLConfHelper and remove incorrect comment ### What changes were proposed in this pull request? Make Optimizer extends SQLConfHelper and remove incorrect comment. ### Why are the changes needed? Make the code easier to maintain. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test. Closes #36657 from wangyum/SPARK-39277. Authored-by: Yuming Wang <yumw...@ebay.com> Signed-off-by: Wenchen Fan <wenc...@databricks.com> --- .../org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index 6b9746a880f..a84959f0991 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -19,6 +19,7 @@ package org.apache.spark.sql.catalyst.optimizer import scala.collection.mutable +import org.apache.spark.sql.catalyst.SQLConfHelper import org.apache.spark.sql.catalyst.analysis._ import org.apache.spark.sql.catalyst.catalog.{InMemoryCatalog, SessionCatalog} import org.apache.spark.sql.catalyst.expressions._ @@ -40,7 +41,7 @@ import org.apache.spark.util.Utils * Optimizers can override this. */ abstract class Optimizer(catalogManager: CatalogManager) - extends RuleExecutor[LogicalPlan] { + extends RuleExecutor[LogicalPlan] with SQLConfHelper { // Check for structural integrity of the plan in test mode. // Currently we check after the execution of each rule if a plan: @@ -65,7 +66,7 @@ abstract class Optimizer(catalogManager: CatalogManager) protected def fixedPoint = FixedPoint( - SQLConf.get.optimizerMaxIterations, + conf.optimizerMaxIterations, maxIterationsSetting = SQLConf.OPTIMIZER_MAX_ITERATIONS.key) /** @@ -142,8 +143,6 @@ abstract class Optimizer(catalogManager: CatalogManager) InferFiltersFromConstraints) :: Batch("Operator Optimization after Inferring Filters", fixedPoint, operatorOptimizationRuleSet: _*) :: - // Set strategy to Once to avoid pushing filter every time because we do not change the - // join condition. Batch("Push extra predicate through join", fixedPoint, PushExtraPredicateThroughJoin, PushDownPredicates) :: Nil @@ -389,7 +388,7 @@ abstract class Optimizer(catalogManager: CatalogManager) */ final override def batches: Seq[Batch] = { val excludedRulesConf = - SQLConf.get.optimizerExcludedRules.toSeq.flatMap(Utils.stringToSeq) + conf.optimizerExcludedRules.toSeq.flatMap(Utils.stringToSeq) val excludedRules = excludedRulesConf.filter { ruleName => val nonExcludable = nonExcludableRules.contains(ruleName) if (nonExcludable) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org