http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/perf/query38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query38.q.out 
b/ql/src/test/results/clientpositive/perf/query38.q.out
index 1fae4e2..81fc9f3 100644
--- a/ql/src/test/results/clientpositive/perf/query38.q.out
+++ b/ql/src/test/results/clientpositive/perf/query38.q.out
@@ -62,145 +62,151 @@ Stage-0
     limit:100
     Stage-1
       Reducer 7
-      File Output Operator [FS_92]
-        Limit [LIM_91] (rows=1 width=16)
+      File Output Operator [FS_89]
+        Limit [LIM_88] (rows=1 width=16)
           Number of rows:100
-          Group By Operator [GBY_89] (rows=1 width=16)
+          Group By Operator [GBY_86] (rows=1 width=16)
             Output:["_col0"],aggregations:["count(VALUE._col0)"]
           <-Reducer 6 [CUSTOM_SIMPLE_EDGE]
-            PARTITION_ONLY_SHUFFLE [RS_88]
-              Group By Operator [GBY_87] (rows=1 width=16)
+            PARTITION_ONLY_SHUFFLE [RS_85]
+              Group By Operator [GBY_84] (rows=1 width=16)
                 Output:["_col0"],aggregations:["count()"]
-                Select Operator [SEL_85] (rows=1 width=108)
-                  Filter Operator [FIL_84] (rows=1 width=108)
+                Select Operator [SEL_82] (rows=1 width=108)
+                  Filter Operator [FIL_81] (rows=1 width=108)
                     predicate:(_col3 = 3)
-                    Select Operator [SEL_117] (rows=152458212 width=108)
+                    Select Operator [SEL_114] (rows=152458212 width=108)
                       Output:["_col3"]
-                      Group By Operator [GBY_83] (rows=152458212 width=108)
+                      Group By Operator [GBY_80] (rows=152458212 width=108)
                         
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                       <-Union 5 [SIMPLE_EDGE]
                         <-Reducer 11 [CONTAINS]
-                          Reduce Output Operator [RS_82]
+                          Reduce Output Operator [RS_79]
                             PartitionCols:_col0, _col1, _col2
-                            Group By Operator [GBY_81] (rows=304916424 
width=108)
+                            Group By Operator [GBY_78] (rows=304916424 
width=108)
                               
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(_col3)"],keys:_col0,
 _col1, _col2
-                              Group By Operator [GBY_50] (rows=87116929 
width=135)
-                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(1)"],keys:_col0, 
_col1, _col2
-                                Group By Operator [GBY_44] (rows=174233858 
width=135)
-                                  
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                <-Reducer 10 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_43]
-                                    PartitionCols:_col0, _col1, _col2
-                                    Group By Operator [GBY_42] (rows=348467716 
width=135)
-                                      
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                      Merge Join Operator [MERGEJOIN_121] 
(rows=348467716 width=135)
-                                        
Conds:RS_38._col1=RS_39._col0(Inner),Output:["_col3","_col6","_col7"]
-                                      <-Map 15 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_39]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_8] 
(rows=80000000 width=860)
-                                            Output:["_col0","_col1","_col2"]
-                                            Filter Operator [FIL_110] 
(rows=80000000 width=860)
-                                              predicate:c_customer_sk is not 
null
-                                              TableScan [TS_6] (rows=80000000 
width=860)
-                                                
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_first_name","c_last_name"]
-                                      <-Reducer 9 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_38]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_120] 
(rows=316788826 width=135)
-                                            
Conds:RS_35._col0=RS_36._col0(Inner),Output:["_col1","_col3"]
-                                          <-Map 8 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_36]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_5] 
(rows=8116 width=1119)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_109] 
(rows=8116 width=1119)
-                                                  predicate:(d_month_seq 
BETWEEN 1212 AND 1223 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_date","d_month_seq"]
-                                          <-Map 16 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_35]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_28] 
(rows=287989836 width=135)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_111] 
(rows=287989836 width=135)
-                                                  predicate:(cs_sold_date_sk 
is not null and cs_bill_customer_sk is not null)
-                                                  TableScan [TS_26] 
(rows=287989836 width=135)
-                                                    
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
+                              Group By Operator [GBY_48] (rows=87116929 
width=135)
+                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                Select Operator [SEL_44] (rows=174233858 
width=135)
+                                  Output:["_col0","_col1","_col2"]
+                                  Group By Operator [GBY_43] (rows=174233858 
width=135)
+                                    
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                  <-Reducer 10 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_42]
+                                      PartitionCols:_col0, _col1, _col2
+                                      Group By Operator [GBY_41] 
(rows=348467716 width=135)
+                                        
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                        Merge Join Operator [MERGEJOIN_118] 
(rows=348467716 width=135)
+                                          
Conds:RS_37._col1=RS_38._col0(Inner),Output:["_col3","_col6","_col7"]
+                                        <-Map 15 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_38]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_8] 
(rows=80000000 width=860)
+                                              Output:["_col0","_col1","_col2"]
+                                              Filter Operator [FIL_107] 
(rows=80000000 width=860)
+                                                predicate:c_customer_sk is not 
null
+                                                TableScan [TS_6] 
(rows=80000000 width=860)
+                                                  
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_first_name","c_last_name"]
+                                        <-Reducer 9 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_37]
+                                            PartitionCols:_col1
+                                            Merge Join Operator 
[MERGEJOIN_117] (rows=316788826 width=135)
+                                              
Conds:RS_34._col0=RS_35._col0(Inner),Output:["_col1","_col3"]
+                                            <-Map 8 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_35]
+                                                PartitionCols:_col0
+                                                Select Operator [SEL_5] 
(rows=8116 width=1119)
+                                                  Output:["_col0","_col1"]
+                                                  Filter Operator [FIL_106] 
(rows=8116 width=1119)
+                                                    predicate:(d_month_seq 
BETWEEN 1212 AND 1223 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_date","d_month_seq"]
+                                            <-Map 16 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_34]
+                                                PartitionCols:_col0
+                                                Select Operator [SEL_27] 
(rows=287989836 width=135)
+                                                  Output:["_col0","_col1"]
+                                                  Filter Operator [FIL_108] 
(rows=287989836 width=135)
+                                                    predicate:(cs_sold_date_sk 
is not null and cs_bill_customer_sk is not null)
+                                                    TableScan [TS_25] 
(rows=287989836 width=135)
+                                                      
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
                         <-Reducer 14 [CONTAINS]
-                          Reduce Output Operator [RS_82]
+                          Reduce Output Operator [RS_79]
                             PartitionCols:_col0, _col1, _col2
-                            Group By Operator [GBY_81] (rows=304916424 
width=108)
+                            Group By Operator [GBY_78] (rows=304916424 
width=108)
                               
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(_col3)"],keys:_col0,
 _col1, _col2
-                              Group By Operator [GBY_77] (rows=43560808 
width=135)
-                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(1)"],keys:_col0, 
_col1, _col2
-                                Group By Operator [GBY_71] (rows=87121617 
width=135)
-                                  
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                <-Reducer 13 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_70]
-                                    PartitionCols:_col0, _col1, _col2
-                                    Group By Operator [GBY_69] (rows=174243235 
width=135)
-                                      
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                      Merge Join Operator [MERGEJOIN_123] 
(rows=174243235 width=135)
-                                        
Conds:RS_65._col1=RS_66._col0(Inner),Output:["_col3","_col6","_col7"]
-                                      <-Map 15 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_66]
-                                          PartitionCols:_col0
-                                           Please refer to the previous Select 
Operator [SEL_8]
-                                      <-Reducer 12 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_65]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_122] 
(rows=158402938 width=135)
-                                            
Conds:RS_62._col0=RS_63._col0(Inner),Output:["_col1","_col3"]
-                                          <-Map 8 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_63]
-                                              PartitionCols:_col0
-                                               Please refer to the previous 
Select Operator [SEL_5]
-                                          <-Map 17 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_62]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_55] 
(rows=144002668 width=135)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_114] 
(rows=144002668 width=135)
-                                                  predicate:(ws_sold_date_sk 
is not null and ws_bill_customer_sk is not null)
-                                                  TableScan [TS_53] 
(rows=144002668 width=135)
-                                                    
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
+                              Group By Operator [GBY_74] (rows=43560808 
width=135)
+                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                Select Operator [SEL_70] (rows=87121617 
width=135)
+                                  Output:["_col0","_col1","_col2"]
+                                  Group By Operator [GBY_69] (rows=87121617 
width=135)
+                                    
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                  <-Reducer 13 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_68]
+                                      PartitionCols:_col0, _col1, _col2
+                                      Group By Operator [GBY_67] 
(rows=174243235 width=135)
+                                        
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                        Merge Join Operator [MERGEJOIN_120] 
(rows=174243235 width=135)
+                                          
Conds:RS_63._col1=RS_64._col0(Inner),Output:["_col3","_col6","_col7"]
+                                        <-Map 15 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_64]
+                                            PartitionCols:_col0
+                                             Please refer to the previous 
Select Operator [SEL_8]
+                                        <-Reducer 12 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_63]
+                                            PartitionCols:_col1
+                                            Merge Join Operator 
[MERGEJOIN_119] (rows=158402938 width=135)
+                                              
Conds:RS_60._col0=RS_61._col0(Inner),Output:["_col1","_col3"]
+                                            <-Map 8 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_61]
+                                                PartitionCols:_col0
+                                                 Please refer to the previous 
Select Operator [SEL_5]
+                                            <-Map 17 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_60]
+                                                PartitionCols:_col0
+                                                Select Operator [SEL_53] 
(rows=144002668 width=135)
+                                                  Output:["_col0","_col1"]
+                                                  Filter Operator [FIL_111] 
(rows=144002668 width=135)
+                                                    predicate:(ws_sold_date_sk 
is not null and ws_bill_customer_sk is not null)
+                                                    TableScan [TS_51] 
(rows=144002668 width=135)
+                                                      
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
                         <-Reducer 4 [CONTAINS]
-                          Reduce Output Operator [RS_82]
+                          Reduce Output Operator [RS_79]
                             PartitionCols:_col0, _col1, _col2
-                            Group By Operator [GBY_81] (rows=304916424 
width=108)
+                            Group By Operator [GBY_78] (rows=304916424 
width=108)
                               
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(_col3)"],keys:_col0,
 _col1, _col2
-                              Group By Operator [GBY_24] (rows=174238687 
width=88)
-                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(1)"],keys:_col0, 
_col1, _col2
-                                Group By Operator [GBY_18] (rows=348477374 
width=88)
-                                  
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                <-Reducer 3 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_17]
-                                    PartitionCols:_col0, _col1, _col2
-                                    Group By Operator [GBY_16] (rows=696954748 
width=88)
-                                      
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                      Merge Join Operator [MERGEJOIN_119] 
(rows=696954748 width=88)
-                                        
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col3","_col6","_col7"]
-                                      <-Map 15 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_13]
-                                          PartitionCols:_col0
-                                           Please refer to the previous Select 
Operator [SEL_8]
-                                      <-Reducer 2 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_12]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_118] 
(rows=633595212 width=88)
-                                            
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col3"]
-                                          <-Map 8 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_10]
-                                              PartitionCols:_col0
-                                               Please refer to the previous 
Select Operator [SEL_5]
-                                          <-Map 1 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_9]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_2] 
(rows=575995635 width=88)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_108] 
(rows=575995635 width=88)
-                                                  predicate:(ss_sold_date_sk 
is not null and ss_customer_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_customer_sk"]
+                              Group By Operator [GBY_23] (rows=174238687 
width=88)
+                                
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                Select Operator [SEL_19] (rows=348477374 
width=88)
+                                  Output:["_col0","_col1","_col2"]
+                                  Group By Operator [GBY_18] (rows=348477374 
width=88)
+                                    
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                  <-Reducer 3 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_17]
+                                      PartitionCols:_col0, _col1, _col2
+                                      Group By Operator [GBY_16] 
(rows=696954748 width=88)
+                                        
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                        Merge Join Operator [MERGEJOIN_116] 
(rows=696954748 width=88)
+                                          
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col3","_col6","_col7"]
+                                        <-Map 15 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_13]
+                                            PartitionCols:_col0
+                                             Please refer to the previous 
Select Operator [SEL_8]
+                                        <-Reducer 2 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_12]
+                                            PartitionCols:_col1
+                                            Merge Join Operator 
[MERGEJOIN_115] (rows=633595212 width=88)
+                                              
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col3"]
+                                            <-Map 8 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_10]
+                                                PartitionCols:_col0
+                                                 Please refer to the previous 
Select Operator [SEL_5]
+                                            <-Map 1 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_9]
+                                                PartitionCols:_col0
+                                                Select Operator [SEL_2] 
(rows=575995635 width=88)
+                                                  Output:["_col0","_col1"]
+                                                  Filter Operator [FIL_105] 
(rows=575995635 width=88)
+                                                    predicate:(ss_sold_date_sk 
is not null and ss_customer_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_customer_sk"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/perf/query72.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query72.q.out 
b/ql/src/test/results/clientpositive/perf/query72.q.out
index e178d62..4d18fb3 100644
--- a/ql/src/test/results/clientpositive/perf/query72.q.out
+++ b/ql/src/test/results/clientpositive/perf/query72.q.out
@@ -86,17 +86,17 @@ Stage-0
             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           <-Reducer 3 [SIMPLE_EDGE]
             SHUFFLE [RS_72]
-              Group By Operator [GBY_70] (rows=37725837 width=135)
-                
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(VALUE._col0)","count(VALUE._col1)","count(VALUE._col2)"],keys:KEY._col0,
 KEY._col1, KEY._col2
-              <-Reducer 2 [SIMPLE_EDGE]
-                SHUFFLE [RS_69]
-                  PartitionCols:_col0, _col1, _col2
-                  Group By Operator [GBY_68] (rows=75451675 width=135)
-                    
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(_col3)","count(_col4)","count()"],keys:_col0,
 _col1, _col2
-                    Select Operator [SEL_66] (rows=75451675 width=135)
-                      Output:["_col0","_col1","_col2","_col3","_col4"]
+              Select Operator [SEL_70] (rows=37725837 width=135)
+                Output:["_col0","_col1","_col2","_col5"]
+                Group By Operator [GBY_69] (rows=37725837 width=135)
+                  
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
+                <-Reducer 2 [SIMPLE_EDGE]
+                  SHUFFLE [RS_68]
+                    PartitionCols:_col0, _col1, _col2
+                    Group By Operator [GBY_67] (rows=75451675 width=135)
+                      
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col17, 
_col15, _col24
                       Merge Join Operator [MERGEJOIN_142] (rows=75451675 
width=135)
-                        Conds:RS_63._col0, _col1=RS_64._col4, _col6(Right 
Outer),Output:["_col15","_col17","_col24","_col30"]
+                        Conds:RS_63._col0, _col1=RS_64._col4, _col6(Right 
Outer),Output:["_col15","_col17","_col24"]
                       <-Map 1 [SIMPLE_EDGE]
                         SHUFFLE [RS_63]
                           PartitionCols:_col0, _col1
@@ -110,11 +110,11 @@ Stage-0
                         SHUFFLE [RS_64]
                           PartitionCols:_col4, _col6
                           Select Operator [SEL_62] (rows=68592431 width=135)
-                            
Output:["_col4","_col6","_col13","_col15","_col22","_col28"]
+                            Output:["_col4","_col6","_col13","_col15","_col22"]
                             Filter Operator [FIL_61] (rows=68592431 width=135)
                               predicate:(UDFToDouble(_col28) > 
(UDFToDouble(_col17) + 5.0))
                               Merge Join Operator [MERGEJOIN_141] 
(rows=205777295 width=135)
-                                
Conds:RS_58._col9=RS_59._col0(Inner),Output:["_col5","_col7","_col12","_col14","_col17","_col18","_col24","_col28"]
+                                
Conds:RS_58._col9=RS_59._col0(Inner),Output:["_col5","_col7","_col12","_col14","_col17","_col18","_col28"]
                               <-Map 23 [SIMPLE_EDGE]
                                 SHUFFLE [RS_59]
                                   PartitionCols:_col0
@@ -128,7 +128,7 @@ Stage-0
                                 SHUFFLE [RS_58]
                                   PartitionCols:_col9
                                   Merge Join Operator [MERGEJOIN_140] 
(rows=187070265 width=135)
-                                    Conds:RS_55._col0, _col18=RS_56._col0, 
_col1(Inner),Output:["_col5","_col7","_col9","_col12","_col14","_col17","_col18","_col24"]
+                                    Conds:RS_55._col0, _col18=RS_56._col0, 
_col1(Inner),Output:["_col5","_col7","_col9","_col12","_col14","_col17","_col18"]
                                   <-Map 22 [SIMPLE_EDGE]
                                     SHUFFLE [RS_56]
                                       PartitionCols:_col0, _col1
@@ -144,14 +144,14 @@ Stage-0
                                       Filter Operator [FIL_54] (rows=170063874 
width=135)
                                         predicate:(_col3 < _col15)
                                         Merge Join Operator [MERGEJOIN_139] 
(rows=510191624 width=135)
-                                          
Conds:RS_51._col1=RS_52._col6(Inner),Output:["_col0","_col3","_col5","_col7","_col9","_col12","_col14","_col15","_col17","_col18","_col24"]
+                                          
Conds:RS_51._col1=RS_52._col6(Inner),Output:["_col0","_col3","_col5","_col7","_col9","_col12","_col14","_col15","_col17","_col18"]
                                         <-Reducer 16 [SIMPLE_EDGE]
                                           SHUFFLE [RS_52]
                                             PartitionCols:_col6
                                             Select Operator [SEL_41] 
(rows=463810558 width=135)
-                                              
Output:["_col1","_col3","_col6","_col8","_col9","_col11","_col12","_col18"]
+                                              
Output:["_col1","_col3","_col6","_col8","_col9","_col11","_col12"]
                                               Merge Join Operator 
[MERGEJOIN_138] (rows=463810558 width=135)
-                                                
Conds:RS_38._col4=RS_39._col0(Inner),Output:["_col1","_col4","_col6","_col7","_col9","_col10","_col16","_col18"]
+                                                
Conds:RS_38._col4=RS_39._col0(Inner),Output:["_col1","_col4","_col6","_col7","_col9","_col10","_col18"]
                                               <-Map 21 [SIMPLE_EDGE]
                                                 SHUFFLE [RS_39]
                                                   PartitionCols:_col0
@@ -165,7 +165,7 @@ Stage-0
                                                 SHUFFLE [RS_38]
                                                   PartitionCols:_col4
                                                   Merge Join Operator 
[MERGEJOIN_137] (rows=421645953 width=135)
-                                                    
Conds:RS_35._col5=RS_36._col0(Left 
Outer),Output:["_col1","_col4","_col6","_col7","_col9","_col10","_col16"]
+                                                    
Conds:RS_35._col5=RS_36._col0(Left 
Outer),Output:["_col1","_col4","_col6","_col7","_col9","_col10"]
                                                   <-Map 20 [SIMPLE_EDGE]
                                                     SHUFFLE [RS_36]
                                                       PartitionCols:_col0

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/perf/query8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query8.q.out 
b/ql/src/test/results/clientpositive/perf/query8.q.out
index bab0a80..f170883 100644
--- a/ql/src/test/results/clientpositive/perf/query8.q.out
+++ b/ql/src/test/results/clientpositive/perf/query8.q.out
@@ -282,7 +282,7 @@ Stage-0
                                           SHUFFLE [RS_31]
                                             PartitionCols:_col0
                                             Group By Operator [GBY_30] 
(rows=7333333 width=1014)
-                                              
Output:["_col0","_col1"],aggregations:["count(1)"],keys:_col0
+                                              
Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
                                               Select Operator [SEL_28] 
(rows=7333333 width=1014)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_27] 
(rows=7333333 width=1014)
@@ -325,7 +325,7 @@ Stage-0
                                           SHUFFLE [RS_11]
                                             PartitionCols:_col0
                                             Group By Operator [GBY_10] 
(rows=20000000 width=1014)
-                                              
Output:["_col0","_col1"],aggregations:["count(1)"],keys:_col0
+                                              
Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
                                               Select Operator [SEL_8] 
(rows=20000000 width=1014)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_81] 
(rows=20000000 width=1014)

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/perf/query83.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query83.q.out 
b/ql/src/test/results/clientpositive/perf/query83.q.out
index a82dbb8..4f14cc6 100644
--- a/ql/src/test/results/clientpositive/perf/query83.q.out
+++ b/ql/src/test/results/clientpositive/perf/query83.q.out
@@ -134,27 +134,24 @@ Plan optimized by CBO.
 
 Vertex dependency in root stage
 Reducer 10 <- Reducer 9 (SIMPLE_EDGE)
-Reducer 11 <- Map 29 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 11 <- Map 27 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
 Reducer 12 <- Reducer 11 (SIMPLE_EDGE), Reducer 17 (SIMPLE_EDGE)
 Reducer 13 <- Reducer 12 (SIMPLE_EDGE)
 Reducer 15 <- Map 14 (SIMPLE_EDGE), Reducer 20 (SIMPLE_EDGE)
-Reducer 16 <- Map 14 (SIMPLE_EDGE), Reducer 23 (SIMPLE_EDGE)
-Reducer 17 <- Map 14 (SIMPLE_EDGE), Reducer 26 (SIMPLE_EDGE)
-Reducer 19 <- Map 18 (SIMPLE_EDGE), Reducer 21 (SIMPLE_EDGE)
+Reducer 16 <- Map 14 (SIMPLE_EDGE), Reducer 22 (SIMPLE_EDGE)
+Reducer 17 <- Map 14 (SIMPLE_EDGE), Reducer 24 (SIMPLE_EDGE)
+Reducer 19 <- Map 18 (SIMPLE_EDGE), Map 25 (SIMPLE_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
 Reducer 20 <- Reducer 19 (SIMPLE_EDGE)
-Reducer 21 <- Map 18 (SIMPLE_EDGE)
-Reducer 22 <- Map 18 (SIMPLE_EDGE), Reducer 24 (SIMPLE_EDGE)
-Reducer 23 <- Reducer 22 (SIMPLE_EDGE)
-Reducer 24 <- Map 18 (SIMPLE_EDGE)
-Reducer 25 <- Map 18 (SIMPLE_EDGE), Reducer 27 (SIMPLE_EDGE)
-Reducer 26 <- Reducer 25 (SIMPLE_EDGE)
-Reducer 27 <- Map 18 (SIMPLE_EDGE)
+Reducer 21 <- Map 18 (SIMPLE_EDGE), Map 25 (SIMPLE_EDGE)
+Reducer 22 <- Reducer 21 (SIMPLE_EDGE)
+Reducer 23 <- Map 18 (SIMPLE_EDGE), Map 25 (SIMPLE_EDGE)
+Reducer 24 <- Reducer 23 (SIMPLE_EDGE)
 Reducer 3 <- Reducer 15 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 10 (SIMPLE_EDGE), Reducer 13 (SIMPLE_EDGE), Reducer 4 
(SIMPLE_EDGE)
 Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
-Reducer 8 <- Map 28 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 8 <- Map 26 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
 Reducer 9 <- Reducer 16 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
 
 Stage-0
@@ -162,247 +159,213 @@ Stage-0
     limit:100
     Stage-1
       Reducer 6
-      File Output Operator [FS_134]
-        Limit [LIM_133] (rows=100 width=77)
+      File Output Operator [FS_128]
+        Limit [LIM_127] (rows=100 width=77)
           Number of rows:100
-          Select Operator [SEL_132] (rows=76653825 width=77)
+          Select Operator [SEL_126] (rows=76653825 width=77)
             
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
           <-Reducer 5 [SIMPLE_EDGE]
-            SHUFFLE [RS_131]
-              Select Operator [SEL_130] (rows=76653825 width=77)
+            SHUFFLE [RS_125]
+              Select Operator [SEL_124] (rows=76653825 width=77)
                 
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                Merge Join Operator [MERGEJOIN_228] (rows=76653825 width=77)
-                  
Conds:RS_126._col0=RS_127._col0(Inner),RS_126._col0=RS_128._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
+                Merge Join Operator [MERGEJOIN_222] (rows=76653825 width=77)
+                  
Conds:RS_120._col0=RS_121._col0(Inner),RS_120._col0=RS_122._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
                 <-Reducer 10 [SIMPLE_EDGE]
-                  SHUFFLE [RS_127]
+                  SHUFFLE [RS_121]
                     PartitionCols:_col0
-                    Group By Operator [GBY_82] (rows=34842647 width=77)
+                    Group By Operator [GBY_78] (rows=34842647 width=77)
                       
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 9 [SIMPLE_EDGE]
-                      SHUFFLE [RS_81]
+                      SHUFFLE [RS_77]
                         PartitionCols:_col0
-                        Group By Operator [GBY_80] (rows=69685294 width=77)
+                        Group By Operator [GBY_76] (rows=69685294 width=77)
                           
Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
-                          Merge Join Operator [MERGEJOIN_226] (rows=69685294 
width=77)
-                            
Conds:RS_76._col0=RS_77._col0(Inner),Output:["_col2","_col4"]
+                          Merge Join Operator [MERGEJOIN_220] (rows=69685294 
width=77)
+                            
Conds:RS_72._col0=RS_73._col0(Inner),Output:["_col2","_col4"]
                           <-Reducer 16 [SIMPLE_EDGE]
-                            SHUFFLE [RS_77]
+                            SHUFFLE [RS_73]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_221] (rows=80353 
width=1119)
-                                
Conds:RS_69._col1=RS_70._col0(Inner),Output:["_col0"]
+                              Merge Join Operator [MERGEJOIN_215] (rows=80353 
width=1119)
+                                
Conds:RS_65._col1=RS_66._col0(Inner),Output:["_col0"]
                               <-Map 14 [SIMPLE_EDGE]
-                                SHUFFLE [RS_69]
+                                SHUFFLE [RS_65]
                                   PartitionCols:_col1
                                   Select Operator [SEL_8] (rows=73049 
width=1119)
                                     Output:["_col0","_col1"]
-                                    Filter Operator [FIL_203] (rows=73049 
width=1119)
+                                    Filter Operator [FIL_197] (rows=73049 
width=1119)
                                       predicate:(d_date is not null 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 23 [SIMPLE_EDGE]
-                                SHUFFLE [RS_70]
+                              <-Reducer 22 [SIMPLE_EDGE]
+                                SHUFFLE [RS_66]
                                   PartitionCols:_col0
-                                  Group By Operator [GBY_67] (rows=40176 
width=1119)
+                                  Group By Operator [GBY_63] (rows=40176 
width=1119)
                                     Output:["_col0"],keys:KEY._col0
-                                  <-Reducer 22 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_66]
+                                  <-Reducer 21 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_62]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_65] (rows=80353 
width=1119)
+                                      Group By Operator [GBY_61] (rows=80353 
width=1119)
                                         Output:["_col0"],keys:_col0
-                                        Merge Join Operator [MERGEJOIN_220] 
(rows=80353 width=1119)
-                                          
Conds:RS_61._col1=RS_62._col0(Inner),Output:["_col0"]
+                                        Merge Join Operator [MERGEJOIN_214] 
(rows=80353 width=1119)
+                                          Conds:RS_57._col1=RS_58._col0(Left 
Semi),Output:["_col0"]
                                         <-Map 18 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_61]
+                                          SHUFFLE [RS_57]
                                             PartitionCols:_col1
-                                            Select Operator [SEL_53] 
(rows=73049 width=1119)
+                                            Select Operator [SEL_11] 
(rows=73049 width=1119)
                                               Output:["_col0","_col1"]
-                                              Filter Operator [FIL_209] 
(rows=73049 width=1119)
+                                              Filter Operator [FIL_198] 
(rows=73049 width=1119)
                                                 predicate:(d_week_seq is not 
null and d_date is not null)
                                                 TableScan [TS_9] (rows=73049 
width=1119)
                                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                        <-Reducer 24 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_62]
+                                        <-Map 25 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_58]
                                             PartitionCols:_col0
-                                            Group By Operator [GBY_59] 
(rows=18262 width=1119)
-                                              Output:["_col0"],keys:KEY._col0
-                                            <-Map 18 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_58]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_57] 
(rows=36525 width=1119)
-                                                  
Output:["_col0"],keys:d_week_seq
-                                                  Select Operator [SEL_56] 
(rows=36525 width=1119)
-                                                    Output:["d_week_seq"]
-                                                    Filter Operator [FIL_210] 
(rows=36525 width=1119)
-                                                      predicate:((d_date) IN 
('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
-                                                       Please refer to the 
previous TableScan [TS_9]
+                                            Group By Operator [GBY_16] 
(rows=36525 width=1119)
+                                              Output:["_col0"],keys:_col0
+                                              Select Operator [SEL_14] 
(rows=36525 width=1119)
+                                                Output:["_col0"]
+                                                Filter Operator [FIL_199] 
(rows=36525 width=1119)
+                                                  predicate:((d_date) IN 
('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
+                                                  TableScan [TS_12] 
(rows=73049 width=1119)
+                                                    
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                           <-Reducer 8 [SIMPLE_EDGE]
-                            SHUFFLE [RS_76]
+                            SHUFFLE [RS_72]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_219] 
(rows=63350266 width=77)
-                                
Conds:RS_73._col1=RS_74._col0(Inner),Output:["_col0","_col2","_col4"]
+                              Merge Join Operator [MERGEJOIN_213] 
(rows=63350266 width=77)
+                                
Conds:RS_69._col1=RS_70._col0(Inner),Output:["_col0","_col2","_col4"]
                               <-Map 7 [SIMPLE_EDGE]
-                                SHUFFLE [RS_74]
+                                SHUFFLE [RS_70]
                                   PartitionCols:_col0
                                   Select Operator [SEL_5] (rows=462000 
width=1436)
                                     Output:["_col0","_col1"]
-                                    Filter Operator [FIL_202] (rows=462000 
width=1436)
+                                    Filter Operator [FIL_196] (rows=462000 
width=1436)
                                       predicate:(i_item_sk is not null and 
i_item_id is not null)
                                       TableScan [TS_3] (rows=462000 width=1436)
                                         
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                              <-Map 28 [SIMPLE_EDGE]
-                                SHUFFLE [RS_73]
+                              <-Map 26 [SIMPLE_EDGE]
+                                SHUFFLE [RS_69]
                                   PartitionCols:_col1
-                                  Select Operator [SEL_44] (rows=57591150 
width=77)
+                                  Select Operator [SEL_42] (rows=57591150 
width=77)
                                     Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_206] (rows=57591150 
width=77)
+                                    Filter Operator [FIL_200] (rows=57591150 
width=77)
                                       predicate:(sr_item_sk is not null and 
sr_returned_date_sk is not null)
-                                      TableScan [TS_42] (rows=57591150 
width=77)
+                                      TableScan [TS_40] (rows=57591150 
width=77)
                                         
default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_return_quantity"]
                 <-Reducer 13 [SIMPLE_EDGE]
-                  SHUFFLE [RS_128]
+                  SHUFFLE [RS_122]
                     PartitionCols:_col0
-                    Group By Operator [GBY_124] (rows=8711072 width=92)
+                    Group By Operator [GBY_118] (rows=8711072 width=92)
                       
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 12 [SIMPLE_EDGE]
-                      SHUFFLE [RS_123]
+                      SHUFFLE [RS_117]
                         PartitionCols:_col0
-                        Group By Operator [GBY_122] (rows=17422145 width=92)
+                        Group By Operator [GBY_116] (rows=17422145 width=92)
                           
Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
-                          Merge Join Operator [MERGEJOIN_227] (rows=17422145 
width=92)
-                            
Conds:RS_118._col0=RS_119._col0(Inner),Output:["_col2","_col4"]
+                          Merge Join Operator [MERGEJOIN_221] (rows=17422145 
width=92)
+                            
Conds:RS_112._col0=RS_113._col0(Inner),Output:["_col2","_col4"]
                           <-Reducer 11 [SIMPLE_EDGE]
-                            SHUFFLE [RS_118]
+                            SHUFFLE [RS_112]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_222] 
(rows=15838314 width=92)
-                                
Conds:RS_115._col1=RS_116._col0(Inner),Output:["_col0","_col2","_col4"]
+                              Merge Join Operator [MERGEJOIN_216] 
(rows=15838314 width=92)
+                                
Conds:RS_109._col1=RS_110._col0(Inner),Output:["_col0","_col2","_col4"]
                               <-Map 7 [SIMPLE_EDGE]
-                                SHUFFLE [RS_116]
+                                SHUFFLE [RS_110]
                                   PartitionCols:_col0
                                    Please refer to the previous Select 
Operator [SEL_5]
-                              <-Map 29 [SIMPLE_EDGE]
-                                SHUFFLE [RS_115]
+                              <-Map 27 [SIMPLE_EDGE]
+                                SHUFFLE [RS_109]
                                   PartitionCols:_col1
-                                  Select Operator [SEL_86] (rows=14398467 
width=92)
+                                  Select Operator [SEL_82] (rows=14398467 
width=92)
                                     Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_211] (rows=14398467 
width=92)
+                                    Filter Operator [FIL_205] (rows=14398467 
width=92)
                                       predicate:(wr_item_sk is not null and 
wr_returned_date_sk is not null)
-                                      TableScan [TS_84] (rows=14398467 
width=92)
+                                      TableScan [TS_80] (rows=14398467 
width=92)
                                         
default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_returned_date_sk","wr_item_sk","wr_return_quantity"]
                           <-Reducer 17 [SIMPLE_EDGE]
-                            SHUFFLE [RS_119]
+                            SHUFFLE [RS_113]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_224] (rows=80353 
width=1119)
-                                
Conds:RS_111._col1=RS_112._col0(Inner),Output:["_col0"]
+                              Merge Join Operator [MERGEJOIN_218] (rows=80353 
width=1119)
+                                
Conds:RS_105._col1=RS_106._col0(Inner),Output:["_col0"]
                               <-Map 14 [SIMPLE_EDGE]
-                                SHUFFLE [RS_111]
+                                SHUFFLE [RS_105]
                                   PartitionCols:_col1
                                    Please refer to the previous Select 
Operator [SEL_8]
-                              <-Reducer 26 [SIMPLE_EDGE]
-                                SHUFFLE [RS_112]
+                              <-Reducer 24 [SIMPLE_EDGE]
+                                SHUFFLE [RS_106]
                                   PartitionCols:_col0
-                                  Group By Operator [GBY_109] (rows=40176 
width=1119)
+                                  Group By Operator [GBY_103] (rows=40176 
width=1119)
                                     Output:["_col0"],keys:KEY._col0
-                                  <-Reducer 25 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_108]
+                                  <-Reducer 23 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_102]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_107] (rows=80353 
width=1119)
+                                      Group By Operator [GBY_101] (rows=80353 
width=1119)
                                         Output:["_col0"],keys:_col0
-                                        Merge Join Operator [MERGEJOIN_223] 
(rows=80353 width=1119)
-                                          
Conds:RS_103._col1=RS_104._col0(Inner),Output:["_col0"]
+                                        Merge Join Operator [MERGEJOIN_217] 
(rows=80353 width=1119)
+                                          Conds:RS_97._col1=RS_98._col0(Left 
Semi),Output:["_col0"]
                                         <-Map 18 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_103]
+                                          SHUFFLE [RS_97]
                                             PartitionCols:_col1
-                                            Select Operator [SEL_95] 
(rows=73049 width=1119)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_214] 
(rows=73049 width=1119)
-                                                predicate:(d_week_seq is not 
null and d_date is not null)
-                                                 Please refer to the previous 
TableScan [TS_9]
-                                        <-Reducer 27 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_104]
+                                             Please refer to the previous 
Select Operator [SEL_11]
+                                        <-Map 25 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_98]
                                             PartitionCols:_col0
-                                            Group By Operator [GBY_101] 
(rows=18262 width=1119)
-                                              Output:["_col0"],keys:KEY._col0
-                                            <-Map 18 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_100]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_99] 
(rows=36525 width=1119)
-                                                  
Output:["_col0"],keys:d_week_seq
-                                                  Select Operator [SEL_98] 
(rows=36525 width=1119)
-                                                    Output:["d_week_seq"]
-                                                    Filter Operator [FIL_215] 
(rows=36525 width=1119)
-                                                      predicate:((d_date) IN 
('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
-                                                       Please refer to the 
previous TableScan [TS_9]
+                                             Please refer to the previous 
Group By Operator [GBY_16]
                 <-Reducer 4 [SIMPLE_EDGE]
-                  SHUFFLE [RS_126]
+                  SHUFFLE [RS_120]
                     PartitionCols:_col0
-                    Group By Operator [GBY_40] (rows=17423323 width=106)
+                    Group By Operator [GBY_38] (rows=17423323 width=106)
                       
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 3 [SIMPLE_EDGE]
-                      SHUFFLE [RS_39]
+                      SHUFFLE [RS_37]
                         PartitionCols:_col0
-                        Group By Operator [GBY_38] (rows=34846646 width=106)
+                        Group By Operator [GBY_36] (rows=34846646 width=106)
                           
Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
-                          Merge Join Operator [MERGEJOIN_225] (rows=34846646 
width=106)
-                            
Conds:RS_34._col0=RS_35._col0(Inner),Output:["_col2","_col4"]
+                          Merge Join Operator [MERGEJOIN_219] (rows=34846646 
width=106)
+                            
Conds:RS_32._col0=RS_33._col0(Inner),Output:["_col2","_col4"]
                           <-Reducer 15 [SIMPLE_EDGE]
-                            SHUFFLE [RS_35]
+                            SHUFFLE [RS_33]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_218] (rows=80353 
width=1119)
-                                
Conds:RS_27._col1=RS_28._col0(Inner),Output:["_col0"]
+                              Merge Join Operator [MERGEJOIN_212] (rows=80353 
width=1119)
+                                
Conds:RS_25._col1=RS_26._col0(Inner),Output:["_col0"]
                               <-Map 14 [SIMPLE_EDGE]
-                                SHUFFLE [RS_27]
+                                SHUFFLE [RS_25]
                                   PartitionCols:_col1
                                    Please refer to the previous Select 
Operator [SEL_8]
                               <-Reducer 20 [SIMPLE_EDGE]
-                                SHUFFLE [RS_28]
+                                SHUFFLE [RS_26]
                                   PartitionCols:_col0
-                                  Group By Operator [GBY_25] (rows=40176 
width=1119)
+                                  Group By Operator [GBY_23] (rows=40176 
width=1119)
                                     Output:["_col0"],keys:KEY._col0
                                   <-Reducer 19 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_24]
+                                    SHUFFLE [RS_22]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_23] (rows=80353 
width=1119)
+                                      Group By Operator [GBY_21] (rows=80353 
width=1119)
                                         Output:["_col0"],keys:_col0
-                                        Merge Join Operator [MERGEJOIN_217] 
(rows=80353 width=1119)
-                                          
Conds:RS_19._col1=RS_20._col0(Inner),Output:["_col0"]
+                                        Merge Join Operator [MERGEJOIN_211] 
(rows=80353 width=1119)
+                                          Conds:RS_17._col1=RS_18._col0(Left 
Semi),Output:["_col0"]
                                         <-Map 18 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_19]
+                                          SHUFFLE [RS_17]
                                             PartitionCols:_col1
-                                            Select Operator [SEL_11] 
(rows=73049 width=1119)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_204] 
(rows=73049 width=1119)
-                                                predicate:(d_week_seq is not 
null and d_date is not null)
-                                                 Please refer to the previous 
TableScan [TS_9]
-                                        <-Reducer 21 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_20]
+                                             Please refer to the previous 
Select Operator [SEL_11]
+                                        <-Map 25 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_18]
                                             PartitionCols:_col0
-                                            Group By Operator [GBY_17] 
(rows=18262 width=1119)
-                                              Output:["_col0"],keys:KEY._col0
-                                            <-Map 18 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_16]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_15] 
(rows=36525 width=1119)
-                                                  
Output:["_col0"],keys:d_week_seq
-                                                  Select Operator [SEL_14] 
(rows=36525 width=1119)
-                                                    Output:["d_week_seq"]
-                                                    Filter Operator [FIL_205] 
(rows=36525 width=1119)
-                                                      predicate:((d_date) IN 
('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
-                                                       Please refer to the 
previous TableScan [TS_9]
+                                             Please refer to the previous 
Group By Operator [GBY_16]
                           <-Reducer 2 [SIMPLE_EDGE]
-                            SHUFFLE [RS_34]
+                            SHUFFLE [RS_32]
                               PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_216] 
(rows=31678769 width=106)
-                                
Conds:RS_31._col1=RS_32._col0(Inner),Output:["_col0","_col2","_col4"]
+                              Merge Join Operator [MERGEJOIN_210] 
(rows=31678769 width=106)
+                                
Conds:RS_29._col1=RS_30._col0(Inner),Output:["_col0","_col2","_col4"]
                               <-Map 7 [SIMPLE_EDGE]
-                                SHUFFLE [RS_32]
+                                SHUFFLE [RS_30]
                                   PartitionCols:_col0
                                    Please refer to the previous Select 
Operator [SEL_5]
                               <-Map 1 [SIMPLE_EDGE]
-                                SHUFFLE [RS_31]
+                                SHUFFLE [RS_29]
                                   PartitionCols:_col1
                                   Select Operator [SEL_2] (rows=28798881 
width=106)
                                     Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_201] (rows=28798881 
width=106)
+                                    Filter Operator [FIL_195] (rows=28798881 
width=106)
                                       predicate:(cr_item_sk is not null and 
cr_returned_date_sk is not null)
                                       TableScan [TS_0] (rows=28798881 
width=106)
                                         
default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:NONE,Output:["cr_returned_date_sk","cr_item_sk","cr_return_quantity"]

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/perf/query87.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query87.q.out 
b/ql/src/test/results/clientpositive/perf/query87.q.out
index 88dc197..a64d384 100644
--- a/ql/src/test/results/clientpositive/perf/query87.q.out
+++ b/ql/src/test/results/clientpositive/perf/query87.q.out
@@ -83,51 +83,53 @@ Stage-0
                             
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, _col2
                             Select Operator [SEL_92] (rows=54450625 width=129)
                               Output:["_col0","_col1","_col2","_col3","_col4"]
-                              Select Operator [SEL_90] (rows=43560808 
width=135)
+                              Select Operator [SEL_89] (rows=43560808 
width=135)
                                 
Output:["_col0","_col1","_col2","_col3","_col4"]
-                                Group By Operator [GBY_89] (rows=43560808 
width=135)
-                                  
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(1)"],keys:_col0, 
_col1, _col2
-                                  Group By Operator [GBY_83] (rows=87121617 
width=135)
-                                    
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                  <-Reducer 15 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_82]
-                                      PartitionCols:_col0, _col1, _col2
-                                      Group By Operator [GBY_81] 
(rows=174243235 width=135)
-                                        
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                        Merge Join Operator [MERGEJOIN_135] 
(rows=174243235 width=135)
-                                          
Conds:RS_77._col1=RS_78._col0(Inner),Output:["_col3","_col6","_col7"]
-                                        <-Map 17 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_78]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_8] 
(rows=80000000 width=860)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_122] 
(rows=80000000 width=860)
-                                                predicate:c_customer_sk is not 
null
-                                                TableScan [TS_6] 
(rows=80000000 width=860)
-                                                  
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_first_name","c_last_name"]
-                                        <-Reducer 14 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_77]
-                                            PartitionCols:_col1
-                                            Merge Join Operator 
[MERGEJOIN_134] (rows=158402938 width=135)
-                                              
Conds:RS_74._col0=RS_75._col0(Inner),Output:["_col1","_col3"]
-                                            <-Map 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_75]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_5] 
(rows=8116 width=1119)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_121] 
(rows=8116 width=1119)
-                                                    predicate:(d_month_seq 
BETWEEN 1212 AND 1223 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_date","d_month_seq"]
-                                            <-Map 19 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_74]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_67] 
(rows=144002668 width=135)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_126] 
(rows=144002668 width=135)
-                                                    predicate:(ws_sold_date_sk 
is not null and ws_bill_customer_sk is not null)
-                                                    TableScan [TS_65] 
(rows=144002668 width=135)
-                                                      
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
+                                Group By Operator [GBY_88] (rows=43560808 
width=135)
+                                  
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                  Select Operator [SEL_84] (rows=87121617 
width=135)
+                                    Output:["_col0","_col1","_col2"]
+                                    Group By Operator [GBY_83] (rows=87121617 
width=135)
+                                      
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                    <-Reducer 15 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_82]
+                                        PartitionCols:_col0, _col1, _col2
+                                        Group By Operator [GBY_81] 
(rows=174243235 width=135)
+                                          
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                          Merge Join Operator [MERGEJOIN_135] 
(rows=174243235 width=135)
+                                            
Conds:RS_77._col1=RS_78._col0(Inner),Output:["_col3","_col6","_col7"]
+                                          <-Map 17 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_78]
+                                              PartitionCols:_col0
+                                              Select Operator [SEL_8] 
(rows=80000000 width=860)
+                                                
Output:["_col0","_col1","_col2"]
+                                                Filter Operator [FIL_122] 
(rows=80000000 width=860)
+                                                  predicate:c_customer_sk is 
not null
+                                                  TableScan [TS_6] 
(rows=80000000 width=860)
+                                                    
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_first_name","c_last_name"]
+                                          <-Reducer 14 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_77]
+                                              PartitionCols:_col1
+                                              Merge Join Operator 
[MERGEJOIN_134] (rows=158402938 width=135)
+                                                
Conds:RS_74._col0=RS_75._col0(Inner),Output:["_col1","_col3"]
+                                              <-Map 10 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_75]
+                                                  PartitionCols:_col0
+                                                  Select Operator [SEL_5] 
(rows=8116 width=1119)
+                                                    Output:["_col0","_col1"]
+                                                    Filter Operator [FIL_121] 
(rows=8116 width=1119)
+                                                      predicate:(d_month_seq 
BETWEEN 1212 AND 1223 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_date","d_month_seq"]
+                                              <-Map 19 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_74]
+                                                  PartitionCols:_col0
+                                                  Select Operator [SEL_67] 
(rows=144002668 width=135)
+                                                    Output:["_col0","_col1"]
+                                                    Filter Operator [FIL_126] 
(rows=144002668 width=135)
+                                                      
predicate:(ws_sold_date_sk is not null and ws_bill_customer_sk is not null)
+                                                      TableScan [TS_65] 
(rows=144002668 width=135)
+                                                        
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
                       <-Reducer 6 [CONTAINS]
                         Reduce Output Operator [RS_95]
                           PartitionCols:_col0, _col1, _col2
@@ -138,7 +140,7 @@ Stage-0
                               Select Operator [SEL_64] (rows=10889817 
width=103)
                                 
Output:["_col0","_col1","_col2","_col3","_col4"]
                                 Group By Operator [GBY_63] (rows=10889817 
width=103)
-                                  
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(2)"],keys:_col0, 
_col1, _col2
+                                  
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col0, 
_col1, _col2
                                   Select Operator [SEL_59] (rows=21779634 
width=103)
                                     Output:["_col0","_col1","_col2"]
                                     Filter Operator [FIL_58] (rows=21779634 
width=103)
@@ -153,41 +155,43 @@ Stage-0
                                               
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, _col2
                                               Select Operator [SEL_53] 
(rows=261355616 width=103)
                                                 
Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                Select Operator [SEL_51] 
(rows=87116929 width=135)
+                                                Select Operator [SEL_50] 
(rows=87116929 width=135)
                                                   
Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Group By Operator [GBY_50] 
(rows=87116929 width=135)
-                                                    
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(1)"],keys:_col0, 
_col1, _col2
-                                                    Group By Operator [GBY_44] 
(rows=174233858 width=135)
-                                                      
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                                    <-Reducer 12 [SIMPLE_EDGE]
-                                                      SHUFFLE [RS_43]
-                                                        PartitionCols:_col0, 
_col1, _col2
-                                                        Group By Operator 
[GBY_42] (rows=348467716 width=135)
-                                                          
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                                          Merge Join Operator 
[MERGEJOIN_133] (rows=348467716 width=135)
-                                                            
Conds:RS_38._col1=RS_39._col0(Inner),Output:["_col3","_col6","_col7"]
-                                                          <-Map 17 
[SIMPLE_EDGE]
-                                                            SHUFFLE [RS_39]
-                                                              
PartitionCols:_col0
-                                                               Please refer to 
the previous Select Operator [SEL_8]
-                                                          <-Reducer 11 
[SIMPLE_EDGE]
-                                                            SHUFFLE [RS_38]
-                                                              
PartitionCols:_col1
-                                                              Merge Join 
Operator [MERGEJOIN_132] (rows=316788826 width=135)
-                                                                
Conds:RS_35._col0=RS_36._col0(Inner),Output:["_col1","_col3"]
-                                                              <-Map 10 
[SIMPLE_EDGE]
-                                                                SHUFFLE [RS_36]
-                                                                  
PartitionCols:_col0
-                                                                   Please 
refer to the previous Select Operator [SEL_5]
-                                                              <-Map 18 
[SIMPLE_EDGE]
-                                                                SHUFFLE [RS_35]
-                                                                  
PartitionCols:_col0
-                                                                  Select 
Operator [SEL_28] (rows=287989836 width=135)
-                                                                    
Output:["_col0","_col1"]
-                                                                    Filter 
Operator [FIL_123] (rows=287989836 width=135)
-                                                                      
predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null)
-                                                                      
TableScan [TS_26] (rows=287989836 width=135)
-                                                                        
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
+                                                  Group By Operator [GBY_49] 
(rows=87116929 width=135)
+                                                    
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                                    Select Operator [SEL_45] 
(rows=174233858 width=135)
+                                                      
Output:["_col0","_col1","_col2"]
+                                                      Group By Operator 
[GBY_44] (rows=174233858 width=135)
+                                                        
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                                      <-Reducer 12 
[SIMPLE_EDGE]
+                                                        SHUFFLE [RS_43]
+                                                          PartitionCols:_col0, 
_col1, _col2
+                                                          Group By Operator 
[GBY_42] (rows=348467716 width=135)
+                                                            
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                                            Merge Join 
Operator [MERGEJOIN_133] (rows=348467716 width=135)
+                                                              
Conds:RS_38._col1=RS_39._col0(Inner),Output:["_col3","_col6","_col7"]
+                                                            <-Map 17 
[SIMPLE_EDGE]
+                                                              SHUFFLE [RS_39]
+                                                                
PartitionCols:_col0
+                                                                 Please refer 
to the previous Select Operator [SEL_8]
+                                                            <-Reducer 11 
[SIMPLE_EDGE]
+                                                              SHUFFLE [RS_38]
+                                                                
PartitionCols:_col1
+                                                                Merge Join 
Operator [MERGEJOIN_132] (rows=316788826 width=135)
+                                                                  
Conds:RS_35._col0=RS_36._col0(Inner),Output:["_col1","_col3"]
+                                                                <-Map 10 
[SIMPLE_EDGE]
+                                                                  SHUFFLE 
[RS_36]
+                                                                    
PartitionCols:_col0
+                                                                     Please 
refer to the previous Select Operator [SEL_5]
+                                                                <-Map 18 
[SIMPLE_EDGE]
+                                                                  SHUFFLE 
[RS_35]
+                                                                    
PartitionCols:_col0
+                                                                    Select 
Operator [SEL_28] (rows=287989836 width=135)
+                                                                      
Output:["_col0","_col1"]
+                                                                      Filter 
Operator [FIL_123] (rows=287989836 width=135)
+                                                                        
predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null)
+                                                                        
TableScan [TS_26] (rows=287989836 width=135)
+                                                                          
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
                                         <-Reducer 4 [CONTAINS]
                                           Reduce Output Operator [RS_56]
                                             PartitionCols:_col0, _col1, _col2
@@ -195,39 +199,41 @@ Stage-0
                                               
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, _col2
                                               Select Operator [SEL_53] 
(rows=261355616 width=103)
                                                 
Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                Select Operator [SEL_25] 
(rows=174238687 width=88)
+                                                Select Operator [SEL_24] 
(rows=174238687 width=88)
                                                   
Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Group By Operator [GBY_24] 
(rows=174238687 width=88)
-                                                    
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(2)"],keys:_col0, 
_col1, _col2
-                                                    Group By Operator [GBY_18] 
(rows=348477374 width=88)
-                                                      
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
-                                                    <-Reducer 3 [SIMPLE_EDGE]
-                                                      SHUFFLE [RS_17]
-                                                        PartitionCols:_col0, 
_col1, _col2
-                                                        Group By Operator 
[GBY_16] (rows=696954748 width=88)
-                                                          
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
-                                                          Merge Join Operator 
[MERGEJOIN_131] (rows=696954748 width=88)
-                                                            
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col3","_col6","_col7"]
-                                                          <-Map 17 
[SIMPLE_EDGE]
-                                                            SHUFFLE [RS_13]
-                                                              
PartitionCols:_col0
-                                                               Please refer to 
the previous Select Operator [SEL_8]
-                                                          <-Reducer 2 
[SIMPLE_EDGE]
-                                                            SHUFFLE [RS_12]
-                                                              
PartitionCols:_col1
-                                                              Merge Join 
Operator [MERGEJOIN_130] (rows=633595212 width=88)
-                                                                
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col3"]
-                                                              <-Map 10 
[SIMPLE_EDGE]
-                                                                SHUFFLE [RS_10]
-                                                                  
PartitionCols:_col0
-                                                                   Please 
refer to the previous Select Operator [SEL_5]
-                                                              <-Map 1 
[SIMPLE_EDGE]
-                                                                SHUFFLE [RS_9]
-                                                                  
PartitionCols:_col0
-                                                                  Select 
Operator [SEL_2] (rows=575995635 width=88)
-                                                                    
Output:["_col0","_col1"]
-                                                                    Filter 
Operator [FIL_120] (rows=575995635 width=88)
-                                                                      
predicate:(ss_sold_date_sk is not null and ss_customer_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_customer_sk"]
+                                                  Group By Operator [GBY_23] 
(rows=174238687 width=88)
+                                                    
Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, 
_col0, _col2
+                                                    Select Operator [SEL_19] 
(rows=348477374 width=88)
+                                                      
Output:["_col0","_col1","_col2"]
+                                                      Group By Operator 
[GBY_18] (rows=348477374 width=88)
+                                                        
Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
+                                                      <-Reducer 3 [SIMPLE_EDGE]
+                                                        SHUFFLE [RS_17]
+                                                          PartitionCols:_col0, 
_col1, _col2
+                                                          Group By Operator 
[GBY_16] (rows=696954748 width=88)
+                                                            
Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
+                                                            Merge Join 
Operator [MERGEJOIN_131] (rows=696954748 width=88)
+                                                              
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col3","_col6","_col7"]
+                                                            <-Map 17 
[SIMPLE_EDGE]
+                                                              SHUFFLE [RS_13]
+                                                                
PartitionCols:_col0
+                                                                 Please refer 
to the previous Select Operator [SEL_8]
+                                                            <-Reducer 2 
[SIMPLE_EDGE]
+                                                              SHUFFLE [RS_12]
+                                                                
PartitionCols:_col1
+                                                                Merge Join 
Operator [MERGEJOIN_130] (rows=633595212 width=88)
+                                                                  
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col3"]
+                                                                <-Map 10 
[SIMPLE_EDGE]
+                                                                  SHUFFLE 
[RS_10]
+                                                                    
PartitionCols:_col0
+                                                                     Please 
refer to the previous Select Operator [SEL_5]
+                                                                <-Map 1 
[SIMPLE_EDGE]
+                                                                  SHUFFLE 
[RS_9]
+                                                                    
PartitionCols:_col0
+                                                                    Select 
Operator [SEL_2] (rows=575995635 width=88)
+                                                                      
Output:["_col0","_col1"]
+                                                                      Filter 
Operator [FIL_120] (rows=575995635 width=88)
+                                                                        
predicate:(ss_sold_date_sk is not null and ss_customer_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_customer_sk"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/plan_json.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/plan_json.q.out 
b/ql/src/test/results/clientpositive/plan_json.q.out
index ba6d0be..ac9fdec 100644
--- a/ql/src/test/results/clientpositive/plan_json.q.out
+++ b/ql/src/test/results/clientpositive/plan_json.q.out
@@ -2,4 +2,4 @@ PREHOOK: query: EXPLAIN FORMATTED SELECT count(1) FROM src
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN FORMATTED SELECT count(1) FROM src
 POSTHOOK: type: QUERY
-{"STAGE DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"1","Processor 
Tree:":{"ListSink":{"OperatorId:":"LIST_SINK_8"}}}}}}
+{"STAGE DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"1","Processor 
Tree:":{"ListSink":{"OperatorId:":"LIST_SINK_7"}}}}}}

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/ppd_gby_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby_join.q.out 
b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
index a160410..ed91def 100644
--- a/ql/src/test/results/clientpositive/ppd_gby_join.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
@@ -74,7 +74,7 @@ STAGE PLANS:
               outputColumnNames: _col0
               Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
@@ -344,7 +344,7 @@ STAGE PLANS:
               outputColumnNames: _col0
               Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1

Reply via email to