resolve the comments

apache · May 11, 2021 · 4ccd4b8 · 4ccd4b8
1 parent 6b07c84
commit 4ccd4b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ain/scala/org/apache/spark/sql/execution/adaptive/PlanAdaptiveDynamicPruningFilters.scala b/...ain/scala/org/apache/spark/sql/execution/adaptive/PlanAdaptiveDynamicPruningFilters.scala
@@ -54,8 +54,7 @@ case class PlanAdaptiveDynamicPruningFilters(rootPlan: SparkPlan) extends Rule[S
 
         if (canReuseExchange) {
           exchange.setLogicalLink(adaptivePlan.executedPlan.logicalLink.get)
-          val newAdaptivePlan = AdaptiveSparkPlanExec(
-            exchange, adaptivePlan.context, adaptivePlan.preprocessingRules, true)
+          val newAdaptivePlan = adaptivePlan.copy(inputPlan = exchange)
 
           val broadcastValues = SubqueryBroadcastExec(
             name, index, buildKeys, newAdaptivePlan)

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DynamicPartitionPruningSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DynamicPartitionPruningSuite.scala
@@ -1475,14 +1475,14 @@ abstract class DynamicPartitionPruningSuiteBase
     }
   }
 
-  test("SPARK-34637: test DPP side broadcast query stage is created firstly") {
+  test("SPARK-34637: DPP side broadcast query stage is created firstly") {
     withSQLConf(SQLConf.DYNAMIC_PARTITION_PRUNING_REUSE_BROADCAST_ONLY.key -> "true") {
       val df = sql(
-        """ WITH view1 as (
+        """ WITH v as (
           |   SELECT f.store_id FROM fact_stats f WHERE f.units_sold = 70 group by f.store_id
           | )
           |
-          | SELECT * FROM view1 v1 join view1 v2 WHERE v1.store_id = v2.store_id
+          | SELECT * FROM v v1 join v v2 WHERE v1.store_id = v2.store_id
         """.stripMargin)
 
       // A possible resulting query plan:
@@ -1492,9 +1492,10 @@ abstract class DynamicPartitionPruningSuiteBase
       //       +- Exchange
       //          +- HashAggregate
       //             +- Filter
-      //                +- FileScan
-      //                      Dynamicpruning Subquery
-      //                      +- AdaptiveSparkPlan
+      //                +- FileScan [PartitionFilters: [isnotnull(store_id#3367),
+      //                           dynamicpruningexpression(store_id#3367 IN dynamicpruning#3385)]]
+      //                     +- SubqueryBroadcast dynamicpruning#3385
+      //                       +- AdaptiveSparkPlan
       //                         +- BroadcastQueryStage
       //                            +- BroadcastExchange
       //