Repository: spark Updated Branches: refs/heads/master dbb824125 -> 0dfc1ec59
[SPARK-21726][SQL][FOLLOW-UP] Check for structural integrity of the plan in Optimzer in test mode ## What changes were proposed in this pull request? The condition in `Optimizer.isPlanIntegral` is wrong. We should always return `true` if not in test mode. ## How was this patch tested? Manually test. Author: Liang-Chi Hsieh <vii...@gmail.com> Closes #19161 from viirya/SPARK-21726-followup. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0dfc1ec5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0dfc1ec5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0dfc1ec5 Branch: refs/heads/master Commit: 0dfc1ec59e45c836cb968bc9b77c69bf0e917b06 Parents: dbb8241 Author: Liang-Chi Hsieh <vii...@gmail.com> Authored: Fri Sep 8 20:21:37 2017 +0900 Committer: hyukjinkwon <gurwls...@gmail.com> Committed: Fri Sep 8 20:21:37 2017 +0900 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0dfc1ec5/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala ---------------------------------------------------------------------- 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 2426a8b..a602894 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 @@ -41,7 +41,7 @@ abstract class Optimizer(sessionCatalog: SessionCatalog) // Check for structural integrity of the plan in test mode. Currently we only check if a plan is // still resolved after the execution of each rule. override protected def isPlanIntegral(plan: LogicalPlan): Boolean = { - Utils.isTesting && plan.resolved + !Utils.isTesting || plan.resolved } protected def fixedPoint = FixedPoint(SQLConf.get.optimizerMaxIterations) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org