Fix Once strategy's idempotence is broken for batch Infer Filters

apache · Jul 27, 2020 · bcc81be · bcc81be
1 parent f001b27
commit bcc81be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -51,6 +51,7 @@ abstract class Optimizer(catalogManager: CatalogManager)
   override protected val excludedOnceBatches: Set[String] =
     Set(
       "PartitionPruning",
+      "Infer Filters from PartitionPruning",
       "Extract Python UDFs")
 
   protected def fixedPoint =

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkOptimizer.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkOptimizer.scala
@@ -46,7 +46,7 @@ class SparkOptimizer(
       OptimizeSubqueries) :+
     Batch("Pushdown Filters from PartitionPruning", fixedPoint,
       PushDownPredicates) :+
-    Batch("Infer Filters from DynamicPruning", Once,
+    Batch("Infer Filters from PartitionPruning", Once,
       InferFiltersFromConstraints) :+
     Batch("Cleanup filters that cannot be pushed down", Once,
       CleanupDynamicPruningFilters,