From 0dfc1ec59e45c836cb968bc9b77c69bf0e917b06 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Fri, 8 Sep 2017 20:21:37 +0900
Subject: [PATCH] [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 <viirya@gmail.com>
Closes #19161 from viirya/SPARK-21726-followup.
---
.../org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2426a8b4a9..a602894efb 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)
--
GitLab