You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/04/13 20:50:15 UTC

[10/26] hive git commit: HIVE-15708 : Upgrade calcite version to 1.12 (Remus Rusanu via Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query30.q.out b/ql/src/test/results/clientpositive/perf/query30.q.out
index 3f30bca..72871f4 100644
--- a/ql/src/test/results/clientpositive/perf/query30.q.out
+++ b/ql/src/test/results/clientpositive/perf/query30.q.out
@@ -95,28 +95,28 @@ Stage-0
                   <-Reducer 23 [SIMPLE_EDGE]
                     SHUFFLE [RS_94]
                       PartitionCols:_col2
-                      Select Operator [SEL_92] (rows=5500000 width=1014)
+                      Select Operator [SEL_92] (rows=11000000 width=1014)
                         Output:["_col0","_col1","_col2"]
-                        Group By Operator [GBY_91] (rows=5500000 width=1014)
+                        Group By Operator [GBY_91] (rows=11000000 width=1014)
                           Output:["_col0","_col1"],aggregations:["avg(_col2)"],keys:_col0
-                          Select Operator [SEL_87] (rows=11000000 width=1014)
+                          Select Operator [SEL_87] (rows=22000000 width=1014)
                             Output:["_col0","_col2"]
-                            Group By Operator [GBY_86] (rows=11000000 width=1014)
+                            Group By Operator [GBY_86] (rows=22000000 width=1014)
                               Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
                             <-Reducer 22 [SIMPLE_EDGE]
                               SHUFFLE [RS_85]
                                 PartitionCols:_col0
-                                Group By Operator [GBY_84] (rows=22000000 width=1014)
+                                Group By Operator [GBY_84] (rows=44000000 width=1014)
                                   Output:["_col0","_col1","_col2"],aggregations:["sum(_col3)"],keys:_col7, _col1
-                                  Merge Join Operator [MERGEJOIN_150] (rows=22000000 width=1014)
+                                  Merge Join Operator [MERGEJOIN_150] (rows=44000000 width=1014)
                                     Conds:RS_80._col2=RS_81._col0(Inner),Output:["_col1","_col3","_col7"]
                                   <-Map 25 [SIMPLE_EDGE]
                                     SHUFFLE [RS_81]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_76] (rows=20000000 width=1014)
+                                      Select Operator [SEL_76] (rows=40000000 width=1014)
                                         Output:["_col0","_col1"]
-                                        Filter Operator [FIL_143] (rows=20000000 width=1014)
-                                          predicate:((ca_state = ca_state) and ca_address_sk is not null)
+                                        Filter Operator [FIL_143] (rows=40000000 width=1014)
+                                          predicate:(ca_address_sk is not null and ca_state is not null)
                                           TableScan [TS_74] (rows=40000000 width=1014)
                                             default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state"]
                                   <-Reducer 21 [SIMPLE_EDGE]
@@ -203,32 +203,32 @@ Stage-0
                             <-Reducer 17 [SIMPLE_EDGE]
                               SHUFFLE [RS_58]
                                 PartitionCols:_col0
-                                Select Operator [SEL_56] (rows=916666 width=1014)
+                                Select Operator [SEL_56] (rows=1833333 width=1014)
                                   Output:["_col0"]
-                                  Filter Operator [FIL_55] (rows=916666 width=1014)
+                                  Filter Operator [FIL_55] (rows=1833333 width=1014)
                                     predicate:(sq_count_check(_col1) <= 1)
-                                    Group By Operator [GBY_54] (rows=2750000 width=1014)
+                                    Group By Operator [GBY_54] (rows=5500000 width=1014)
                                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                                      Group By Operator [GBY_49] (rows=5500000 width=1014)
+                                      Group By Operator [GBY_49] (rows=11000000 width=1014)
                                         Output:["_col0"],keys:_col0
-                                        Select Operator [SEL_45] (rows=11000000 width=1014)
+                                        Select Operator [SEL_45] (rows=22000000 width=1014)
                                           Output:["_col0"]
-                                          Group By Operator [GBY_44] (rows=11000000 width=1014)
+                                          Group By Operator [GBY_44] (rows=22000000 width=1014)
                                             Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
                                           <-Reducer 16 [SIMPLE_EDGE]
                                             SHUFFLE [RS_43]
                                               PartitionCols:_col0
-                                              Group By Operator [GBY_42] (rows=22000000 width=1014)
+                                              Group By Operator [GBY_42] (rows=44000000 width=1014)
                                                 Output:["_col0","_col1","_col2"],aggregations:["sum(_col3)"],keys:_col7, _col1
-                                                Merge Join Operator [MERGEJOIN_148] (rows=22000000 width=1014)
+                                                Merge Join Operator [MERGEJOIN_148] (rows=44000000 width=1014)
                                                   Conds:RS_38._col2=RS_39._col0(Inner),Output:["_col1","_col3","_col7"]
                                                 <-Map 19 [SIMPLE_EDGE]
                                                   SHUFFLE [RS_39]
                                                     PartitionCols:_col0
-                                                    Select Operator [SEL_34] (rows=20000000 width=1014)
+                                                    Select Operator [SEL_34] (rows=40000000 width=1014)
                                                       Output:["_col0","_col1"]
-                                                      Filter Operator [FIL_140] (rows=20000000 width=1014)
-                                                        predicate:((ca_state = ca_state) and ca_address_sk is not null)
+                                                      Filter Operator [FIL_140] (rows=40000000 width=1014)
+                                                        predicate:(ca_address_sk is not null and ca_state is not null)
                                                         TableScan [TS_32] (rows=40000000 width=1014)
                                                           default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state"]
                                                 <-Reducer 15 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query31.q.out b/ql/src/test/results/clientpositive/perf/query31.q.out
index dd21d5c..4de6eb6 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -2,324 +2,308 @@ PREHOOK: query: explain with ss as (select ca_county,d_qoy, d_year,sum(ss_ext_sa
 PREHOOK: type: QUERY
 POSTHOOK: query: explain with ss as (select ca_county,d_qoy, d_year,sum(ss_ext_sales_price) as store_sales from store_sales,date_dim,customer_address where ss_sold_date_sk = d_date_sk and ss_addr_sk=ca_address_sk group by ca_county,d_qoy, d_year), ws as (select ca_county,d_qoy, d_year,sum(ws_ext_sales_price) as web_sales from web_sales,date_dim,customer_address where ws_sold_date_sk = d_date_sk and ws_bill_addr_sk=ca_address_sk group by ca_county,d_qoy, d_year) select ss1.ca_county ,ss1.d_year ,ws2.web_sales/ws1.web_sales web_q1_q2_increase ,ss2.store_sales/ss1.store_sales store_q1_q2_increase ,ws3.web_sales/ws2.web_sales web_q2_q3_increase ,ss3.store_sales/ss2.store_sales store_q2_q3_increase from ss ss1 ,ss ss2 ,ss ss3 ,ws ws1 ,ws ws2 ,ws ws3 where ss1.d_qoy = 1 and ss1.d_year = 1998 and ss1.ca_county = ss2.ca_county and ss2.d_qoy = 2 and ss2.d_year = 1998 and ss2.ca_county = ss3.ca_county and ss3.d_qoy = 3 and ss3.d_year = 1998 and ss1.ca_county = ws1.ca_county and ws1.d_qoy = 1 
 and ws1.d_year = 1998 and ws1.ca_county = ws2.ca_county and ws2.d_qoy = 2 and ws2.d_year = 1998 and ws1.ca_county = ws3.ca_county and ws3.d_qoy = 3 and ws3.d_year =1998 and case when ws1.web_sales > 0 then ws2.web_sales/ws1.web_sales else null end > case when ss1.store_sales > 0 then ss2.store_sales/ss1.store_sales else null end and case when ws2.web_sales > 0 then ws3.web_sales/ws2.web_sales else null end > case when ss2.store_sales > 0 then ss3.store_sales/ss2.store_sales else null end order by web_q1_q2_increase
 POSTHOOK: type: QUERY
-Plan optimized by CBO.
+Plan not optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 11 <- Map 10 (SIMPLE_EDGE), Map 14 (SIMPLE_EDGE)
-Reducer 12 <- Map 15 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE)
-Reducer 13 <- Reducer 12 (SIMPLE_EDGE)
-Reducer 17 <- Map 16 (SIMPLE_EDGE), Map 20 (SIMPLE_EDGE)
-Reducer 18 <- Map 21 (SIMPLE_EDGE), Reducer 17 (SIMPLE_EDGE)
-Reducer 19 <- Reducer 18 (SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
-Reducer 23 <- Map 22 (SIMPLE_EDGE), Map 27 (SIMPLE_EDGE)
-Reducer 24 <- Map 28 (SIMPLE_EDGE), Reducer 23 (SIMPLE_EDGE)
-Reducer 25 <- Reducer 24 (SIMPLE_EDGE)
-Reducer 26 <- Reducer 25 (SIMPLE_EDGE), Reducer 32 (SIMPLE_EDGE)
-Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 30 <- Map 29 (SIMPLE_EDGE), Map 33 (SIMPLE_EDGE)
-Reducer 31 <- Map 34 (SIMPLE_EDGE), Reducer 30 (SIMPLE_EDGE)
-Reducer 32 <- Reducer 31 (SIMPLE_EDGE)
-Reducer 36 <- Map 35 (SIMPLE_EDGE), Map 39 (SIMPLE_EDGE)
-Reducer 37 <- Map 40 (SIMPLE_EDGE), Reducer 36 (SIMPLE_EDGE)
-Reducer 38 <- Reducer 37 (SIMPLE_EDGE)
+Reducer 10 <- Map 13 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE)
+Reducer 11 <- Map 14 (SIMPLE_EDGE), Reducer 10 (SIMPLE_EDGE)
+Reducer 12 <- Reducer 11 (SIMPLE_EDGE)
+Reducer 16 <- Map 15 (SIMPLE_EDGE), Map 19 (SIMPLE_EDGE)
+Reducer 17 <- Map 20 (SIMPLE_EDGE), Reducer 16 (SIMPLE_EDGE)
+Reducer 18 <- Reducer 17 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 22 <- Map 21 (SIMPLE_EDGE), Map 25 (SIMPLE_EDGE)
+Reducer 23 <- Map 26 (SIMPLE_EDGE), Reducer 22 (SIMPLE_EDGE)
+Reducer 24 <- Reducer 23 (SIMPLE_EDGE)
+Reducer 28 <- Map 27 (SIMPLE_EDGE), Map 31 (SIMPLE_EDGE)
+Reducer 29 <- Map 32 (SIMPLE_EDGE), Reducer 28 (SIMPLE_EDGE)
+Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 30 <- Reducer 29 (SIMPLE_EDGE)
+Reducer 34 <- Map 33 (SIMPLE_EDGE), Map 37 (SIMPLE_EDGE)
+Reducer 35 <- Map 38 (SIMPLE_EDGE), Reducer 34 (SIMPLE_EDGE)
+Reducer 36 <- Reducer 35 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Reducer 13 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE), Reducer 26 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Reducer 38 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
+Reducer 5 <- Reducer 12 (SIMPLE_EDGE), Reducer 18 (SIMPLE_EDGE), Reducer 24 (SIMPLE_EDGE), Reducer 30 (SIMPLE_EDGE), Reducer 36 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
+Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:-1
     Stage-1
-      Reducer 7
-      File Output Operator [FS_140]
-        Select Operator [SEL_139] (rows=316243230 width=88)
+      Reducer 6
+      File Output Operator [FS_256]
+        Select Operator [SEL_255] (rows=1663737 width=88)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-        <-Reducer 6 [SIMPLE_EDGE]
-          SHUFFLE [RS_138]
-            Select Operator [SEL_137] (rows=316243230 width=88)
+        <-Reducer 5 [SIMPLE_EDGE]
+          SHUFFLE [RS_254]
+            Select Operator [SEL_253] (rows=1663737 width=88)
               Output:["_col0","_col2","_col3","_col4","_col5"]
-              Filter Operator [FIL_136] (rows=316243230 width=88)
-                predicate:CASE WHEN ((_col3 > 0)) THEN (CASE WHEN ((_col9 > 0)) THEN (((_col11 / _col9) > (_col5 / _col3))) ELSE ((null > (_col5 / _col3))) END) ELSE (CASE WHEN ((_col9 > 0)) THEN (((_col11 / _col9) > null)) ELSE (null) END) END
-                Merge Join Operator [MERGEJOIN_272] (rows=632486460 width=88)
-                  Conds:RS_132._col6=RS_133._col0(Inner),Output:["_col0","_col1","_col3","_col5","_col7","_col9","_col11"]
-                <-Reducer 38 [SIMPLE_EDGE]
-                  SHUFFLE [RS_133]
+              Filter Operator [FIL_377] (rows=1663737 width=88)
+                predicate:((_col0 = _col4) and (_col0 = _col12) and (CASE WHEN ((_col15 > 0)) THEN ((_col19 / _col15)) ELSE (null) END > CASE WHEN ((_col3 > 0)) THEN ((_col7 / _col3)) ELSE (null) END) and (CASE WHEN ((_col19 > 0)) THEN ((_col23 / _col19)) ELSE (null) END > CASE WHEN ((_col7 > 0)) THEN ((_col11 / _col7)) ELSE (null) END) and (_col4 = _col8) and (_col12 = _col16) and (_col12 = _col20))
+                Merge Join Operator [MERGEJOIN_414] (rows=479156396 width=88)
+                  Conds:RS_240._col0=RS_242._col0(Inner),RS_242._col0=RS_244._col0(Inner),RS_240._col0=RS_246._col0(Inner),RS_246._col0=RS_248._col0(Inner),RS_246._col0=RS_250._col0(Inner),Output:["_col0","_col3","_col4","_col7","_col8","_col11","_col12","_col15","_col16","_col19","_col20","_col23"]
+                <-Reducer 12 [SIMPLE_EDGE]
+                  SHUFFLE [RS_242]
                     PartitionCols:_col0
-                    Group By Operator [GBY_130] (rows=87121617 width=135)
-                      Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                    <-Reducer 37 [SIMPLE_EDGE]
-                      SHUFFLE [RS_129]
-                        PartitionCols:_col0
-                        Group By Operator [GBY_128] (rows=174243235 width=135)
-                          Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                          Merge Join Operator [MERGEJOIN_269] (rows=174243235 width=135)
-                            Conds:RS_124._col1=RS_125._col0(Inner),Output:["_col2","_col7"]
-                          <-Map 40 [SIMPLE_EDGE]
-                            SHUFFLE [RS_125]
-                              PartitionCols:_col0
-                              Select Operator [SEL_120] (rows=40000000 width=1014)
-                                Output:["_col0","_col1"]
-                                Filter Operator [FIL_257] (rows=40000000 width=1014)
-                                  predicate:(ca_address_sk is not null and ca_county is not null)
-                                  TableScan [TS_118] (rows=40000000 width=1014)
-                                    default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                          <-Reducer 36 [SIMPLE_EDGE]
-                            SHUFFLE [RS_124]
-                              PartitionCols:_col1
-                              Merge Join Operator [MERGEJOIN_268] (rows=158402938 width=135)
-                                Conds:RS_121._col0=RS_122._col0(Inner),Output:["_col1","_col2"]
-                              <-Map 35 [SIMPLE_EDGE]
-                                SHUFFLE [RS_121]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_114] (rows=144002668 width=135)
-                                    Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_255] (rows=144002668 width=135)
-                                      predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                      TableScan [TS_112] (rows=144002668 width=135)
-                                        default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                              <-Map 39 [SIMPLE_EDGE]
-                                SHUFFLE [RS_122]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_117] (rows=18262 width=1119)
-                                    Output:["_col0"]
-                                    Filter Operator [FIL_256] (rows=18262 width=1119)
-                                      predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
-                                      TableScan [TS_115] (rows=73049 width=1119)
-                                        default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                <-Reducer 5 [SIMPLE_EDGE]
-                  SHUFFLE [RS_132]
-                    PartitionCols:_col6
-                    Filter Operator [FIL_110] (rows=574987679 width=88)
-                      predicate:CASE WHEN ((_col1 > 0)) THEN (CASE WHEN ((_col7 > 0)) THEN (((_col9 / _col7) > (_col3 / _col1))) ELSE ((null > (_col3 / _col1))) END) ELSE (CASE WHEN ((_col7 > 0)) THEN (((_col9 / _col7) > null)) ELSE (null) END) END
-                      Select Operator [SEL_109] (rows=1149975359 width=88)
-                        Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col9"]
-                        Merge Join Operator [MERGEJOIN_271] (rows=1149975359 width=88)
-                          Conds:RS_104._col0=RS_105._col0(Inner),RS_104._col0=RS_106._col0(Inner),RS_104._col0=RS_107._col0(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col9"]
-                        <-Reducer 13 [SIMPLE_EDGE]
-                          SHUFFLE [RS_105]
-                            PartitionCols:_col0
-                            Group By Operator [GBY_38] (rows=348477374 width=88)
-                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                            <-Reducer 12 [SIMPLE_EDGE]
-                              SHUFFLE [RS_37]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_36] (rows=696954748 width=88)
-                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                                  Merge Join Operator [MERGEJOIN_261] (rows=696954748 width=88)
-                                    Conds:RS_32._col1=RS_33._col0(Inner),Output:["_col2","_col7"]
-                                  <-Map 15 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_33]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_28] (rows=40000000 width=1014)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_245] (rows=40000000 width=1014)
-                                          predicate:(ca_address_sk is not null and ca_county is not null)
-                                          TableScan [TS_26] (rows=40000000 width=1014)
-                                            default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                  <-Reducer 11 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_32]
-                                      PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_260] (rows=633595212 width=88)
-                                        Conds:RS_29._col0=RS_30._col0(Inner),Output:["_col1","_col2"]
-                                      <-Map 10 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_29]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_22] (rows=575995635 width=88)
-                                            Output:["_col0","_col1","_col2"]
-                                            Filter Operator [FIL_243] (rows=575995635 width=88)
-                                              predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                              TableScan [TS_20] (rows=575995635 width=88)
-                                                default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                      <-Map 14 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_30]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_25] (rows=18262 width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_244] (rows=18262 width=1119)
-                                              predicate:((d_qoy = 1) and (d_year = 1998) and d_date_sk is not null)
-                                              TableScan [TS_23] (rows=73049 width=1119)
-                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                        <-Reducer 19 [SIMPLE_EDGE]
-                          SHUFFLE [RS_106]
-                            PartitionCols:_col0
-                            Group By Operator [GBY_58] (rows=348477374 width=88)
-                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                            <-Reducer 18 [SIMPLE_EDGE]
-                              SHUFFLE [RS_57]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_56] (rows=696954748 width=88)
-                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                                  Merge Join Operator [MERGEJOIN_263] (rows=696954748 width=88)
-                                    Conds:RS_52._col1=RS_53._col0(Inner),Output:["_col2","_col7"]
-                                  <-Map 21 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_53]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_48] (rows=40000000 width=1014)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_248] (rows=40000000 width=1014)
-                                          predicate:(ca_address_sk is not null and ca_county is not null)
-                                          TableScan [TS_46] (rows=40000000 width=1014)
-                                            default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                  <-Reducer 17 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_52]
-                                      PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_262] (rows=633595212 width=88)
-                                        Conds:RS_49._col0=RS_50._col0(Inner),Output:["_col1","_col2"]
-                                      <-Map 16 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_49]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_42] (rows=575995635 width=88)
-                                            Output:["_col0","_col1","_col2"]
-                                            Filter Operator [FIL_246] (rows=575995635 width=88)
-                                              predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                              TableScan [TS_40] (rows=575995635 width=88)
-                                                default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                      <-Map 20 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_50]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_45] (rows=18262 width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_247] (rows=18262 width=1119)
-                                              predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
-                                              TableScan [TS_43] (rows=73049 width=1119)
-                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                        <-Reducer 26 [SIMPLE_EDGE]
-                          SHUFFLE [RS_107]
-                            PartitionCols:_col0
-                            Merge Join Operator [MERGEJOIN_270] (rows=95833780 width=135)
-                              Conds:RS_100._col0=RS_101._col0(Inner),Output:["_col0","_col1","_col3"]
-                            <-Reducer 25 [SIMPLE_EDGE]
-                              SHUFFLE [RS_100]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_78] (rows=87121617 width=135)
-                                  Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                                <-Reducer 24 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_77]
-                                    PartitionCols:_col0
-                                    Group By Operator [GBY_76] (rows=174243235 width=135)
-                                      Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                                      Merge Join Operator [MERGEJOIN_265] (rows=174243235 width=135)
-                                        Conds:RS_72._col1=RS_73._col0(Inner),Output:["_col2","_col7"]
-                                      <-Map 28 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_73]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_68] (rows=40000000 width=1014)
-                                            Output:["_col0","_col1"]
-                                            Filter Operator [FIL_251] (rows=40000000 width=1014)
-                                              predicate:(ca_address_sk is not null and ca_county is not null)
-                                              TableScan [TS_66] (rows=40000000 width=1014)
-                                                default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                      <-Reducer 23 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_72]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_264] (rows=158402938 width=135)
-                                            Conds:RS_69._col0=RS_70._col0(Inner),Output:["_col1","_col2"]
-                                          <-Map 22 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_69]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_62] (rows=144002668 width=135)
-                                                Output:["_col0","_col1","_col2"]
-                                                Filter Operator [FIL_249] (rows=144002668 width=135)
-                                                  predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                                  TableScan [TS_60] (rows=144002668 width=135)
-                                                    default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                                          <-Map 27 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_70]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_65] (rows=18262 width=1119)
-                                                Output:["_col0"]
-                                                Filter Operator [FIL_250] (rows=18262 width=1119)
-                                                  predicate:((d_qoy = 1) and (d_year = 1998) and d_date_sk is not null)
-                                                  TableScan [TS_63] (rows=73049 width=1119)
-                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                            <-Reducer 32 [SIMPLE_EDGE]
-                              SHUFFLE [RS_101]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_98] (rows=87121617 width=135)
-                                  Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                                <-Reducer 31 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_97]
-                                    PartitionCols:_col0
-                                    Group By Operator [GBY_96] (rows=174243235 width=135)
-                                      Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                                      Merge Join Operator [MERGEJOIN_267] (rows=174243235 width=135)
-                                        Conds:RS_92._col1=RS_93._col0(Inner),Output:["_col2","_col7"]
-                                      <-Map 34 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_93]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_88] (rows=40000000 width=1014)
-                                            Output:["_col0","_col1"]
-                                            Filter Operator [FIL_254] (rows=40000000 width=1014)
-                                              predicate:(ca_address_sk is not null and ca_county is not null)
-                                              TableScan [TS_86] (rows=40000000 width=1014)
-                                                default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                      <-Reducer 30 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_92]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_266] (rows=158402938 width=135)
-                                            Conds:RS_89._col0=RS_90._col0(Inner),Output:["_col1","_col2"]
-                                          <-Map 29 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_89]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_82] (rows=144002668 width=135)
-                                                Output:["_col0","_col1","_col2"]
-                                                Filter Operator [FIL_252] (rows=144002668 width=135)
-                                                  predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                                  TableScan [TS_80] (rows=144002668 width=135)
-                                                    default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                                          <-Map 33 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_90]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_85] (rows=18262 width=1119)
-                                                Output:["_col0"]
-                                                Filter Operator [FIL_253] (rows=18262 width=1119)
-                                                  predicate:((d_qoy = 2) and (d_year = 1998) and d_date_sk is not null)
-                                                  TableScan [TS_83] (rows=73049 width=1119)
-                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                        <-Reducer 4 [SIMPLE_EDGE]
-                          SHUFFLE [RS_104]
-                            PartitionCols:_col0
-                            Group By Operator [GBY_18] (rows=348477374 width=88)
-                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
-                            <-Reducer 3 [SIMPLE_EDGE]
-                              SHUFFLE [RS_17]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_16] (rows=696954748 width=88)
-                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                                  Merge Join Operator [MERGEJOIN_259] (rows=696954748 width=88)
-                                    Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7"]
-                                  <-Map 9 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_13]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_8] (rows=40000000 width=1014)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_242] (rows=40000000 width=1014)
-                                          predicate:(ca_address_sk is not null and ca_county is not null)
-                                          TableScan [TS_6] (rows=40000000 width=1014)
-                                            default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                  <-Reducer 2 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_12]
-                                      PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_258] (rows=633595212 width=88)
-                                        Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
-                                      <-Map 1 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_9]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_2] (rows=575995635 width=88)
-                                            Output:["_col0","_col1","_col2"]
-                                            Filter Operator [FIL_240] (rows=575995635 width=88)
-                                              predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                              TableScan [TS_0] (rows=575995635 width=88)
-                                                default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                      <-Map 8 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_10]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_5] (rows=18262 width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_241] (rows=18262 width=1119)
-                                              predicate:((d_qoy = 2) and (d_year = 1998) and d_date_sk is not null)
-                                              TableScan [TS_3] (rows=73049 width=1119)
-                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                    Select Operator [SEL_162] (rows=87119343 width=88)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_161] (rows=87119343 width=88)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 2, 1998
+                      <-Reducer 11 [SIMPLE_EDGE]
+                        SHUFFLE [RS_160]
+                          PartitionCols:_col0, 2, 1998
+                          Group By Operator [GBY_159] (rows=174238687 width=88)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col15)"],keys:_col64, 2, 1998
+                            Select Operator [SEL_158] (rows=174238687 width=88)
+                              Output:["_col15","_col64"]
+                              Filter Operator [FIL_382] (rows=174238687 width=88)
+                                predicate:((_col0 = _col26) and (_col6 = _col57))
+                                Merge Join Operator [MERGEJOIN_405] (rows=696954748 width=88)
+                                  Conds:RS_153._col6=RS_155.ca_address_sk(Inner),Output:["_col0","_col6","_col15","_col26","_col57","_col64"]
+                                <-Map 14 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_155]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_385] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_146] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 10 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_153]
+                                    PartitionCols:_col6
+                                    Merge Join Operator [MERGEJOIN_404] (rows=633595212 width=88)
+                                      Conds:RS_148.ss_sold_date_sk=RS_150.d_date_sk(Inner),Output:["_col0","_col6","_col15","_col26"]
+                                    <-Map 13 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_150]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_384] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 2) and (d_year = 1998))
+                                          TableScan [TS_145] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                                    <-Map 9 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_148]
+                                        PartitionCols:ss_sold_date_sk
+                                        Filter Operator [FIL_383] (rows=575995635 width=88)
+                                          predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                          TableScan [TS_144] (rows=575995635 width=88)
+                                            default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                <-Reducer 18 [SIMPLE_EDGE]
+                  SHUFFLE [RS_244]
+                    PartitionCols:_col0
+                    Select Operator [SEL_181] (rows=87119343 width=88)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_180] (rows=87119343 width=88)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 3, 1998
+                      <-Reducer 17 [SIMPLE_EDGE]
+                        SHUFFLE [RS_179]
+                          PartitionCols:_col0, 3, 1998
+                          Group By Operator [GBY_178] (rows=174238687 width=88)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col15)"],keys:_col64, 3, 1998
+                            Select Operator [SEL_177] (rows=174238687 width=88)
+                              Output:["_col15","_col64"]
+                              Filter Operator [FIL_386] (rows=174238687 width=88)
+                                predicate:((_col0 = _col26) and (_col6 = _col57))
+                                Merge Join Operator [MERGEJOIN_407] (rows=696954748 width=88)
+                                  Conds:RS_172._col6=RS_174.ca_address_sk(Inner),Output:["_col0","_col6","_col15","_col26","_col57","_col64"]
+                                <-Map 20 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_174]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_389] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_165] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 16 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_172]
+                                    PartitionCols:_col6
+                                    Merge Join Operator [MERGEJOIN_406] (rows=633595212 width=88)
+                                      Conds:RS_167.ss_sold_date_sk=RS_169.d_date_sk(Inner),Output:["_col0","_col6","_col15","_col26"]
+                                    <-Map 15 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_167]
+                                        PartitionCols:ss_sold_date_sk
+                                        Filter Operator [FIL_387] (rows=575995635 width=88)
+                                          predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                          TableScan [TS_163] (rows=575995635 width=88)
+                                            default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                                    <-Map 19 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_169]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_388] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 3) and (d_year = 1998))
+                                          TableScan [TS_164] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                <-Reducer 24 [SIMPLE_EDGE]
+                  SHUFFLE [RS_246]
+                    PartitionCols:_col0
+                    Select Operator [SEL_200] (rows=21780404 width=135)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_199] (rows=21780404 width=135)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 1, 1998
+                      <-Reducer 23 [SIMPLE_EDGE]
+                        SHUFFLE [RS_198]
+                          PartitionCols:_col0, 1, 1998
+                          Group By Operator [GBY_197] (rows=43560808 width=135)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col23)"],keys:_col75, 1, 1998
+                            Select Operator [SEL_196] (rows=43560808 width=135)
+                              Output:["_col23","_col75"]
+                              Filter Operator [FIL_390] (rows=43560808 width=135)
+                                predicate:((_col0 = _col37) and (_col7 = _col68))
+                                Merge Join Operator [MERGEJOIN_409] (rows=174243235 width=135)
+                                  Conds:RS_191._col7=RS_193.ca_address_sk(Inner),Output:["_col0","_col7","_col23","_col37","_col68","_col75"]
+                                <-Map 26 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_193]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_393] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_184] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 22 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_191]
+                                    PartitionCols:_col7
+                                    Merge Join Operator [MERGEJOIN_408] (rows=158402938 width=135)
+                                      Conds:RS_186.ws_sold_date_sk=RS_188.d_date_sk(Inner),Output:["_col0","_col7","_col23","_col37"]
+                                    <-Map 21 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_186]
+                                        PartitionCols:ws_sold_date_sk
+                                        Filter Operator [FIL_391] (rows=144002668 width=135)
+                                          predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
+                                          TableScan [TS_182] (rows=144002668 width=135)
+                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
+                                    <-Map 25 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_188]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_392] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 1) and (d_year = 1998))
+                                          TableScan [TS_183] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                <-Reducer 30 [SIMPLE_EDGE]
+                  SHUFFLE [RS_248]
+                    PartitionCols:_col0
+                    Select Operator [SEL_219] (rows=21780404 width=135)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_218] (rows=21780404 width=135)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 2, 1998
+                      <-Reducer 29 [SIMPLE_EDGE]
+                        SHUFFLE [RS_217]
+                          PartitionCols:_col0, 2, 1998
+                          Group By Operator [GBY_216] (rows=43560808 width=135)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col23)"],keys:_col75, 2, 1998
+                            Select Operator [SEL_215] (rows=43560808 width=135)
+                              Output:["_col23","_col75"]
+                              Filter Operator [FIL_394] (rows=43560808 width=135)
+                                predicate:((_col0 = _col37) and (_col7 = _col68))
+                                Merge Join Operator [MERGEJOIN_411] (rows=174243235 width=135)
+                                  Conds:RS_210._col7=RS_212.ca_address_sk(Inner),Output:["_col0","_col7","_col23","_col37","_col68","_col75"]
+                                <-Map 32 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_212]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_397] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_203] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 28 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_210]
+                                    PartitionCols:_col7
+                                    Merge Join Operator [MERGEJOIN_410] (rows=158402938 width=135)
+                                      Conds:RS_205.ws_sold_date_sk=RS_207.d_date_sk(Inner),Output:["_col0","_col7","_col23","_col37"]
+                                    <-Map 27 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_205]
+                                        PartitionCols:ws_sold_date_sk
+                                        Filter Operator [FIL_395] (rows=144002668 width=135)
+                                          predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
+                                          TableScan [TS_201] (rows=144002668 width=135)
+                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
+                                    <-Map 31 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_207]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_396] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 2) and (d_year = 1998))
+                                          TableScan [TS_202] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                <-Reducer 36 [SIMPLE_EDGE]
+                  SHUFFLE [RS_250]
+                    PartitionCols:_col0
+                    Select Operator [SEL_238] (rows=21780404 width=135)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_237] (rows=21780404 width=135)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 3, 1998
+                      <-Reducer 35 [SIMPLE_EDGE]
+                        SHUFFLE [RS_236]
+                          PartitionCols:_col0, 3, 1998
+                          Group By Operator [GBY_235] (rows=43560808 width=135)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col23)"],keys:_col75, 3, 1998
+                            Select Operator [SEL_234] (rows=43560808 width=135)
+                              Output:["_col23","_col75"]
+                              Filter Operator [FIL_398] (rows=43560808 width=135)
+                                predicate:((_col0 = _col37) and (_col7 = _col68))
+                                Merge Join Operator [MERGEJOIN_413] (rows=174243235 width=135)
+                                  Conds:RS_229._col7=RS_231.ca_address_sk(Inner),Output:["_col0","_col7","_col23","_col37","_col68","_col75"]
+                                <-Map 38 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_231]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_401] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_222] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 34 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_229]
+                                    PartitionCols:_col7
+                                    Merge Join Operator [MERGEJOIN_412] (rows=158402938 width=135)
+                                      Conds:RS_224.ws_sold_date_sk=RS_226.d_date_sk(Inner),Output:["_col0","_col7","_col23","_col37"]
+                                    <-Map 33 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_224]
+                                        PartitionCols:ws_sold_date_sk
+                                        Filter Operator [FIL_399] (rows=144002668 width=135)
+                                          predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
+                                          TableScan [TS_220] (rows=144002668 width=135)
+                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
+                                    <-Map 37 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_226]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_400] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 3) and (d_year = 1998))
+                                          TableScan [TS_221] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                <-Reducer 4 [SIMPLE_EDGE]
+                  SHUFFLE [RS_240]
+                    PartitionCols:_col0
+                    Select Operator [SEL_143] (rows=87119343 width=88)
+                      Output:["_col0","_col3"]
+                      Group By Operator [GBY_142] (rows=87119343 width=88)
+                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 1, 1998
+                      <-Reducer 3 [SIMPLE_EDGE]
+                        SHUFFLE [RS_141]
+                          PartitionCols:_col0, 1, 1998
+                          Group By Operator [GBY_140] (rows=174238687 width=88)
+                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col15)"],keys:_col64, 1, 1998
+                            Select Operator [SEL_139] (rows=174238687 width=88)
+                              Output:["_col15","_col64"]
+                              Filter Operator [FIL_378] (rows=174238687 width=88)
+                                predicate:((_col0 = _col26) and (_col6 = _col57))
+                                Merge Join Operator [MERGEJOIN_403] (rows=696954748 width=88)
+                                  Conds:RS_134._col6=RS_136.ca_address_sk(Inner),Output:["_col0","_col6","_col15","_col26","_col57","_col64"]
+                                <-Map 8 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_136]
+                                    PartitionCols:ca_address_sk
+                                    Filter Operator [FIL_381] (rows=40000000 width=1014)
+                                      predicate:(ca_address_sk is not null and ca_county is not null)
+                                      TableScan [TS_127] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                <-Reducer 2 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_134]
+                                    PartitionCols:_col6
+                                    Merge Join Operator [MERGEJOIN_402] (rows=633595212 width=88)
+                                      Conds:RS_129.ss_sold_date_sk=RS_131.d_date_sk(Inner),Output:["_col0","_col6","_col15","_col26"]
+                                    <-Map 1 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_129]
+                                        PartitionCols:ss_sold_date_sk
+                                        Filter Operator [FIL_379] (rows=575995635 width=88)
+                                          predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                          TableScan [TS_125] (rows=575995635 width=88)
+                                            default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                                    <-Map 7 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_131]
+                                        PartitionCols:d_date_sk
+                                        Filter Operator [FIL_380] (rows=18262 width=1119)
+                                          predicate:(d_date_sk is not null and (d_qoy = 1) and (d_year = 1998))
+                                          TableScan [TS_126] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query32.q.out b/ql/src/test/results/clientpositive/perf/query32.q.out
index 6311054..5a6514b 100644
--- a/ql/src/test/results/clientpositive/perf/query32.q.out
+++ b/ql/src/test/results/clientpositive/perf/query32.q.out
@@ -50,85 +50,83 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 5
-      File Output Operator [FS_38]
-        Group By Operator [GBY_36] (rows=1 width=112)
+      File Output Operator [FS_37]
+        Group By Operator [GBY_35] (rows=1 width=112)
           Output:["_col0"],aggregations:["sum(VALUE._col0)"]
         <-Reducer 4 [CUSTOM_SIMPLE_EDGE]
-          PARTITION_ONLY_SHUFFLE [RS_35]
-            Group By Operator [GBY_34] (rows=1 width=112)
-              Output:["_col0"],aggregations:["sum(_col1)"]
-              Select Operator [SEL_33] (rows=232311810 width=135)
-                Output:["_col1"]
-                Filter Operator [FIL_32] (rows=232311810 width=135)
-                  predicate:(_col1 > _col5)
-                  Select Operator [SEL_31] (rows=696935432 width=135)
-                    Output:["_col1","_col5"]
-                    Merge Join Operator [MERGEJOIN_60] (rows=696935432 width=135)
-                      Conds:RS_27._col0=RS_28._col0(Inner),RS_28._col0=RS_29._col0(Inner),Output:["_col1","_col5"]
-                    <-Map 7 [SIMPLE_EDGE]
-                      SHUFFLE [RS_28]
-                        PartitionCols:_col0
-                        Select Operator [SEL_16] (rows=231000 width=1436)
-                          Output:["_col0"]
-                          Filter Operator [FIL_55] (rows=231000 width=1436)
-                            predicate:((i_manufact_id = 436) and i_item_sk is not null)
-                            TableScan [TS_14] (rows=462000 width=1436)
-                              default@item,i,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_manufact_id"]
-                    <-Reducer 3 [SIMPLE_EDGE]
-                      SHUFFLE [RS_27]
-                        PartitionCols:_col0
-                        Select Operator [SEL_13] (rows=158394413 width=135)
-                          Output:["_col0","_col1"]
-                          Group By Operator [GBY_12] (rows=158394413 width=135)
-                            Output:["_col0","_col1"],aggregations:["avg(VALUE._col0)"],keys:KEY._col0
-                          <-Reducer 2 [SIMPLE_EDGE]
-                            SHUFFLE [RS_11]
-                              PartitionCols:_col0
-                              Group By Operator [GBY_10] (rows=316788826 width=135)
-                                Output:["_col0","_col1"],aggregations:["avg(_col2)"],keys:_col1
-                                Merge Join Operator [MERGEJOIN_58] (rows=316788826 width=135)
-                                  Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2"]
-                                <-Map 1 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_6]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_2] (rows=287989836 width=135)
-                                      Output:["_col0","_col1","_col2"]
-                                      Filter Operator [FIL_53] (rows=287989836 width=135)
-                                        predicate:(cs_sold_date_sk is not null and cs_item_sk is not null)
-                                        TableScan [TS_0] (rows=287989836 width=135)
-                                          default@catalog_sales,cs,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_discount_amt"]
-                                <-Map 6 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_7]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_5] (rows=8116 width=1119)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_54] (rows=8116 width=1119)
-                                        predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null)
-                                        TableScan [TS_3] (rows=73049 width=1119)
-                                          default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                    <-Reducer 9 [SIMPLE_EDGE]
-                      SHUFFLE [RS_29]
-                        PartitionCols:_col0
-                        Select Operator [SEL_26] (rows=316788826 width=135)
-                          Output:["_col0","_col1"]
-                          Merge Join Operator [MERGEJOIN_59] (rows=316788826 width=135)
-                            Conds:RS_23._col0=RS_24._col0(Inner),Output:["_col1","_col2"]
-                          <-Map 10 [SIMPLE_EDGE]
-                            SHUFFLE [RS_24]
-                              PartitionCols:_col0
-                              Select Operator [SEL_22] (rows=8116 width=1119)
-                                Output:["_col0"]
-                                Filter Operator [FIL_57] (rows=8116 width=1119)
-                                  predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null)
-                                  TableScan [TS_20] (rows=73049 width=1119)
-                                    default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                          <-Map 8 [SIMPLE_EDGE]
-                            SHUFFLE [RS_23]
-                              PartitionCols:_col0
-                              Select Operator [SEL_19] (rows=287989836 width=135)
-                                Output:["_col0","_col1","_col2"]
-                                Filter Operator [FIL_56] (rows=287989836 width=135)
-                                  predicate:(cs_sold_date_sk is not null and cs_item_sk is not null)
-                                  TableScan [TS_17] (rows=287989836 width=135)
-                                    default@catalog_sales,cs,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_discount_amt"]
+          PARTITION_ONLY_SHUFFLE [RS_34]
+            Group By Operator [GBY_33] (rows=1 width=112)
+              Output:["_col0"],aggregations:["sum(_col5)"]
+              Select Operator [SEL_32] (rows=232311810 width=135)
+                Output:["_col5"]
+                Filter Operator [FIL_31] (rows=232311810 width=135)
+                  predicate:(_col5 > _col1)
+                  Merge Join Operator [MERGEJOIN_59] (rows=696935432 width=135)
+                    Conds:RS_27._col0=RS_28._col0(Inner),RS_28._col0=RS_29._col0(Inner),Output:["_col1","_col5"]
+                  <-Map 7 [SIMPLE_EDGE]
+                    SHUFFLE [RS_28]
+                      PartitionCols:_col0
+                      Select Operator [SEL_16] (rows=231000 width=1436)
+                        Output:["_col0"]
+                        Filter Operator [FIL_54] (rows=231000 width=1436)
+                          predicate:((i_manufact_id = 436) and i_item_sk is not null)
+                          TableScan [TS_14] (rows=462000 width=1436)
+                            default@item,i,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_manufact_id"]
+                  <-Reducer 3 [SIMPLE_EDGE]
+                    SHUFFLE [RS_27]
+                      PartitionCols:_col0
+                      Select Operator [SEL_13] (rows=158394413 width=135)
+                        Output:["_col0","_col1"]
+                        Group By Operator [GBY_12] (rows=158394413 width=135)
+                          Output:["_col0","_col1"],aggregations:["avg(VALUE._col0)"],keys:KEY._col0
+                        <-Reducer 2 [SIMPLE_EDGE]
+                          SHUFFLE [RS_11]
+                            PartitionCols:_col0
+                            Group By Operator [GBY_10] (rows=316788826 width=135)
+                              Output:["_col0","_col1"],aggregations:["avg(_col2)"],keys:_col1
+                              Merge Join Operator [MERGEJOIN_57] (rows=316788826 width=135)
+                                Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2"]
+                              <-Map 1 [SIMPLE_EDGE]
+                                SHUFFLE [RS_6]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_2] (rows=287989836 width=135)
+                                    Output:["_col0","_col1","_col2"]
+                                    Filter Operator [FIL_52] (rows=287989836 width=135)
+                                      predicate:(cs_sold_date_sk is not null and cs_item_sk is not null)
+                                      TableScan [TS_0] (rows=287989836 width=135)
+                                        default@catalog_sales,cs,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_discount_amt"]
+                              <-Map 6 [SIMPLE_EDGE]
+                                SHUFFLE [RS_7]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_5] (rows=8116 width=1119)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_53] (rows=8116 width=1119)
+                                      predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null)
+                                      TableScan [TS_3] (rows=73049 width=1119)
+                                        default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                  <-Reducer 9 [SIMPLE_EDGE]
+                    SHUFFLE [RS_29]
+                      PartitionCols:_col0
+                      Select Operator [SEL_26] (rows=316788826 width=135)
+                        Output:["_col0","_col1"]
+                        Merge Join Operator [MERGEJOIN_58] (rows=316788826 width=135)
+                          Conds:RS_23._col0=RS_24._col0(Inner),Output:["_col1","_col2"]
+                        <-Map 10 [SIMPLE_EDGE]
+                          SHUFFLE [RS_24]
+                            PartitionCols:_col0
+                            Select Operator [SEL_22] (rows=8116 width=1119)
+                              Output:["_col0"]
+                              Filter Operator [FIL_56] (rows=8116 width=1119)
+                                predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null)
+                                TableScan [TS_20] (rows=73049 width=1119)
+                                  default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                        <-Map 8 [SIMPLE_EDGE]
+                          SHUFFLE [RS_23]
+                            PartitionCols:_col0
+                            Select Operator [SEL_19] (rows=287989836 width=135)
+                              Output:["_col0","_col1","_col2"]
+                              Filter Operator [FIL_55] (rows=287989836 width=135)
+                                predicate:(cs_sold_date_sk is not null and cs_item_sk is not null)
+                                TableScan [TS_17] (rows=287989836 width=135)
+                                  default@catalog_sales,cs,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_discount_amt"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query37.q.out b/ql/src/test/results/clientpositive/perf/query37.q.out
index 1b61198..1c4f715 100644
--- a/ql/src/test/results/clientpositive/perf/query37.q.out
+++ b/ql/src/test/results/clientpositive/perf/query37.q.out
@@ -97,7 +97,7 @@ Stage-0
                             Select Operator [SEL_11] (rows=8116 width=1119)
                               Output:["_col0"]
                               Filter Operator [FIL_42] (rows=8116 width=1119)
-                                predicate:(d_date BETWEEN 2001-06-02 AND 2001-08-01 00:00:00.0 and d_date_sk is not null)
+                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 2001-06-02 00:00:00.0 AND 2001-08-01 00:00:00.0 and d_date_sk is not null)
                                 TableScan [TS_9] (rows=73049 width=1119)
                                   default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query40.q.out b/ql/src/test/results/clientpositive/perf/query40.q.out
index a45fdaf..919c5c2 100644
--- a/ql/src/test/results/clientpositive/perf/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/query40.q.out
@@ -119,7 +119,7 @@ Stage-0
                                   Select Operator [SEL_8] (rows=8116 width=1119)
                                     Output:["_col0","_col1"]
                                     Filter Operator [FIL_52] (rows=8116 width=1119)
-                                      predicate:(d_date BETWEEN 1998-03-08 23:00:00.0 AND 1998-05-08 00:00:00.0 and d_date_sk is not null)
+                                      predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-03-08 23:00:00.0 AND 1998-05-08 00:00:00.0 and d_date_sk is not null)
                                       TableScan [TS_6] (rows=73049 width=1119)
                                         default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                               <-Reducer 2 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query48.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query48.q.out b/ql/src/test/results/clientpositive/perf/query48.q.out
index 3b390f2..e377e3f 100644
--- a/ql/src/test/results/clientpositive/perf/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/query48.q.out
@@ -5,90 +5,88 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
-Reducer 5 <- Map 4 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
-Reducer 6 <- Map 9 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Map 10 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Map 9 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Map 10 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
+Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:-1
     Stage-1
-      Reducer 3
-      File Output Operator [FS_35]
-        Group By Operator [GBY_33] (rows=1 width=8)
+      Reducer 6
+      File Output Operator [FS_33]
+        Group By Operator [GBY_31] (rows=1 width=8)
           Output:["_col0"],aggregations:["sum(VALUE._col0)"]
-        <-Reducer 2 [CUSTOM_SIMPLE_EDGE]
-          PARTITION_ONLY_SHUFFLE [RS_32]
-            Group By Operator [GBY_31] (rows=1 width=8)
-              Output:["_col0"],aggregations:["sum(_col6)"]
-              Merge Join Operator [MERGEJOIN_58] (rows=15616946 width=88)
-                Conds:RS_27._col0=RS_28._col0(Inner),Output:["_col6"]
-              <-Map 1 [SIMPLE_EDGE]
-                SHUFFLE [RS_27]
-                  PartitionCols:_col0
-                  Select Operator [SEL_2] (rows=36524 width=1119)
-                    Output:["_col0"]
-                    Filter Operator [FIL_50] (rows=36524 width=1119)
-                      predicate:((d_year = 1998) and d_date_sk is not null)
-                      TableScan [TS_0] (rows=73049 width=1119)
-                        default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
-              <-Reducer 7 [SIMPLE_EDGE]
-                SHUFFLE [RS_28]
-                  PartitionCols:_col0
-                  Select Operator [SEL_26] (rows=14197224 width=88)
-                    Output:["_col0","_col4"]
-                    Filter Operator [FIL_25] (rows=14197224 width=88)
-                      predicate:(((_col12) IN ('KY', 'GA', 'NM') and _col6 BETWEEN 0 AND 2000) or ((_col12) IN ('MT', 'OR', 'IN') and _col6 BETWEEN 150 AND 3000) or ((_col12) IN ('WI', 'MO', 'WV') and _col6 BETWEEN 50 AND 25000))
-                      Select Operator [SEL_24] (rows=85183356 width=88)
-                        Output:["_col0","_col4","_col6","_col12"]
-                        Merge Join Operator [MERGEJOIN_57] (rows=85183356 width=88)
-                          Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col1","_col5","_col7","_col9"]
-                        <-Map 10 [SIMPLE_EDGE]
-                          SHUFFLE [RS_22]
-                            PartitionCols:_col0
-                            Select Operator [SEL_14] (rows=465450 width=385)
-                              Output:["_col0"]
-                              Filter Operator [FIL_54] (rows=465450 width=385)
-                                predicate:((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree') and cd_demo_sk is not null)
-                                TableScan [TS_12] (rows=1861800 width=385)
-                                  default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
-                        <-Reducer 6 [SIMPLE_EDGE]
-                          SHUFFLE [RS_21]
-                            PartitionCols:_col2
-                            Merge Join Operator [MERGEJOIN_56] (rows=77439413 width=88)
-                              Conds:RS_18._col3=RS_19._col0(Inner),Output:["_col1","_col2","_col5","_col7","_col9"]
-                            <-Map 9 [SIMPLE_EDGE]
-                              SHUFFLE [RS_19]
-                                PartitionCols:_col0
-                                Select Operator [SEL_11] (rows=10000000 width=1014)
-                                  Output:["_col0","_col1"]
-                                  Filter Operator [FIL_53] (rows=10000000 width=1014)
-                                    predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null)
-                                    TableScan [TS_9] (rows=40000000 width=1014)
-                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_country"]
-                            <-Reducer 5 [SIMPLE_EDGE]
-                              SHUFFLE [RS_18]
-                                PartitionCols:_col3
-                                Merge Join Operator [MERGEJOIN_55] (rows=70399465 width=88)
-                                  Conds:RS_15._col0=RS_16._col3(Inner),Output:["_col1","_col2","_col3","_col5","_col7"]
-                                <-Map 4 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_15]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_5] (rows=1704 width=1910)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_51] (rows=1704 width=1910)
-                                        predicate:s_store_sk is not null
-                                        TableScan [TS_3] (rows=1704 width=1910)
-                                          default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk"]
-                                <-Map 8 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_16]
-                                    PartitionCols:_col3
-                                    Select Operator [SEL_8] (rows=63999513 width=88)
-                                      Output:["_col0","_col1","_col2","_col3","_col4","_col6"]
-                                      Filter Operator [FIL_52] (rows=63999513 width=88)
-                                        predicate:((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 25000) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null)
-                                        TableScan [TS_6] (rows=575995635 width=88)
-                                          default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"]
+        <-Reducer 5 [CUSTOM_SIMPLE_EDGE]
+          PARTITION_ONLY_SHUFFLE [RS_30]
+            Group By Operator [GBY_29] (rows=1 width=8)
+              Output:["_col0"],aggregations:["sum(_col5)"]
+              Select Operator [SEL_28] (rows=15616947 width=88)
+                Output:["_col5"]
+                Filter Operator [FIL_27] (rows=15616947 width=88)
+                  predicate:(((_col14) IN ('KY', 'GA', 'NM') and _col7 BETWEEN 0 AND 2000) or ((_col14) IN ('MT', 'OR', 'IN') and _col7 BETWEEN 150 AND 3000) or ((_col14) IN ('WI', 'MO', 'WV') and _col7 BETWEEN 50 AND 25000))
+                  Merge Join Operator [MERGEJOIN_56] (rows=93701693 width=88)
+                    Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col5","_col7","_col14"]
+                  <-Map 10 [SIMPLE_EDGE]
+                    SHUFFLE [RS_25]
+                      PartitionCols:_col0
+                      Select Operator [SEL_14] (rows=10000000 width=1014)
+                        Output:["_col0","_col1"]
+                        Filter Operator [FIL_52] (rows=10000000 width=1014)
+                          predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null)
+                          TableScan [TS_12] (rows=40000000 width=1014)
+                            default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_country"]
+                  <-Reducer 4 [SIMPLE_EDGE]
+                    SHUFFLE [RS_24]
+                      PartitionCols:_col3
+                      Merge Join Operator [MERGEJOIN_55] (rows=85183356 width=88)
+                        Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col3","_col5","_col7"]
+                      <-Map 9 [SIMPLE_EDGE]
+                        SHUFFLE [RS_22]
+                          PartitionCols:_col0
+                          Select Operator [SEL_11] (rows=465450 width=385)
+                            Output:["_col0"]
+                            Filter Operator [FIL_51] (rows=465450 width=385)
+                              predicate:((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree') and cd_demo_sk is not null)
+                              TableScan [TS_9] (rows=1861800 width=385)
+                                default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
+                      <-Reducer 3 [SIMPLE_EDGE]
+                        SHUFFLE [RS_21]
+                          PartitionCols:_col2
+                          Merge Join Operator [MERGEJOIN_54] (rows=77439413 width=88)
+                            Conds:RS_18._col1=RS_19._col0(Inner),Output:["_col2","_col3","_col5","_col7"]
+                          <-Map 8 [SIMPLE_EDGE]
+                            SHUFFLE [RS_19]
+                              PartitionCols:_col0
+                              Select Operator [SEL_8] (rows=36524 width=1119)
+                                Output:["_col0"]
+                                Filter Operator [FIL_50] (rows=36524 width=1119)
+                                  predicate:((d_year = 1998) and d_date_sk is not null)
+                                  TableScan [TS_6] (rows=73049 width=1119)
+                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
+                          <-Reducer 2 [SIMPLE_EDGE]
+                            SHUFFLE [RS_18]
+                              PartitionCols:_col1
+                              Merge Join Operator [MERGEJOIN_53] (rows=70399465 width=88)
+                                Conds:RS_15._col0=RS_16._col3(Inner),Output:["_col1","_col2","_col3","_col5","_col7"]
+                              <-Map 1 [SIMPLE_EDGE]
+                                SHUFFLE [RS_15]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_2] (rows=1704 width=1910)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_48] (rows=1704 width=1910)
+                                      predicate:s_store_sk is not null
+                                      TableScan [TS_0] (rows=1704 width=1910)
+                                        default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk"]
+                              <-Map 7 [SIMPLE_EDGE]
+                                SHUFFLE [RS_16]
+                                  PartitionCols:_col3
+                                  Select Operator [SEL_5] (rows=63999513 width=88)
+                                    Output:["_col0","_col1","_col2","_col3","_col4","_col6"]
+                                    Filter Operator [FIL_49] (rows=63999513 width=88)
+                                      predicate:((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 25000) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null)
+                                      TableScan [TS_3] (rows=575995635 width=88)
+                                        default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/be59e024/ql/src/test/results/clientpositive/perf/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query5.q.out b/ql/src/test/results/clientpositive/perf/query5.q.out
index 9f0acc8..ad78d7e 100644
--- a/ql/src/test/results/clientpositive/perf/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/query5.q.out
@@ -326,7 +326,7 @@ Stage-0
                                         Select Operator [SEL_35] (rows=8116 width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_125] (rows=8116 width=1119)
-                                            predicate:(d_date BETWEEN 1998-08-04 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
+                                            predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                             TableScan [TS_33] (rows=73049 width=1119)
                                               default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                     <-Union 13 [SIMPLE_EDGE]
@@ -384,7 +384,7 @@ Stage-0
                                         Select Operator [SEL_69] (rows=8116 width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_130] (rows=8116 width=1119)
-                                            predicate:(d_date BETWEEN 1998-08-04 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
+                                            predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                             TableScan [TS_67] (rows=73049 width=1119)
                                               default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                     <-Union 21 [SIMPLE_EDGE]
@@ -458,7 +458,7 @@ Stage-0
                                         Select Operator [SEL_10] (rows=8116 width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_121] (rows=8116 width=1119)
-                                            predicate:(d_date BETWEEN 1998-08-04 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
+                                            predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                             TableScan [TS_8] (rows=73049 width=1119)
                                               default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                     <-Union 2 [SIMPLE_EDGE]