http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query17.q.out 
b/ql/src/test/results/clientpositive/perf/query17.q.out
index 551ab62..0e42d05 100644
--- a/ql/src/test/results/clientpositive/perf/query17.q.out
+++ b/ql/src/test/results/clientpositive/perf/query17.q.out
@@ -20,52 +20,52 @@ Stage-0
       limit:100
       Stage-1
          Reducer 10
-         File Output Operator [FS_68]
+         File Output Operator [FS_54]
             compressed:false
             Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE 
Column stats: NONE
             table:{"input 
format:":"org.apache.hadoop.mapred.TextInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_67]
+            Limit [LIM_53]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: 
COMPLETE Column stats: NONE
-               Select Operator [SEL_66]
+               Select Operator [SEL_52]
                |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                |  Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 9 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_65]
+                  Reduce Output Operator [RS_51]
                      key expressions:_col0 (type: string), _col1 (type: 
string), _col2 (type: string)
                      sort order:+++
                      Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
                      value expressions:_col3 (type: bigint), _col4 (type: 
double), _col5 (type: double), _col6 (type: double), _col7 (type: bigint), 
_col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 
(type: bigint), _col12 (type: double), _col13 (type: double)
-                     Select Operator [SEL_63]
+                     Select Operator [SEL_49]
                         
outputColumnNames:["_col0","_col1","_col10","_col11","_col12","_col13","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                         Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_62]
+                        Group By Operator [GBY_48]
                         |  
aggregations:["count(VALUE._col0)","avg(VALUE._col1)","stddev_samp(VALUE._col2)","count(VALUE._col3)","avg(VALUE._col4)","stddev_samp(VALUE._col5)","count(VALUE._col6)","avg(VALUE._col7)","stddev_samp(VALUE._col8)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: 
string), KEY._col2 (type: string)
                         |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                         |  Statistics:Num rows: 254100 Data size: 364958259 
Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 8 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_61]
+                           Reduce Output Operator [RS_47]
                               key expressions:_col0 (type: string), _col1 
(type: string), _col2 (type: string)
                               Map-reduce partition columns:_col0 (type: 
string), _col1 (type: string), _col2 (type: string)
                               sort order:+++
                               Statistics:Num rows: 508200 Data size: 729916518 
Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col3 (type: bigint), _col4 
(type: struct<count:bigint,sum:double,input:int>), _col5 (type: 
struct<count:bigint,sum:double,variance:double>), _col6 (type: bigint), _col7 
(type: struct<count:bigint,sum:double,input:int>), _col8 (type: 
struct<count:bigint,sum:double,variance:double>), _col9 (type: bigint), _col10 
(type: struct<count:bigint,sum:double,input:int>), _col11 (type: 
struct<count:bigint,sum:double,variance:double>)
-                              Group By Operator [GBY_60]
+                              Group By Operator [GBY_46]
                                  
aggregations:["count(_col5)","avg(_col5)","stddev_samp(_col5)","count(_col10)","avg(_col10)","stddev_samp(_col10)","count(_col14)","avg(_col14)","stddev_samp(_col14)"]
                                  keys:_col22 (type: string), _col24 (type: 
string), _col25 (type: string)
                                  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                                  Statistics:Num rows: 508200 Data size: 
729916518 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_59]
+                                 Select Operator [SEL_45]
                                     
outputColumnNames:["_col22","_col24","_col25","_col5","_col10","_col14"]
                                     Statistics:Num rows: 508200 Data size: 
729916518 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_118]
+                                    Merge Join Operator [MERGEJOIN_104]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                     |  
outputColumnNames:["_col5","_col10","_col14","_col22","_col24","_col25"]
                                     |  Statistics:Num rows: 508200 Data size: 
729916518 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 17 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_57]
+                                    |  Reduce Output Operator [RS_43]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 
(type: int)
                                     |     sort order:+
@@ -74,26 +74,26 @@ Stage-0
                                     |     Select Operator [SEL_23]
                                     |        
outputColumnNames:["_col0","_col1","_col2"]
                                     |        Statistics:Num rows: 462000 Data 
size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_111]
+                                    |        Filter Operator [FIL_97]
                                     |           predicate:i_item_sk is not 
null (type: boolean)
                                     |           Statistics:Num rows: 462000 
Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_21]
                                     |              alias:item
                                     |              Statistics:Num rows: 462000 
Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 7 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_55]
+                                       Reduce Output Operator [RS_42]
                                           key expressions:_col1 (type: int)
                                           Map-reduce partition columns:_col1 
(type: int)
                                           sort order:+
                                           Statistics:Num rows: 53473 Data 
size: 59838291 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col5 (type: int), 
_col10 (type: int), _col14 (type: int), _col22 (type: string)
-                                          Merge Join Operator [MERGEJOIN_117]
+                                          Merge Join Operator [MERGEJOIN_103]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col3 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col1","_col5","_col10","_col14","_col22"]
                                           |  Statistics:Num rows: 53473 Data 
size: 59838291 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 16 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_52]
+                                          |  Reduce Output Operator [RS_40]
                                           |     key expressions:_col0 (type: 
int)
                                           |     Map-reduce partition 
columns:_col0 (type: int)
                                           |     sort order:+
@@ -102,26 +102,26 @@ Stage-0
                                           |     Select Operator [SEL_20]
                                           |        
outputColumnNames:["_col0","_col1"]
                                           |        Statistics:Num rows: 1704 
Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_110]
+                                          |        Filter Operator [FIL_96]
                                           |           predicate:s_store_sk is 
not null (type: boolean)
                                           |           Statistics:Num rows: 
1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_18]
                                           |              alias:store
                                           |              Statistics:Num rows: 
1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 6 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_50]
+                                             Reduce Output Operator [RS_39]
                                                 key expressions:_col3 (type: 
int)
                                                 Map-reduce partition 
columns:_col3 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 48612 
Data size: 54398446 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (type: 
int), _col5 (type: int), _col10 (type: int), _col14 (type: int)
-                                                Merge Join Operator 
[MERGEJOIN_116]
+                                                Merge Join Operator 
[MERGEJOIN_102]
                                                 |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                                 |  keys:{"0":"_col11 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col1","_col3","_col5","_col10","_col14"]
                                                 |  Statistics:Num rows: 48612 
Data size: 54398446 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 15 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator 
[RS_47]
+                                                |  Reduce Output Operator 
[RS_37]
                                                 |     key expressions:_col0 
(type: int)
                                                 |     Map-reduce partition 
columns:_col0 (type: int)
                                                 |     sort order:+
@@ -129,26 +129,26 @@ Stage-0
                                                 |     Select Operator [SEL_17]
                                                 |        
outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator 
[FIL_109]
+                                                |        Filter Operator 
[FIL_95]
                                                 |           
predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is 
not null) (type: boolean)
                                                 |           Statistics:Num 
rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_15]
                                                 |              alias:d1
                                                 |              Statistics:Num 
rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 5 [SIMPLE_EDGE]
-                                                   Reduce Output Operator 
[RS_45]
+                                                   Reduce Output Operator 
[RS_36]
                                                       key expressions:_col11 
(type: int)
                                                       Map-reduce partition 
columns:_col11 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 
44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col1 
(type: int), _col3 (type: int), _col5 (type: int), _col10 (type: int), _col14 
(type: int)
-                                                      Merge Join Operator 
[MERGEJOIN_115]
+                                                      Merge Join Operator 
[MERGEJOIN_101]
                                                       |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col6 
(type: int)","1":"_col0 (type: int)"}
                                                       |  
outputColumnNames:["_col1","_col3","_col5","_col10","_col11","_col14"]
                                                       |  Statistics:Num rows: 
44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 14 [SIMPLE_EDGE]
-                                                      |  Reduce Output 
Operator [RS_42]
+                                                      |  Reduce Output 
Operator [RS_34]
                                                       |     key 
expressions:_col0 (type: int)
                                                       |     Map-reduce 
partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -156,26 +156,26 @@ Stage-0
                                                       |     Select Operator 
[SEL_14]
                                                       |        
outputColumnNames:["_col0"]
                                                       |        Statistics:Num 
rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator 
[FIL_108]
+                                                      |        Filter Operator 
[FIL_94]
                                                       |           
predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is 
not null) (type: boolean)
                                                       |           
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
                                                       |           TableScan 
[TS_12]
                                                       |              alias:d1
                                                       |              
Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column 
stats: NONE
                                                       |<-Reducer 4 
[SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_40]
+                                                         Reduce Output 
Operator [RS_33]
                                                             key 
expressions:_col6 (type: int)
                                                             Map-reduce 
partition columns:_col6 (type: int)
                                                             sort order:+
                                                             Statistics:Num 
rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                             value 
expressions:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col10 
(type: int), _col11 (type: int), _col14 (type: int)
-                                                            Merge Join 
Operator [MERGEJOIN_114]
+                                                            Merge Join 
Operator [MERGEJOIN_100]
                                                             |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                             |  
keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                             |  
outputColumnNames:["_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
                                                             |  Statistics:Num 
rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 13 
[SIMPLE_EDGE]
-                                                            |  Reduce Output 
Operator [RS_37]
+                                                            |  Reduce Output 
Operator [RS_31]
                                                             |     key 
expressions:_col0 (type: int)
                                                             |     Map-reduce 
partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -183,26 +183,26 @@ Stage-0
                                                             |     Select 
Operator [SEL_11]
                                                             |        
outputColumnNames:["_col0"]
                                                             |        
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
-                                                            |        Filter 
Operator [FIL_107]
+                                                            |        Filter 
Operator [FIL_93]
                                                             |           
predicate:((d_quarter_name = '2000Q1') and d_date_sk is not null) (type: 
boolean)
                                                             |           
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_9]
                                                             |              
alias:d1
                                                             |              
Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column 
stats: NONE
                                                             |<-Reducer 3 
[SIMPLE_EDGE]
-                                                               Reduce Output 
Operator [RS_35]
+                                                               Reduce Output 
Operator [RS_30]
                                                                   key 
expressions:_col0 (type: int)
                                                                   Map-reduce 
partition columns:_col0 (type: int)
                                                                   sort order:+
                                                                   
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   value 
expressions:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col6 
(type: int), _col10 (type: int), _col11 (type: int), _col14 (type: int)
-                                                                  Merge Join 
Operator [MERGEJOIN_113]
+                                                                  Merge Join 
Operator [MERGEJOIN_99]
                                                                   |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                                   |  
keys:{"0":"_col8 (type: int), _col7 (type: int)","1":"_col1 (type: int), _col2 
(type: int)"}
                                                                   |  
outputColumnNames:["_col0","_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
                                                                   |  
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |<-Map 12 
[SIMPLE_EDGE]
-                                                                  |  Reduce 
Output Operator [RS_32]
+                                                                  |  Reduce 
Output Operator [RS_28]
                                                                   |     key 
expressions:_col1 (type: int), _col2 (type: int)
                                                                   |     
Map-reduce partition columns:_col1 (type: int), _col2 (type: int)
                                                                   |     sort 
order:++
@@ -211,26 +211,26 @@ Stage-0
                                                                   |     Select 
Operator [SEL_8]
                                                                   |        
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                   |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                  |        
Filter Operator [FIL_106]
+                                                                  |        
Filter Operator [FIL_92]
                                                                   |           
predicate:((cs_item_sk is not null and cs_bill_customer_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
                                                                   |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |           
TableScan [TS_6]
                                                                   |            
  alias:catalog_sales
                                                                   |            
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |<-Reducer 2 
[SIMPLE_EDGE]
-                                                                     Reduce 
Output Operator [RS_30]
+                                                                     Reduce 
Output Operator [RS_27]
                                                                         key 
expressions:_col8 (type: int), _col7 (type: int)
                                                                         
Map-reduce partition columns:_col8 (type: int), _col7 (type: int)
                                                                         sort 
order:++
                                                                         
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         value 
expressions:_col0 (type: int), _col1 (type: int), _col3 (type: int), _col5 
(type: int), _col6 (type: int), _col10 (type: int)
-                                                                        Merge 
Join Operator [MERGEJOIN_112]
+                                                                        Merge 
Join Operator [MERGEJOIN_98]
                                                                         |  
condition map:[{"":"Inner Join 0 to 1"}]
                                                                         |  
keys:{"0":"_col2 (type: int), _col1 (type: int), _col4 (type: int)","1":"_col2 
(type: int), _col1 (type: int), _col3 (type: int)"}
                                                                         |  
outputColumnNames:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
                                                                         |  
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |<-Map 
1 [SIMPLE_EDGE]
-                                                                        |  
Reduce Output Operator [RS_25]
+                                                                        |  
Reduce Output Operator [RS_24]
                                                                         |     
key expressions:_col2 (type: int), _col1 (type: int), _col4 (type: int)
                                                                         |     
Map-reduce partition columns:_col2 (type: int), _col1 (type: int), _col4 (type: 
int)
                                                                         |     
sort order:+++
@@ -239,14 +239,14 @@ Stage-0
                                                                         |     
Select Operator [SEL_2]
                                                                         |      
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                                         |      
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                        |      
  Filter Operator [FIL_104]
+                                                                        |      
  Filter Operator [FIL_90]
                                                                         |      
     predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) 
and ss_item_sk is not null) and ss_sold_date_sk is not null) and ss_store_sk is 
not null) (type: boolean)
                                                                         |      
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
     TableScan [TS_0]
                                                                         |      
        alias:store_sales
                                                                         |      
        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: 
NONE
                                                                         |<-Map 
11 [SIMPLE_EDGE]
-                                                                           
Reduce Output Operator [RS_27]
+                                                                           
Reduce Output Operator [RS_25]
                                                                               
key expressions:_col2 (type: int), _col1 (type: int), _col3 (type: int)
                                                                               
Map-reduce partition columns:_col2 (type: int), _col1 (type: int), _col3 (type: 
int)
                                                                               
sort order:+++
@@ -255,7 +255,7 @@ Stage-0
                                                                               
Select Operator [SEL_5]
                                                                                
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                                                
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                               
  Filter Operator [FIL_105]
+                                                                               
  Filter Operator [FIL_91]
                                                                                
     predicate:(((sr_ticket_number is not null and sr_customer_sk is not null) 
and sr_item_sk is not null) and sr_returned_date_sk is not null) (type: boolean)
                                                                                
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
     TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query18.q.out 
b/ql/src/test/results/clientpositive/perf/query18.q.out
index 4960466..83f21dc 100644
--- a/ql/src/test/results/clientpositive/perf/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/query18.q.out
@@ -19,52 +19,52 @@ Stage-0
       limit:100
       Stage-1
          Reducer 9
-         File Output Operator [FS_60]
+         File Output Operator [FS_48]
             compressed:false
             Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
             table:{"input 
format:":"org.apache.hadoop.mapred.TextInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_59]
+            Limit [LIM_47]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
-               Select Operator [SEL_58]
+               Select Operator [SEL_46]
                |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                |  Statistics:Num rows: 133100005 Data size: 114468695810 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 8 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_57]
+                  Reduce Output Operator [RS_45]
                      key expressions:_col1 (type: string), _col2 (type: 
string), _col3 (type: string), _col0 (type: string)
                      sort order:++++
                      Statistics:Num rows: 133100005 Data size: 114468695810 
Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col4 (type: decimal(16,6)), _col5 
(type: decimal(16,6)), _col6 (type: decimal(16,6)), _col7 (type: 
decimal(16,6)), _col8 (type: decimal(16,6)), _col9 (type: decimal(16,6)), 
_col10 (type: decimal(16,6))
-                     Select Operator [SEL_56]
+                     Select Operator [SEL_44]
                         
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                         Statistics:Num rows: 133100005 Data size: 114468695810 
Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_55]
+                        Group By Operator [GBY_43]
                         |  
aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)","avg(VALUE._col4)","avg(VALUE._col5)","avg(VALUE._col6)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: 
string), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: 
string)
                         |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                         |  Statistics:Num rows: 133100005 Data size: 
114468695810 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 7 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_54]
+                           Reduce Output Operator [RS_42]
                               key expressions:_col0 (type: string), _col1 
(type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                               Map-reduce partition columns:_col0 (type: 
string), _col1 (type: string), _col2 (type: string), _col3 (type: string), 
_col4 (type: string)
                               sort order:+++++
                               Statistics:Num rows: 266200010 Data size: 
228937391620 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col5 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col6 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col7 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col8 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col9 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col10 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col11 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>)
-                              Group By Operator [GBY_53]
+                              Group By Operator [GBY_41]
                                  
aggregations:["avg(_col4)","avg(_col5)","avg(_col6)","avg(_col7)","avg(_col8)","avg(_col9)","avg(_col10)"]
                                  keys:_col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), '0' (type: string)
                                  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                                  Statistics:Num rows: 266200010 Data size: 
228937391620 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_51]
+                                 Select Operator [SEL_39]
                                     
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                                     Statistics:Num rows: 53240002 Data size: 
45787478324 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_100]
+                                    Merge Join Operator [MERGEJOIN_88]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col18 (type: 
int)","1":"_col0 (type: int)"}
                                     |  
outputColumnNames:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col21","_col23","_col24","_col25"]
                                     |  Statistics:Num rows: 53240002 Data 
size: 45787478324 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 15 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_49]
+                                    |  Reduce Output Operator [RS_37]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 
(type: int)
                                     |     sort order:+
@@ -72,26 +72,26 @@ Stage-0
                                     |     Select Operator [SEL_20]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 19800 Data 
size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_94]
+                                    |        Filter Operator [FIL_82]
                                     |           predicate:cd_demo_sk is not 
null (type: boolean)
                                     |           Statistics:Num rows: 19800 
Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_18]
                                     |              alias:cd1
                                     |              Statistics:Num rows: 19800 
Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 6 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_47]
+                                       Reduce Output Operator [RS_36]
                                           key expressions:_col18 (type: int)
                                           Map-reduce partition columns:_col18 
(type: int)
                                           sort order:+
                                           Statistics:Num rows: 48400001 Data 
size: 41624979393 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col4 (type: int), 
_col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: 
decimal(7,2)), _col8 (type: decimal(7,2)), _col14 (type: int), _col16 (type: 
string), _col21 (type: int), _col23 (type: string), _col24 (type: string), 
_col25 (type: string)
-                                          Merge Join Operator [MERGEJOIN_99]
+                                          Merge Join Operator [MERGEJOIN_87]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col19 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col18","_col21","_col23","_col24","_col25"]
                                           |  Statistics:Num rows: 48400001 
Data size: 41624979393 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 14 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_44]
+                                          |  Reduce Output Operator [RS_34]
                                           |     key expressions:_col0 (type: 
int)
                                           |     Map-reduce partition 
columns:_col0 (type: int)
                                           |     sort order:+
@@ -100,26 +100,26 @@ Stage-0
                                           |     Select Operator [SEL_17]
                                           |        
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                           |        Statistics:Num rows: 
20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_93]
+                                          |        Filter Operator [FIL_81]
                                           |           predicate:((ca_state) IN 
('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null) 
(type: boolean)
                                           |           Statistics:Num rows: 
20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_15]
                                           |              alias:customer_address
                                           |              Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 5 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_42]
+                                             Reduce Output Operator [RS_33]
                                                 key expressions:_col19 (type: 
int)
                                                 Map-reduce partition 
columns:_col19 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 44000000 
Data size: 37840889538 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col4 (type: 
int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: 
decimal(7,2)), _col8 (type: decimal(7,2)), _col14 (type: int), _col16 (type: 
string), _col18 (type: int), _col21 (type: int)
-                                                Merge Join Operator 
[MERGEJOIN_98]
+                                                Merge Join Operator 
[MERGEJOIN_86]
                                                 |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                                 |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col18","_col19","_col21"]
                                                 |  Statistics:Num rows: 
44000000 Data size: 37840889538 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 13 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator 
[RS_39]
+                                                |  Reduce Output Operator 
[RS_31]
                                                 |     key expressions:_col0 
(type: int)
                                                 |     Map-reduce partition 
columns:_col0 (type: int)
                                                 |     sort order:+
@@ -128,26 +128,26 @@ Stage-0
                                                 |     Select Operator [SEL_14]
                                                 |        
outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                 |        Statistics:Num rows: 
40000000 Data size: 34400807926 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator 
[FIL_92]
+                                                |        Filter Operator 
[FIL_80]
                                                 |           
predicate:(((c_customer_sk is not null and (c_birth_month) IN (9, 5, 12, 4, 1, 
10)) and c_current_addr_sk is not null) and c_current_cdemo_sk is not null) 
(type: boolean)
                                                 |           Statistics:Num 
rows: 40000000 Data size: 34400807926 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_12]
                                                 |              alias:customer
                                                 |              Statistics:Num 
rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 4 [SIMPLE_EDGE]
-                                                   Reduce Output Operator 
[RS_37]
+                                                   Reduce Output Operator 
[RS_30]
                                                       key expressions:_col1 
(type: int)
                                                       Map-reduce partition 
columns:_col1 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 
508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col4 
(type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 
(type: decimal(7,2)), _col8 (type: decimal(7,2)), _col14 (type: int), _col16 
(type: string)
-                                                      Merge Join Operator 
[MERGEJOIN_97]
+                                                      Merge Join Operator 
[MERGEJOIN_85]
                                                       |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col3 
(type: int)","1":"_col0 (type: int)"}
                                                       |  
outputColumnNames:["_col1","_col4","_col5","_col6","_col7","_col8","_col14","_col16"]
                                                       |  Statistics:Num rows: 
508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 12 [SIMPLE_EDGE]
-                                                      |  Reduce Output 
Operator [RS_34]
+                                                      |  Reduce Output 
Operator [RS_28]
                                                       |     key 
expressions:_col0 (type: int)
                                                       |     Map-reduce 
partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -156,26 +156,26 @@ Stage-0
                                                       |     Select Operator 
[SEL_11]
                                                       |        
outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num 
rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator 
[FIL_91]
+                                                      |        Filter Operator 
[FIL_79]
                                                       |           
predicate:i_item_sk is not null (type: boolean)
                                                       |           
Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column 
stats: NONE
                                                       |           TableScan 
[TS_9]
                                                       |              alias:item
                                                       |              
Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column 
stats: NONE
                                                       |<-Reducer 3 
[SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_32]
+                                                         Reduce Output 
Operator [RS_27]
                                                             key 
expressions:_col3 (type: int)
                                                             Map-reduce 
partition columns:_col3 (type: int)
                                                             sort order:+
                                                             Statistics:Num 
rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                             value 
expressions:_col1 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), 
_col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col8 (type: 
decimal(7,2)), _col14 (type: int)
-                                                            Merge Join 
Operator [MERGEJOIN_96]
+                                                            Merge Join 
Operator [MERGEJOIN_84]
                                                             |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                             |  
keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                             |  
outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col14"]
                                                             |  Statistics:Num 
rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 11 
[SIMPLE_EDGE]
-                                                            |  Reduce Output 
Operator [RS_29]
+                                                            |  Reduce Output 
Operator [RS_25]
                                                             |     key 
expressions:_col0 (type: int)
                                                             |     Map-reduce 
partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -184,26 +184,26 @@ Stage-0
                                                             |     Select 
Operator [SEL_8]
                                                             |        
outputColumnNames:["_col0","_col3"]
                                                             |        
Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column 
stats: NONE
-                                                            |        Filter 
Operator [FIL_90]
+                                                            |        Filter 
Operator [FIL_78]
                                                             |           
predicate:(((cd_gender = 'M') and (cd_education_status = 'College')) and 
cd_demo_sk is not null) (type: boolean)
                                                             |           
Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_6]
                                                             |              
alias:cd1
                                                             |              
Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column 
stats: NONE
                                                             |<-Reducer 2 
[SIMPLE_EDGE]
-                                                               Reduce Output 
Operator [RS_27]
+                                                               Reduce Output 
Operator [RS_24]
                                                                   key 
expressions:_col2 (type: int)
                                                                   Map-reduce 
partition columns:_col2 (type: int)
                                                                   sort order:+
                                                                   
Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column 
stats: NONE
                                                                   value 
expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 
(type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), 
_col8 (type: decimal(7,2))
-                                                                  Merge Join 
Operator [MERGEJOIN_95]
+                                                                  Merge Join 
Operator [MERGEJOIN_83]
                                                                   |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                                   |  
keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                   |  
outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                                                   |  
Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column 
stats: NONE
                                                                   |<-Map 1 
[SIMPLE_EDGE]
-                                                                  |  Reduce 
Output Operator [RS_22]
+                                                                  |  Reduce 
Output Operator [RS_21]
                                                                   |     key 
expressions:_col0 (type: int)
                                                                   |     
Map-reduce partition columns:_col0 (type: int)
                                                                   |     sort 
order:+
@@ -212,14 +212,14 @@ Stage-0
                                                                   |     Select 
Operator [SEL_2]
                                                                   |        
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                                                   |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                  |        
Filter Operator [FIL_88]
+                                                                  |        
Filter Operator [FIL_76]
                                                                   |           
predicate:(((cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null) and 
cs_item_sk is not null) and cs_bill_customer_sk is not null) (type: boolean)
                                                                   |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |           
TableScan [TS_0]
                                                                   |            
  alias:catalog_sales
                                                                   |            
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |<-Map 10 
[SIMPLE_EDGE]
-                                                                     Reduce 
Output Operator [RS_24]
+                                                                     Reduce 
Output Operator [RS_22]
                                                                         key 
expressions:_col0 (type: int)
                                                                         
Map-reduce partition columns:_col0 (type: int)
                                                                         sort 
order:+
@@ -227,7 +227,7 @@ Stage-0
                                                                         Select 
Operator [SEL_5]
                                                                            
outputColumnNames:["_col0"]
                                                                            
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
-                                                                           
Filter Operator [FIL_89]
+                                                                           
Filter Operator [FIL_77]
                                                                               
predicate:(d_date_sk is not null and (d_year = 2001)) (type: boolean)
                                                                               
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
                                                                               
TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query19.q.out 
b/ql/src/test/results/clientpositive/perf/query19.q.out
index bf8dd21..d565839 100644
--- a/ql/src/test/results/clientpositive/perf/query19.q.out
+++ b/ql/src/test/results/clientpositive/perf/query19.q.out
@@ -18,51 +18,51 @@ Stage-0
       limit:100
       Stage-1
          Reducer 8
-         File Output Operator [FS_53]
+         File Output Operator [FS_43]
             compressed:false
             Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
             table:{"input 
format:":"org.apache.hadoop.mapred.TextInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_52]
+            Limit [LIM_42]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
-               Select Operator [SEL_51]
+               Select Operator [SEL_41]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 53240002 Data size: 45787477895 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 7 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_50]
+                  Reduce Output Operator [RS_40]
                      key expressions:_col4 (type: decimal(17,2)), _col1 (type: 
string), _col0 (type: int), _col2 (type: int), _col3 (type: string)
                      sort order:-++++
                      Statistics:Num rows: 53240002 Data size: 45787477895 
Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_47]
+                     Group By Operator [GBY_37]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int), KEY._col1 (type: string), 
KEY._col2 (type: int), KEY._col3 (type: string)
                      |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                      |  Statistics:Num rows: 53240002 Data size: 45787477895 
Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 6 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_46]
+                        Reduce Output Operator [RS_36]
                            key expressions:_col0 (type: int), _col1 (type: 
string), _col2 (type: int), _col3 (type: string)
                            Map-reduce partition columns:_col0 (type: int), 
_col1 (type: string), _col2 (type: int), _col3 (type: string)
                            sort order:++++
                            Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col4 (type: decimal(17,2))
-                           Group By Operator [GBY_45]
+                           Group By Operator [GBY_35]
                               aggregations:["sum(_col7)"]
                               keys:_col9 (type: int), _col10 (type: string), 
_col11 (type: int), _col12 (type: string)
                               
outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                               Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_44]
+                              Select Operator [SEL_34]
                                  
outputColumnNames:["_col9","_col10","_col11","_col12","_col7"]
                                  Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
-                                 Filter Operator [FIL_74]
+                                 Filter Operator [FIL_33]
                                     predicate:(substr(_col17, 1, 5) <> 
substr(_col19, 1, 5)) (type: boolean)
                                     Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_85]
+                                    Merge Join Operator [MERGEJOIN_74]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col6 (type: 
int)","1":"_col0 (type: int)"}
                                     |  
outputColumnNames:["_col7","_col9","_col10","_col11","_col12","_col17","_col19"]
                                     |  Statistics:Num rows: 106480005 Data 
size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 13 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_41]
+                                    |  Reduce Output Operator [RS_31]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 
(type: int)
                                     |     sort order:+
@@ -71,26 +71,26 @@ Stage-0
                                     |     Select Operator [SEL_17]
                                     |        
outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 1704 Data 
size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_80]
+                                    |        Filter Operator [FIL_69]
                                     |           predicate:s_store_sk is not 
null (type: boolean)
                                     |           Statistics:Num rows: 1704 Data 
size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_15]
                                     |              alias:store
                                     |              Statistics:Num rows: 1704 
Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 5 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_39]
+                                       Reduce Output Operator [RS_30]
                                           key expressions:_col6 (type: int)
                                           Map-reduce partition columns:_col6 
(type: int)
                                           sort order:+
                                           Statistics:Num rows: 96800003 Data 
size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col7 (type: 
decimal(7,2)), _col9 (type: int), _col10 (type: string), _col11 (type: int), 
_col12 (type: string), _col17 (type: string)
-                                          Merge Join Operator [MERGEJOIN_84]
+                                          Merge Join Operator [MERGEJOIN_73]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col15 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col6","_col7","_col9","_col10","_col11","_col12","_col17"]
                                           |  Statistics:Num rows: 96800003 
Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 12 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_36]
+                                          |  Reduce Output Operator [RS_28]
                                           |     key expressions:_col0 (type: 
int)
                                           |     Map-reduce partition 
columns:_col0 (type: int)
                                           |     sort order:+
@@ -99,26 +99,26 @@ Stage-0
                                           |     Select Operator [SEL_14]
                                           |        
outputColumnNames:["_col0","_col1"]
                                           |        Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_79]
+                                          |        Filter Operator [FIL_68]
                                           |           predicate:ca_address_sk 
is not null (type: boolean)
                                           |           Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_12]
                                           |              alias:customer_address
                                           |              Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 4 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_34]
+                                             Reduce Output Operator [RS_27]
                                                 key expressions:_col15 (type: 
int)
                                                 Map-reduce partition 
columns:_col15 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 88000001 
Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col6 (type: 
int), _col7 (type: decimal(7,2)), _col9 (type: int), _col10 (type: string), 
_col11 (type: int), _col12 (type: string)
-                                                Merge Join Operator 
[MERGEJOIN_83]
+                                                Merge Join Operator 
[MERGEJOIN_72]
                                                 |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                                 |  keys:{"0":"_col5 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col6","_col7","_col9","_col10","_col11","_col12","_col15"]
                                                 |  Statistics:Num rows: 
88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 11 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator 
[RS_31]
+                                                |  Reduce Output Operator 
[RS_25]
                                                 |     key expressions:_col0 
(type: int)
                                                 |     Map-reduce partition 
columns:_col0 (type: int)
                                                 |     sort order:+
@@ -127,26 +127,26 @@ Stage-0
                                                 |     Select Operator [SEL_11]
                                                 |        
outputColumnNames:["_col0","_col1"]
                                                 |        Statistics:Num rows: 
80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator 
[FIL_78]
+                                                |        Filter Operator 
[FIL_67]
                                                 |           
predicate:(c_customer_sk is not null and c_current_addr_sk is not null) (type: 
boolean)
                                                 |           Statistics:Num 
rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_9]
                                                 |              alias:customer
                                                 |              Statistics:Num 
rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator 
[RS_29]
+                                                   Reduce Output Operator 
[RS_24]
                                                       key expressions:_col5 
(type: int)
                                                       Map-reduce partition 
columns:_col5 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 
254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col6 
(type: int), _col7 (type: decimal(7,2)), _col9 (type: int), _col10 (type: 
string), _col11 (type: int), _col12 (type: string)
-                                                      Merge Join Operator 
[MERGEJOIN_82]
+                                                      Merge Join Operator 
[MERGEJOIN_71]
                                                       |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col4 
(type: int)","1":"_col0 (type: int)"}
                                                       |  
outputColumnNames:["_col5","_col6","_col7","_col9","_col10","_col11","_col12"]
                                                       |  Statistics:Num rows: 
254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 10 [SIMPLE_EDGE]
-                                                      |  Reduce Output 
Operator [RS_26]
+                                                      |  Reduce Output 
Operator [RS_22]
                                                       |     key 
expressions:_col0 (type: int)
                                                       |     Map-reduce 
partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -155,26 +155,26 @@ Stage-0
                                                       |     Select Operator 
[SEL_8]
                                                       |        
outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                       |        Statistics:Num 
rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator 
[FIL_77]
+                                                      |        Filter Operator 
[FIL_66]
                                                       |           
predicate:((i_manager_id = 7) and i_item_sk is not null) (type: boolean)
                                                       |           
Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column 
stats: NONE
                                                       |           TableScan 
[TS_6]
                                                       |              alias:item
                                                       |              
Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column 
stats: NONE
                                                       |<-Reducer 2 
[SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_24]
+                                                         Reduce Output 
Operator [RS_21]
                                                             key 
expressions:_col4 (type: int)
                                                             Map-reduce 
partition columns:_col4 (type: int)
                                                             sort order:+
                                                             Statistics:Num 
rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                             value 
expressions:_col5 (type: int), _col6 (type: int), _col7 (type: decimal(7,2))
-                                                            Merge Join 
Operator [MERGEJOIN_81]
+                                                            Merge Join 
Operator [MERGEJOIN_70]
                                                             |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                             |  
keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                             |  
outputColumnNames:["_col4","_col5","_col6","_col7"]
                                                             |  Statistics:Num 
rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 1 
[SIMPLE_EDGE]
-                                                            |  Reduce Output 
Operator [RS_19]
+                                                            |  Reduce Output 
Operator [RS_18]
                                                             |     key 
expressions:_col0 (type: int)
                                                             |     Map-reduce 
partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -182,14 +182,14 @@ Stage-0
                                                             |     Select 
Operator [SEL_2]
                                                             |        
outputColumnNames:["_col0"]
                                                             |        
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
-                                                            |        Filter 
Operator [FIL_75]
+                                                            |        Filter 
Operator [FIL_64]
                                                             |           
predicate:(((d_moy = 11) and d_date_sk is not null) and (d_year = 1999)) (type: 
boolean)
                                                             |           
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_0]
                                                             |              
alias:date_dim
                                                             |              
Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column 
stats: NONE
                                                             |<-Map 9 
[SIMPLE_EDGE]
-                                                               Reduce Output 
Operator [RS_21]
+                                                               Reduce Output 
Operator [RS_19]
                                                                   key 
expressions:_col0 (type: int)
                                                                   Map-reduce 
partition columns:_col0 (type: int)
                                                                   sort order:+
@@ -198,7 +198,7 @@ Stage-0
                                                                   Select 
Operator [SEL_5]
                                                                      
outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                                      
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     Filter 
Operator [FIL_76]
+                                                                     Filter 
Operator [FIL_65]
                                                                         
predicate:(((ss_sold_date_sk is not null and ss_item_sk is not null) and 
ss_customer_sk is not null) and ss_store_sk is not null) (type: boolean)
                                                                         
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         
TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query20.q.out 
b/ql/src/test/results/clientpositive/perf/query20.q.out
index 611af8d..40c9a17 100644
--- a/ql/src/test/results/clientpositive/perf/query20.q.out
+++ b/ql/src/test/results/clientpositive/perf/query20.q.out
@@ -16,68 +16,68 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_32]
+         File Output Operator [FS_28]
             compressed:false
             Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE 
Column stats: NONE
             table:{"input 
format:":"org.apache.hadoop.mapred.TextInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_31]
+            Limit [LIM_27]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: 
COMPLETE Column stats: NONE
-               Select Operator [SEL_30]
+               Select Operator [SEL_26]
                |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                |  Statistics:Num rows: 139755 Data size: 200727046 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_29]
+                  Reduce Output Operator [RS_25]
                      key expressions:_col1 (type: string), _col2 (type: 
string), _col4 (type: string), _col0 (type: string), _col6 (type: 
decimal(38,23))
                      sort order:+++++
                      Statistics:Num rows: 139755 Data size: 200727046 Basic 
stats: COMPLETE Column stats: NONE
                      value expressions:_col3 (type: decimal(7,2)), _col5 
(type: decimal(17,2))
-                     Select Operator [SEL_27]
+                     Select Operator [SEL_23]
                         
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         Statistics:Num rows: 139755 Data size: 200727046 Basic 
stats: COMPLETE Column stats: NONE
-                        PTF Operator [PTF_26]
+                        PTF Operator [PTF_22]
                            Function definitions:[{"Input 
definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order 
by:":"_col3","partition by:":"_col3"}]
                            Statistics:Num rows: 139755 Data size: 200727046 
Basic stats: COMPLETE Column stats: NONE
-                           Select Operator [SEL_25]
+                           Select Operator [SEL_21]
                            |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                            |  Statistics:Num rows: 139755 Data size: 200727046 
Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 4 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_24]
+                              Reduce Output Operator [RS_20]
                                  key expressions:_col3 (type: string)
                                  Map-reduce partition columns:_col3 (type: 
string)
                                  sort order:+
                                  Statistics:Num rows: 139755 Data size: 
200727046 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: string), _col1 
(type: string), _col2 (type: string), _col4 (type: decimal(7,2)), _col5 (type: 
decimal(17,2))
-                                 Select Operator [SEL_23]
+                                 Select Operator [SEL_19]
                                     
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     Statistics:Num rows: 139755 Data size: 
200727046 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_22]
+                                    Group By Operator [GBY_18]
                                     |  aggregations:["sum(VALUE._col0)"]
                                     |  keys:KEY._col0 (type: string), 
KEY._col1 (type: string), KEY._col2 (type: decimal(7,2)), KEY._col3 (type: 
string), KEY._col4 (type: string)
                                     |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 139755 Data size: 
200727046 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 3 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_21]
+                                       Reduce Output Operator [RS_17]
                                           key expressions:_col0 (type: 
string), _col1 (type: string), _col2 (type: decimal(7,2)), _col3 (type: 
string), _col4 (type: string)
                                           Map-reduce partition columns:_col0 
(type: string), _col1 (type: string), _col2 (type: decimal(7,2)), _col3 (type: 
string), _col4 (type: string)
                                           sort order:+++++
                                           Statistics:Num rows: 279510 Data 
size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col5 (type: 
decimal(17,2))
-                                          Group By Operator [GBY_20]
+                                          Group By Operator [GBY_16]
                                              aggregations:["sum(_col2)"]
                                              keys:_col4 (type: string), _col5 
(type: string), _col6 (type: decimal(7,2)), _col7 (type: string), _col8 (type: 
string)
                                              
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                              Statistics:Num rows: 279510 Data 
size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_19]
+                                             Select Operator [SEL_15]
                                                 
outputColumnNames:["_col4","_col5","_col6","_col7","_col8","_col2"]
                                                 Statistics:Num rows: 279510 
Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator 
[MERGEJOIN_42]
+                                                Merge Join Operator 
[MERGEJOIN_38]
                                                 |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col2","_col4","_col5","_col6","_col7","_col8"]
                                                 |  Statistics:Num rows: 279510 
Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 8 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator 
[RS_17]
+                                                |  Reduce Output Operator 
[RS_13]
                                                 |     key expressions:_col0 
(type: int)
                                                 |     Map-reduce partition 
columns:_col0 (type: int)
                                                 |     sort order:+
@@ -85,26 +85,26 @@ Stage-0
                                                 |     Select Operator [SEL_8]
                                                 |        
outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator 
[FIL_40]
+                                                |        Filter Operator 
[FIL_36]
                                                 |           predicate:(d_date 
BETWEEN '2001-01-12' AND '2001-02-11' and d_date_sk is not null) (type: boolean)
                                                 |           Statistics:Num 
rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_6]
                                                 |              alias:date_dim
                                                 |              Statistics:Num 
rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator 
[RS_15]
+                                                   Reduce Output Operator 
[RS_12]
                                                       key expressions:_col0 
(type: int)
                                                       Map-reduce partition 
columns:_col0 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 
254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col2 
(type: decimal(7,2)), _col4 (type: string), _col5 (type: string), _col6 (type: 
decimal(7,2)), _col7 (type: string), _col8 (type: string)
-                                                      Merge Join Operator 
[MERGEJOIN_41]
+                                                      Merge Join Operator 
[MERGEJOIN_37]
                                                       |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col1 
(type: int)","1":"_col0 (type: int)"}
                                                       |  
outputColumnNames:["_col0","_col2","_col4","_col5","_col6","_col7","_col8"]
                                                       |  Statistics:Num rows: 
254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output 
Operator [RS_10]
+                                                      |  Reduce Output 
Operator [RS_9]
                                                       |     key 
expressions:_col1 (type: int)
                                                       |     Map-reduce 
partition columns:_col1 (type: int)
                                                       |     sort order:+
@@ -113,14 +113,14 @@ Stage-0
                                                       |     Select Operator 
[SEL_2]
                                                       |        
outputColumnNames:["_col0","_col1","_col2"]
                                                       |        Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator 
[FIL_38]
+                                                      |        Filter Operator 
[FIL_34]
                                                       |           
predicate:(cs_item_sk is not null and cs_sold_date_sk is not null) (type: 
boolean)
                                                       |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan 
[TS_0]
                                                       |              
alias:catalog_sales
                                                       |              
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 7 [SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_12]
+                                                         Reduce Output 
Operator [RS_10]
                                                             key 
expressions:_col0 (type: int)
                                                             Map-reduce 
partition columns:_col0 (type: int)
                                                             sort order:+
@@ -129,7 +129,7 @@ Stage-0
                                                             Select Operator 
[SEL_5]
                                                                
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                                Statistics:Num 
rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                                               Filter Operator 
[FIL_39]
+                                                               Filter Operator 
[FIL_35]
                                                                   
predicate:((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not 
null) (type: boolean)
                                                                   
Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column 
stats: NONE
                                                                   TableScan 
[TS_3]

Reply via email to