-
Notifications
You must be signed in to change notification settings - Fork 29.3k
[SPARK-33042][SQL][TEST] Add a test case to ensure changes to spark.sql.optimizer.maxIterations take effect at runtime #29919
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 1 commit
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,73 @@ | ||
| /* | ||
| * 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.plans._ | ||
| import org.apache.spark.sql.catalyst.errors.TreeNodeException | ||
| import org.apache.spark.sql.catalyst.expressions.{Alias, IntegerLiteral, Literal} | ||
| import org.apache.spark.sql.catalyst.plans.PlanTest | ||
| import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, OneRowRelation, Project} | ||
| import org.apache.spark.sql.catalyst.rules.Rule | ||
| import org.apache.spark.sql.internal.SQLConf | ||
|
|
||
| /** | ||
| * A dummy optimizer rule for testing that decrements integer literals until 0. | ||
| */ | ||
| object DecrementLiterals extends Rule[LogicalPlan] { | ||
| def apply(plan: LogicalPlan): LogicalPlan = plan transformExpressions { | ||
| case IntegerLiteral(i) if i > 0 => Literal(i - 1) | ||
| } | ||
| } | ||
|
|
||
| class OptimizerMaxIterationsSuite extends PlanTest { | ||
| test("Adjust maxIterations") { | ||
| val iterations = 5 | ||
| val maxIterationsNotEnough = 3 | ||
| val maxIterationsEnough = 10 | ||
| val analyzed = Project(Alias(Literal(iterations), "attr")() :: Nil, OneRowRelation()).analyze | ||
|
|
||
| conf.setConf(SQLConf.OPTIMIZER_MAX_ITERATIONS, maxIterationsNotEnough) | ||
|
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. Could you use |
||
| val optimizer = new SimpleTestOptimizer() { | ||
|
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. How about using
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. It seems all other Optimizer-related tests are using |
||
| override def defaultBatches: Seq[Batch] = | ||
| Batch("test", fixedPoint, | ||
| DecrementLiterals) :: Nil | ||
| } | ||
|
|
||
| val message1 = intercept[TreeNodeException[LogicalPlan]] { | ||
| optimizer.execute(analyzed) | ||
| }.getMessage | ||
| assert(message1.startsWith(s"Max iterations ($maxIterationsNotEnough) reached for batch " + | ||
| s"test, please set '${SQLConf.OPTIMIZER_MAX_ITERATIONS.key}' to a larger value.")) | ||
|
|
||
| conf.setConf(SQLConf.OPTIMIZER_MAX_ITERATIONS, maxIterationsEnough) | ||
| try { | ||
| optimizer.execute(analyzed) | ||
| } catch { | ||
| case ex: TreeNodeException[LogicalPlan] | ||
| if ex.getMessage.contains(s"${SQLConf.OPTIMIZER_MAX_ITERATIONS.key}") => | ||
| fail("optimizer.execute should not reach max iterations.") | ||
| } | ||
|
|
||
| conf.setConf(SQLConf.OPTIMIZER_MAX_ITERATIONS, maxIterationsNotEnough) | ||
| val message2 = intercept[TreeNodeException[LogicalPlan]] { | ||
| optimizer.execute(analyzed) | ||
| }.getMessage | ||
| assert(message2.startsWith(s"Max iterations ($maxIterationsNotEnough) reached for batch " + | ||
| s"test, please set '${SQLConf.OPTIMIZER_MAX_ITERATIONS.key}' to a larger value.")) | ||
| } | ||
| } | ||
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.
hm, since
AnalysisSuitehas tests forANALYZER_MAX_ITERATIONS, how about making the name more general, e.g.,OptimizerSuite?