-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-24802][SQL] Add a new config for Optimization Rule Exclusion #21764
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
eaec2f5
84f1a6b
ff23edf
b154979
87afe4f
39b6ce9
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 |
|---|---|---|
|
|
@@ -127,6 +127,14 @@ object SQLConf { | |
| } | ||
| } | ||
|
|
||
| val OPTIMIZER_EXCLUDED_RULES = buildConf("spark.sql.optimizer.excludedRules") | ||
| .doc("Configures a list of rules to be disabled in the optimizer, in which the rules are " + | ||
| "specified by their rule names and separated by comma. It is not guaranteed that all the " + | ||
| "rules in this configuration will eventually be excluded, as some rules are necessary " + | ||
|
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 don't understand the optimizer at a low level (I'd be one of those users for which it is a blackbox), would you think it would be feasible to enumerate the rules that cannot be excluded ? Maybe even logging a WARNING when validating the config parameters if it contains required rules 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. Nice suggestion! @gatorsmile's other suggestion was to introduce a blacklist, in which case this enumeration of rules that cannot be excluded can be made possible. I can do a warning as well. |
||
| "for correctness. The optimizer will log the rules that have indeed been excluded.") | ||
| .stringConf | ||
| .createOptional | ||
|
|
||
| val OPTIMIZER_MAX_ITERATIONS = buildConf("spark.sql.optimizer.maxIterations") | ||
| .internal() | ||
| .doc("The max number of iterations the optimizer and analyzer runs.") | ||
|
|
@@ -1383,6 +1391,8 @@ class SQLConf extends Serializable with Logging { | |
|
|
||
| /** ************************ Spark SQL Params/Hints ******************* */ | ||
|
|
||
| def optimizerExcludedRules: Option[String] = getConf(OPTIMIZER_EXCLUDED_RULES) | ||
|
|
||
| def optimizerMaxIterations: Int = getConf(OPTIMIZER_MAX_ITERATIONS) | ||
|
|
||
| def optimizerInSetConversionThreshold: Int = getConf(OPTIMIZER_INSET_CONVERSION_THRESHOLD) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * 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.optimizer | ||
|
|
||
| import org.apache.spark.sql.catalyst.dsl.expressions._ | ||
| import org.apache.spark.sql.catalyst.dsl.plans._ | ||
| import org.apache.spark.sql.catalyst.plans.PlanTest | ||
| import org.apache.spark.sql.catalyst.plans.logical.LocalRelation | ||
| import org.apache.spark.sql.internal.SQLConf.OPTIMIZER_EXCLUDED_RULES | ||
|
|
||
|
|
||
| class OptimizerRuleExclusionSuite extends PlanTest { | ||
|
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. Any test case for when a required rule is being passed as a "to be excluded" rule ? 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. Added :) |
||
|
|
||
| val testRelation = LocalRelation('a.int, 'b.int, 'c.int) | ||
|
|
||
| private def verifyExcludedRules(excludedRuleNames: Seq[String]) { | ||
| val optimizer = new SimpleTestOptimizer() | ||
| // Batches whose rules are all to be excluded should be removed as a whole. | ||
| val excludedBatchNames = optimizer.batches | ||
| .filter(batch => batch.rules.forall(rule => excludedRuleNames.contains(rule.ruleName))) | ||
| .map(_.name) | ||
|
|
||
| withSQLConf( | ||
| OPTIMIZER_EXCLUDED_RULES.key -> excludedRuleNames.foldLeft("")((l, r) => l + "," + r)) { | ||
| val batches = optimizer.batches | ||
| assert(batches.forall(batch => !excludedBatchNames.contains(batch.name))) | ||
| assert( | ||
| batches | ||
| .forall(batch => batch.rules.forall(rule => !excludedRuleNames.contains(rule.ruleName)))) | ||
| } | ||
| } | ||
|
|
||
| test("Exclude a single rule from multiple batches") { | ||
| verifyExcludedRules( | ||
| Seq( | ||
| PushPredicateThroughJoin.ruleName)) | ||
| } | ||
|
|
||
| test("Exclude multiple rules from single or multiple batches") { | ||
| verifyExcludedRules( | ||
| Seq( | ||
| CombineUnions.ruleName, | ||
| RemoveLiteralFromGroupExpressions.ruleName, | ||
| RemoveRepetitionFromGroupExpressions.ruleName)) | ||
| } | ||
|
|
||
| test("Exclude non-existent rule with other valid rules") { | ||
| verifyExcludedRules( | ||
| Seq( | ||
| LimitPushDown.ruleName, | ||
| InferFiltersFromConstraints.ruleName, | ||
| "DummyRuleName")) | ||
| } | ||
|
|
||
| test("Try to exclude a non-excludable rule") { | ||
| val excludedRules = Seq( | ||
| ReplaceIntersectWithSemiJoin.ruleName, | ||
| PullupCorrelatedPredicates.ruleName) | ||
|
|
||
| val optimizer = new SimpleTestOptimizer() | ||
|
|
||
| withSQLConf( | ||
| OPTIMIZER_EXCLUDED_RULES.key -> excludedRules.foldLeft("")((l, r) => l + "," + r)) { | ||
| excludedRules.foreach { excludedRule => | ||
| assert( | ||
| optimizer.batches | ||
| .exists(batch => batch.rules.exists(rule => rule.ruleName == excludedRule))) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("Verify optimized plan after excluding CombineUnions rule") { | ||
| val excludedRules = Seq( | ||
| ConvertToLocalRelation.ruleName, | ||
| PropagateEmptyRelation.ruleName, | ||
| CombineUnions.ruleName) | ||
|
|
||
| withSQLConf( | ||
| OPTIMIZER_EXCLUDED_RULES.key -> excludedRules.foldLeft("")((l, r) => l + "," + r)) { | ||
| val optimizer = new SimpleTestOptimizer() | ||
| val originalQuery = testRelation.union(testRelation.union(testRelation)).analyze | ||
| val optimized = optimizer.execute(originalQuery) | ||
| comparePlans(originalQuery, optimized) | ||
| } | ||
| } | ||
| } | ||
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.
If we allow this here, this will affect Spark's caching/uncaching plans and tables inconsistently. For the purpose of this PR,
StaticSQLConf.scalawould be a perfect place for this.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.
Are you talking about SQL cache? I don't think optimizer has anything to do with SQL cache though, since the logical plans used to match cache entries are "analyzed" plans not "optimized" plans.
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.
Since an optimizer should not change query semantics(results), it should work well for the case @dongjoon-hyun described. If this is mainly used for debugging uses, I think it would be nice to use this conf on runtime.
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.
+1 on debugging purpose. Still, CacheManager matches the analyzed plan not the optimized plan.