Update plan stability

viirya · Mar 30, 2024 · fd8e343 · fd8e343
1 parent 2c4597a
commit fd8e343
Show file tree

Hide file tree

Showing 14 changed files with 2,223 additions and 1,998 deletions.
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
@@ -1,9 +1,9 @@
 TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (17)
+  WholeStageCodegen (14)
     HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
       InputAdapter
         Exchange [channel,id,spark_grouping_id] #1
-          WholeStageCodegen (16)
+          WholeStageCodegen (13)
             HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
               Expand [sales,returns,profit,channel,id]
                 InputAdapter
@@ -75,45 +75,36 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                             InputAdapter
                                               CometFilter [cp_catalog_page_sk]
                                                 CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                    WholeStageCodegen (15)
+                    WholeStageCodegen (12)
                       HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
                         InputAdapter
                           Exchange [web_site_id] #7
-                            WholeStageCodegen (14)
+                            WholeStageCodegen (11)
                               HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                 Project [sales_price,profit,return_amt,net_loss,web_site_id]
                                   BroadcastHashJoin [wsr_web_site_sk,web_site_sk]
                                     Project [wsr_web_site_sk,sales_price,profit,return_amt,net_loss]
                                       BroadcastHashJoin [date_sk,d_date_sk]
-                                        InputAdapter
-                                          Union
-                                            WholeStageCodegen (9)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                    CometFilter [ws_web_site_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                            WholeStageCodegen (11)
-                                              Project [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss]
-                                                BroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
-                                                  InputAdapter
-                                                    BroadcastExchange #8
-                                                      WholeStageCodegen (10)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                              ReusedSubquery [d_date_sk] #1
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
-                                                        CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometUnion
+                                              CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometFilter [ws_web_site_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                              CometProject [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometBroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
+                                                  CometBroadcastExchange #8
+                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                                  CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
+                                                    CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
                                         InputAdapter
                                           ReusedExchange [d_date_sk] #3
                                     InputAdapter
                                       BroadcastExchange #9
-                                        WholeStageCodegen (13)
+                                        WholeStageCodegen (10)
                                           ColumnarToRow
                                             InputAdapter
                                               CometFilter [web_site_sk]