Update plan stability for Spark 4.0

viirya · Jun 7, 2024 · bd3370c · bd3370c
1 parent 1237c45
commit bd3370c
Show file tree

Hide file tree

Showing 236 changed files with 28,300 additions and 28,950 deletions.
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q1/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q1/explain.txt
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q1/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q1/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [c_customer_id]
-  WholeStageCodegen (9)
+  WholeStageCodegen (7)
     Project [c_customer_id]
       BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
         Project [ctr_customer_sk]
@@ -10,12 +10,12 @@ TakeOrderedAndProject [c_customer_id]
                   HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_customer_sk,ctr_store_sk,ctr_total_return,sum]
                     InputAdapter
                       Exchange [sr_customer_sk,sr_store_sk] #1
-                        WholeStageCodegen (2)
+                        WholeStageCodegen (1)
                           HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
-                            Project [sr_customer_sk,sr_store_sk,sr_return_amt]
-                              BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [sr_customer_sk,sr_store_sk,sr_return_amt]
+                                  CometBroadcastHashJoin [sr_returned_date_sk,d_date_sk]
                                     CometFilter [sr_store_sk,sr_customer_sk]
                                       CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
                                         SubqueryBroadcast [d_date_sk] #1
@@ -26,42 +26,43 @@ TakeOrderedAndProject [c_customer_id]
                                                   CometProject [d_date_sk]
                                                     CometFilter [d_year,d_date_sk]
                                                       CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                    CometBroadcastExchange #3
+                                      CometProject [d_date_sk]
+                                        CometFilter [d_year,d_date_sk]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                 InputAdapter
-                  BroadcastExchange #3
-                    WholeStageCodegen (6)
+                  BroadcastExchange #4
+                    WholeStageCodegen (4)
                       Filter [(avg(ctr_total_return) * 1.2)]
                         HashAggregate [ctr_store_sk,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),sum,count]
                           InputAdapter
-                            Exchange [ctr_store_sk] #4
-                              WholeStageCodegen (5)
+                            Exchange [ctr_store_sk] #5
+                              WholeStageCodegen (3)
                                 HashAggregate [ctr_store_sk,ctr_total_return] [sum,count,sum,count]
                                   HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_store_sk,ctr_total_return,sum]
                                     InputAdapter
-                                      Exchange [sr_customer_sk,sr_store_sk] #5
-                                        WholeStageCodegen (4)
+                                      Exchange [sr_customer_sk,sr_store_sk] #6
+                                        WholeStageCodegen (2)
                                           HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
-                                            Project [sr_customer_sk,sr_store_sk,sr_return_amt]
-                                              BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [sr_customer_sk,sr_store_sk,sr_return_amt]
+                                                  CometBroadcastHashJoin [sr_returned_date_sk,d_date_sk]
                                                     CometFilter [sr_store_sk]
                                                       CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
                                                         ReusedSubquery [d_date_sk] #1
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk] #2
+                                                    ReusedExchange [d_date_sk] #3
             InputAdapter
-              BroadcastExchange #6
-                WholeStageCodegen (7)
+              BroadcastExchange #7
+                WholeStageCodegen (5)
                   ColumnarToRow
                     InputAdapter
                       CometProject [s_store_sk]
                         CometFilter [s_state,s_store_sk]
                           CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
         InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (8)
+          BroadcastExchange #8
+            WholeStageCodegen (6)
               ColumnarToRow
                 InputAdapter
                   CometFilter [c_customer_sk]