[Gold Standard] Updated plans for all tpcds queries with spark-only setup

src/test/resources/tpcds/spark-2.4/approved-plans-v1_4/q1/simplified.txt

@@ -1,65 +1,58 @@
 TakeOrderedAndProject [c_customer_id]
-  WholeStageCodegen (9)
+  WholeStageCodegen
     Project [c_customer_id]
-      BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
+      BroadcastHashJoin [c_customer_sk,ctr_customer_sk]
         Project [ctr_customer_sk]
           BroadcastHashJoin [ctr_store_sk,s_store_sk]
             Project [ctr_customer_sk,ctr_store_sk]
-              BroadcastHashJoin [ctr_store_sk,ctr_store_skL,ctr_total_return,(CAST(avg(ctr_total_return) AS DECIMAL(21,6)) * CAST(1.2 AS DECIMAL(21,6)))]
+              BroadcastHashJoin [(CAST(avg(ctr_total_return) AS DECIMAL(21,6)) * CAST(1.2 AS DECIMAL(21,6))),ctr_store_sk,ctr_store_skL,ctr_total_return]
                 Filter [ctr_total_return]
-                  HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_customer_sk,ctr_store_sk,ctr_total_return,sum]
+                  HashAggregate [sr_customer_sk,sr_store_sk,sum,sum(UnscaledValue(sr_return_amt))] [ctr_customer_sk,ctr_store_sk,ctr_total_return,sum,sum(UnscaledValue(sr_return_amt))]
                     InputAdapter
                       Exchange [sr_customer_sk,sr_store_sk] #1
-                        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]
-                                Filter [sr_returned_date_sk,sr_store_sk,sr_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      Scan parquet default.store_returns [sr_returned_date_sk,sr_customer_sk,sr_store_sk,sr_return_amt]
+                        WholeStageCodegen
+                          HashAggregate [sr_customer_sk,sr_return_amt,sr_store_sk,sum,sum] [sum,sum]
+                            Project [sr_customer_sk,sr_return_amt,sr_store_sk]
+                              BroadcastHashJoin [d_date_sk,sr_returned_date_sk]
+                                Project [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk]
+                                  Filter [sr_customer_sk,sr_returned_date_sk,sr_store_sk]
+                                    Scan parquet default.store_returns [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk] [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk]
                                 InputAdapter
                                   BroadcastExchange #2
-                                    WholeStageCodegen (1)
+                                    WholeStageCodegen
                                       Project [d_date_sk]
-                                        Filter [d_year,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              Scan parquet default.date_dim [d_date_sk,d_year]
+                                        Filter [d_date_sk,d_year]
+                                          Scan parquet default.date_dim [d_date_sk,d_year] [d_date_sk,d_year]
                 InputAdapter
                   BroadcastExchange #3
-                    WholeStageCodegen (6)
+                    WholeStageCodegen
                       Filter [(CAST(avg(ctr_total_return) AS DECIMAL(21,6)) * CAST(1.2 AS DECIMAL(21,6)))]
-                        HashAggregate [ctr_store_sk,sum,count] [avg(ctr_total_return),(CAST(avg(ctr_total_return) AS DECIMAL(21,6)) * CAST(1.2 AS DECIMAL(21,6))),ctr_store_skL,sum,count]
+                        HashAggregate [avg(ctr_total_return),count,ctr_store_sk,sum] [(CAST(avg(ctr_total_return) AS DECIMAL(21,6)) * CAST(1.2 AS DECIMAL(21,6))),avg(ctr_total_return),count,ctr_store_skL,sum]
                           InputAdapter
                             Exchange [ctr_store_sk] #4
-                              WholeStageCodegen (5)
-                                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]
+                              WholeStageCodegen
+                                HashAggregate [count,count,ctr_store_sk,ctr_total_return,sum,sum] [count,count,sum,sum]
+                                  HashAggregate [sr_customer_sk,sr_store_sk,sum,sum(UnscaledValue(sr_return_amt))] [ctr_store_sk,ctr_total_return,sum,sum(UnscaledValue(sr_return_amt))]
                                     InputAdapter
                                       Exchange [sr_customer_sk,sr_store_sk] #5
-                                        WholeStageCodegen (4)
-                                          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]
-                                                Filter [sr_returned_date_sk,sr_store_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      Scan parquet default.store_returns [sr_returned_date_sk,sr_customer_sk,sr_store_sk,sr_return_amt]
+                                        WholeStageCodegen
+                                          HashAggregate [sr_customer_sk,sr_return_amt,sr_store_sk,sum,sum] [sum,sum]
+                                            Project [sr_customer_sk,sr_return_amt,sr_store_sk]
+                                              BroadcastHashJoin [d_date_sk,sr_returned_date_sk]
+                                                Project [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk]
+                                                  Filter [sr_returned_date_sk,sr_store_sk]
+                                                    Scan parquet default.store_returns [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk] [sr_customer_sk,sr_return_amt,sr_returned_date_sk,sr_store_sk]
                                                 InputAdapter
-                                                  ReusedExchange [d_date_sk] #2
+                                                  ReusedExchange [d_date_sk] [d_date_sk] #2
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (7)
+                WholeStageCodegen
                   Project [s_store_sk]
                     Filter [s_state,s_store_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          Scan parquet default.store [s_store_sk,s_state]
+                      Scan parquet default.store [s_state,s_store_sk] [s_state,s_store_sk]
         InputAdapter
           BroadcastExchange #7
-            WholeStageCodegen (8)
-              Filter [c_customer_sk]
-                ColumnarToRow
-                  InputAdapter
-                    Scan parquet default.customer [c_customer_sk,c_customer_id]
+            WholeStageCodegen
+              Project [c_customer_id,c_customer_sk]
+                Filter [c_customer_sk]
+                  Scan parquet default.customer [c_customer_id,c_customer_sk] [c_customer_id,c_customer_sk]