http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query93.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query93.q.out 
b/ql/src/test/results/clientpositive/perf/query93.q.out
index 37396d9..5255145 100644
--- a/ql/src/test/results/clientpositive/perf/query93.q.out
+++ b/ql/src/test/results/clientpositive/perf/query93.q.out
@@ -15,48 +15,48 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_27]
+         File Output Operator [FS_23]
             compressed:false
             Statistics:Num rows: 19 Data size: 3858 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_26]
+            Limit [LIM_22]
                Number of rows:100
                Statistics:Num rows: 19 Data size: 3858 Basic stats: COMPLETE 
Column stats: NONE
-               Select Operator [SEL_25]
+               Select Operator [SEL_21]
                |  outputColumnNames:["_col0","_col1"]
                |  Statistics:Num rows: 19 Data size: 3858 Basic stats: 
COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_24]
+                  Reduce Output Operator [RS_20]
                      key expressions:_col1 (type: decimal(28,2)), _col0 (type: 
int)
                      sort order:++
                      Statistics:Num rows: 19 Data size: 3858 Basic stats: 
COMPLETE Column stats: NONE
-                     Group By Operator [GBY_22]
+                     Group By Operator [GBY_18]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int)
                      |  outputColumnNames:["_col0","_col1"]
                      |  Statistics:Num rows: 19 Data size: 3858 Basic stats: 
COMPLETE Column stats: NONE
                      |<-Reducer 3 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_21]
+                        Reduce Output Operator [RS_17]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 39 Data size: 7920 Basic 
stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: decimal(28,2))
-                           Group By Operator [GBY_20]
+                           Group By Operator [GBY_16]
                               aggregations:["sum(_col1)"]
                               keys:_col0 (type: int)
                               outputColumnNames:["_col0","_col1"]
                               Statistics:Num rows: 39 Data size: 7920 Basic 
stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_18]
+                              Select Operator [SEL_14]
                                  outputColumnNames:["_col0","_col1"]
                                  Statistics:Num rows: 39 Data size: 7920 Basic 
stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_37]
+                                 Merge Join Operator [MERGEJOIN_33]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col6 (type: int)","1":"_col0 
(type: int)"}
                                  |  
outputColumnNames:["_col1","_col3","_col4","_col8"]
                                  |  Statistics:Num rows: 39 Data size: 7920 
Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 7 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_16]
+                                 |  Reduce Output Operator [RS_12]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 
(type: int)
                                  |     sort order:+
@@ -64,26 +64,26 @@ Stage-0
                                  |     Select Operator [SEL_7]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 36 Data size: 
7200 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_35]
+                                 |        Filter Operator [FIL_31]
                                  |           predicate:((r_reason_desc = 'Did 
not like the warranty') and r_reason_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 36 Data 
size: 7200 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_5]
                                  |              alias:reason
                                  |              Statistics:Num rows: 72 Data 
size: 14400 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_14]
+                                    Reduce Output Operator [RS_11]
                                        key expressions:_col6 (type: int)
                                        Map-reduce partition columns:_col6 
(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), _col4 (type: decimal(7,2)), _col8 (type: int)
-                                       Merge Join Operator [MERGEJOIN_36]
+                                       Merge Join Operator [MERGEJOIN_32]
                                        |  condition map:[{"":"Inner Join 0 to 
1"}]
                                        |  keys:{"0":"_col0 (type: int), _col2 
(type: int)","1":"_col0 (type: int), _col2 (type: int)"}
                                        |  
outputColumnNames:["_col1","_col3","_col4","_col6","_col8"]
                                        |  Statistics:Num rows: 1 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
                                        |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_9]
+                                       |  Reduce Output Operator [RS_8]
                                        |     key expressions:_col0 (type: 
int), _col2 (type: int)
                                        |     Map-reduce partition 
columns:_col0 (type: int), _col2 (type: int)
                                        |     sort order:++
@@ -92,14 +92,11 @@ Stage-0
                                        |     Select Operator [SEL_1]
                                        |        
outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                        |        Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        Filter Operator [FIL_33]
-                                       |           predicate:(ss_item_sk is 
not null and ss_ticket_number is not null) (type: boolean)
+                                       |        TableScan [TS_0]
+                                       |           alias:store_sales
                                        |           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 6 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_11]
+                                          Reduce Output Operator [RS_9]
                                              key expressions:_col0 (type: 
int), _col2 (type: int)
                                              Map-reduce partition 
columns:_col0 (type: int), _col2 (type: int)
                                              sort order:++
@@ -108,8 +105,8 @@ Stage-0
                                              Select Operator [SEL_4]
                                                 
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Filter Operator [FIL_34]
-                                                   predicate:((sr_reason_sk is 
not null and sr_item_sk is not null) and sr_ticket_number is not null) (type: 
boolean)
+                                                Filter Operator [FIL_30]
+                                                   predicate:sr_reason_sk is 
not null (type: boolean)
                                                    Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    TableScan [TS_2]
                                                       alias:store_returns

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query94.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query94.q.out 
b/ql/src/test/results/clientpositive/perf/query94.q.out
index 46acdb1..0357835 100644
--- a/ql/src/test/results/clientpositive/perf/query94.q.out
+++ b/ql/src/test/results/clientpositive/perf/query94.q.out
@@ -18,146 +18,146 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_59]
+         File Output Operator [FS_49]
             compressed:false
             Statistics:Num rows: 1 Data size: 344 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_58]
+            Limit [LIM_48]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
-               Group By Operator [GBY_56]
+               Group By Operator [GBY_46]
                |  aggregations:["count(DISTINCT 
KEY._col0:0._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_55]
+                  Reduce Output Operator [RS_45]
                      key expressions:_col0 (type: int)
                      sort order:+
                      Statistics:Num rows: 14641000 Data size: 14858857641 
Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(17,2)), _col3 
(type: decimal(17,2))
-                     Group By Operator [GBY_54]
+                     Group By Operator [GBY_44]
                         aggregations:["count(DISTINCT 
_col3)","sum(_col4)","sum(_col5)"]
                         keys:_col3 (type: int)
                         outputColumnNames:["_col0","_col1","_col2","_col3"]
                         Statistics:Num rows: 14641000 Data size: 14858857641 
Basic stats: COMPLETE Column stats: NONE
-                        Select Operator [SEL_53]
+                        Select Operator [SEL_43]
                            outputColumnNames:["_col3","_col4","_col5"]
                            Statistics:Num rows: 14641000 Data size: 
14858857641 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_81]
+                           Filter Operator [FIL_42]
                               predicate:_col12 is null (type: boolean)
                               Statistics:Num rows: 14641000 Data size: 
14858857641 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_95]
+                              Merge Join Operator [MERGEJOIN_83]
                               |  condition map:[{"":"Left Outer Join0 to 1"}]
                               |  keys:{"0":"_col3 (type: int)","1":"_col0 
(type: int)"}
                               |  
outputColumnNames:["_col3","_col4","_col5","_col12"]
                               |  Statistics:Num rows: 29282000 Data size: 
29717715282 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 14 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_50]
+                              |  Reduce Output Operator [RS_40]
                               |     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
-                              |     Select Operator [SEL_26]
+                              |     Select Operator [SEL_24]
                               |        outputColumnNames:["_col0"]
                               |        Statistics:Num rows: 1 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
-                              |        TableScan [TS_25]
+                              |        TableScan [TS_23]
                               |           alias:wr1
                               |           Statistics:Num rows: 1 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
                               |<-Reducer 5 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_49]
+                                 Reduce Output Operator [RS_39]
                                     key expressions:_col3 (type: int)
                                     Map-reduce partition columns:_col3 (type: 
int)
                                     sort order:+
                                     Statistics:Num rows: 26620000 Data size: 
27016104217 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col4 (type: 
decimal(7,2)), _col5 (type: decimal(7,2))
-                                    Merge Join Operator [MERGEJOIN_94]
+                                    Merge Join Operator [MERGEJOIN_82]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                     |  
outputColumnNames:["_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 26620000 Data 
size: 27016104217 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 13 [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:+
                                     |     Statistics:Num rows: 36524 Data 
size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |     Select Operator [SEL_24]
+                                    |     Select Operator [SEL_22]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 36524 Data 
size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_88]
+                                    |        Filter Operator [FIL_76]
                                     |           predicate:(d_date BETWEEN 
'1999-05-01' AND '1999-07-01' and d_date_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |           TableScan [TS_22]
+                                    |           TableScan [TS_20]
                                     |              alias:d
                                     |              Statistics:Num rows: 73049 
Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_45]
+                                       Reduce Output Operator [RS_36]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 
(type: int)
                                           sort order:+
                                           Statistics:Num rows: 24200000 Data 
size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: int), 
_col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                          Merge Join Operator [MERGEJOIN_93]
+                                          Merge Join Operator [MERGEJOIN_81]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col2 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col0","_col3","_col4","_col5"]
                                           |  Statistics:Num rows: 24200000 
Data size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 12 [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:+
                                           |     Statistics:Num rows: 42 Data 
size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |     Select Operator [SEL_21]
+                                          |     Select Operator [SEL_19]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 42 
Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_87]
+                                          |        Filter Operator [FIL_75]
                                           |           
predicate:((web_company_name = 'pri') and web_site_sk is not null) (type: 
boolean)
                                           |           Statistics:Num rows: 42 
Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |           TableScan [TS_19]
+                                          |           TableScan [TS_17]
                                           |              alias:s
                                           |              Statistics:Num rows: 
84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 3 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_40]
+                                             Reduce Output Operator [RS_33]
                                                 key expressions:_col2 (type: 
int)
                                                 Map-reduce partition 
columns:_col2 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 22000000 
Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col0 (type: 
int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                                Merge Join Operator 
[MERGEJOIN_92]
+                                                Merge Join Operator 
[MERGEJOIN_80]
                                                 |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                                 |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col0","_col2","_col3","_col4","_col5"]
                                                 |  Statistics:Num rows: 
22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 11 [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:+
                                                 |     Statistics:Num rows: 
20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |     Select Operator [SEL_18]
+                                                |     Select Operator [SEL_16]
                                                 |        
outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 
20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator 
[FIL_86]
+                                                |        Filter Operator 
[FIL_74]
                                                 |           
predicate:((ca_state = 'TX') and ca_address_sk is not null) (type: boolean)
                                                 |           Statistics:Num 
rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |           TableScan [TS_16]
+                                                |           TableScan [TS_14]
                                                 |              alias:ca
                                                 |              Statistics:Num 
rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator 
[RS_35]
+                                                   Reduce Output Operator 
[RS_30]
                                                       key expressions:_col1 
(type: int)
                                                       Map-reduce partition 
columns:_col1 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 1 
Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       value expressions:_col0 
(type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), 
_col5 (type: decimal(7,2))
-                                                      Merge Join Operator 
[MERGEJOIN_91]
+                                                      Merge Join Operator 
[MERGEJOIN_79]
                                                       |  condition 
map:[{"":"Left Semi Join 0 to 1"}]
                                                       |  keys:{"0":"_col3 
(type: int)","1":"_col0 (type: int)"}
                                                       |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                       |  Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output 
Operator [RS_30]
+                                                      |  Reduce Output 
Operator [RS_27]
                                                       |     key 
expressions:_col3 (type: int)
                                                       |     Map-reduce 
partition columns:_col3 (type: int)
                                                       |     sort order:+
@@ -166,35 +166,35 @@ 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_82]
+                                                      |        Filter Operator 
[FIL_71]
                                                       |           
predicate:(((ws_ship_addr_sk is not null and ws_web_site_sk is not null) and 
ws_ship_date_sk is not null) and ws_order_number is not null) (type: boolean)
                                                       |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan 
[TS_0]
                                                       |              alias:ws1
                                                       |              
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Reducer 9 
[SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_32]
+                                                         Reduce Output 
Operator [RS_28]
                                                             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
-                                                            Group By Operator 
[GBY_28]
+                                                            Group By Operator 
[GBY_26]
                                                                keys:_col0 
(type: int)
                                                                
outputColumnNames:["_col0"]
                                                                Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               Select Operator 
[SEL_15]
+                                                               Select Operator 
[SEL_13]
                                                                   
outputColumnNames:["_col0"]
                                                                   
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                  Filter 
Operator [FIL_83]
+                                                                  Filter 
Operator [FIL_12]
                                                                      
predicate:(_col0 <> _col2) (type: boolean)
                                                                      
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     Merge 
Join Operator [MERGEJOIN_90]
+                                                                     Merge 
Join Operator [MERGEJOIN_78]
                                                                      |  
condition map:[{"":"Inner Join 0 to 1"}]
                                                                      |  
keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                                                      |  
outputColumnNames:["_col0","_col1","_col2"]
                                                                      |  
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |<-Map 10 
[SIMPLE_EDGE]
-                                                                     |  Reduce 
Output Operator [RS_12]
+                                                                     |  Reduce 
Output Operator [RS_10]
                                                                      |     key 
expressions:_col1 (type: int)
                                                                      |     
Map-reduce partition columns:_col1 (type: int)
                                                                      |     
sort order:+
@@ -203,14 +203,14 @@ Stage-0
                                                                      |     
Select Operator [SEL_8]
                                                                      |        
outputColumnNames:["_col0","_col1"]
                                                                      |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     |        
Filter Operator [FIL_85]
+                                                                     |        
Filter Operator [FIL_73]
                                                                      |         
  predicate:ws_order_number is not null (type: boolean)
                                                                      |         
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |         
  TableScan [TS_6]
                                                                      |         
     alias:ws1
                                                                      |         
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |<-Map 8 
[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:+
@@ -219,7 +219,7 @@ Stage-0
                                                                            
Select Operator [SEL_5]
                                                                               
outputColumnNames:["_col0","_col1"]
                                                                               
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                              
Filter Operator [FIL_84]
+                                                                              
Filter Operator [FIL_72]
                                                                                
  predicate:ws_order_number 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/query95.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query95.q.out 
b/ql/src/test/results/clientpositive/perf/query95.q.out
index 03b0c5c..a7c6a98 100644
--- a/ql/src/test/results/clientpositive/perf/query95.q.out
+++ b/ql/src/test/results/clientpositive/perf/query95.q.out
@@ -19,113 +19,113 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 6
-         File Output Operator [FS_78]
+         File Output Operator [FS_63]
             compressed:false
             Statistics:Num rows: 1 Data size: 344 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"}
-            Group By Operator [GBY_76]
+            Group By Operator [GBY_61]
             |  aggregations:["count(DISTINCT 
KEY._col0:0._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             |  outputColumnNames:["_col0","_col1","_col2"]
             |  Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
             |<-Reducer 5 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_75]
+               Reduce Output Operator [RS_60]
                   key expressions:_col0 (type: int)
                   sort order:+
                   Statistics:Num rows: 26620000 Data size: 27016104217 Basic 
stats: COMPLETE Column stats: NONE
                   value expressions:_col2 (type: decimal(17,2)), _col3 (type: 
decimal(17,2))
-                  Group By Operator [GBY_74]
+                  Group By Operator [GBY_59]
                      aggregations:["count(DISTINCT 
_col3)","sum(_col4)","sum(_col5)"]
                      keys:_col3 (type: int)
                      outputColumnNames:["_col0","_col1","_col2","_col3"]
                      Statistics:Num rows: 26620000 Data size: 27016104217 
Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_139]
+                     Merge Join Operator [MERGEJOIN_122]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col3","_col4","_col5"]
                      |  Statistics:Num rows: 26620000 Data size: 27016104217 
Basic stats: COMPLETE Column stats: NONE
                      |<-Map 17 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_71]
+                     |  Reduce Output Operator [RS_56]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 36524 Data size: 40870356 
Basic stats: COMPLETE Column stats: NONE
-                     |     Select Operator [SEL_46]
+                     |     Select Operator [SEL_40]
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 36524 Data size: 40870356 
Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_132]
+                     |        Filter Operator [FIL_115]
                      |           predicate:(d_date BETWEEN '2002-05-01' AND 
'2002-06-30' and d_date_sk is not null) (type: boolean)
                      |           Statistics:Num rows: 36524 Data size: 
40870356 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_44]
+                     |           TableScan [TS_38]
                      |              alias:d
                      |              Statistics:Num rows: 73049 Data size: 
81741831 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_69]
+                        Reduce Output Operator [RS_55]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 24200000 Data size: 
24560094211 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col3 (type: int), _col4 (type: 
decimal(7,2)), _col5 (type: decimal(7,2))
-                           Merge Join Operator [MERGEJOIN_138]
+                           Merge Join Operator [MERGEJOIN_121]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: 
int)"}
                            |  
outputColumnNames:["_col0","_col3","_col4","_col5"]
                            |  Statistics:Num rows: 24200000 Data size: 
24560094211 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 16 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_66]
+                           |  Reduce Output Operator [RS_53]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 42 Data size: 77704 
Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_43]
+                           |     Select Operator [SEL_37]
                            |        outputColumnNames:["_col0"]
                            |        Statistics:Num rows: 42 Data size: 77704 
Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_131]
+                           |        Filter Operator [FIL_114]
                            |           predicate:((web_company_name = 'pri') 
and web_site_sk is not null) (type: boolean)
                            |           Statistics:Num rows: 42 Data size: 
77704 Basic stats: COMPLETE Column stats: NONE
-                           |           TableScan [TS_41]
+                           |           TableScan [TS_35]
                            |              alias:s
                            |              Statistics:Num rows: 84 Data size: 
155408 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 3 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_64]
+                              Reduce Output Operator [RS_52]
                                  key expressions:_col2 (type: int)
                                  Map-reduce partition columns:_col2 (type: int)
                                  sort order:+
                                  Statistics:Num rows: 22000000 Data size: 
22327357890 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: int), _col3 
(type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                 Merge Join Operator [MERGEJOIN_137]
+                                 Merge Join Operator [MERGEJOIN_120]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col1 (type: int)","1":"_col0 
(type: int)"}
                                  |  
outputColumnNames:["_col0","_col2","_col3","_col4","_col5"]
                                  |  Statistics:Num rows: 22000000 Data size: 
22327357890 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 15 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_61]
+                                 |  Reduce Output Operator [RS_50]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 
(type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 20000000 Data 
size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |     Select Operator [SEL_40]
+                                 |     Select Operator [SEL_34]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 20000000 Data 
size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_130]
+                                 |        Filter Operator [FIL_113]
                                  |           predicate:((ca_state = 'GA') and 
ca_address_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 20000000 
Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_38]
+                                 |           TableScan [TS_32]
                                  |              alias:ca
                                  |              Statistics:Num rows: 40000000 
Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_59]
+                                    Reduce Output Operator [RS_49]
                                        key expressions:_col1 (type: int)
                                        Map-reduce partition columns:_col1 
(type: int)
                                        sort order:+
                                        Statistics:Num rows: 2 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
                                        value expressions:_col0 (type: int), 
_col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: 
decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_136]
+                                       Merge Join Operator [MERGEJOIN_119]
                                        |  condition map:[{"":"Left Semi Join 0 
to 1"},{"":"Left Semi Join 0 to 2"}]
                                        |  keys:{"0":"_col3 (type: 
int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                                        |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                        |  Statistics:Num rows: 2 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
                                        |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_52]
+                                       |  Reduce Output Operator [RS_45]
                                        |     key expressions:_col3 (type: int)
                                        |     Map-reduce partition 
columns:_col3 (type: int)
                                        |     sort order:+
@@ -134,114 +134,114 @@ 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_122]
+                                       |        Filter Operator [FIL_107]
                                        |           
predicate:(((ws_ship_addr_sk is not null and ws_web_site_sk is not null) and 
ws_ship_date_sk is not null) and ws_order_number is not null) (type: boolean)
                                        |           Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:ws1
                                        |              Statistics:Num rows: 1 
Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |<-Reducer 11 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_56]
+                                       |  Reduce Output Operator [RS_47]
                                        |     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
-                                       |     Group By Operator [GBY_50]
+                                       |     Group By Operator [GBY_44]
                                        |        keys:_col0 (type: int)
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        Merge Join Operator 
[MERGEJOIN_135]
+                                       |        Merge Join Operator 
[MERGEJOIN_118]
                                        |        |  condition map:[{"":"Inner 
Join 0 to 1"}]
                                        |        |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                        |        |  outputColumnNames:["_col0"]
                                        |        |  Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Map 10 [SIMPLE_EDGE]
-                                       |        |  Reduce Output Operator 
[RS_33]
+                                       |        |  Reduce Output Operator 
[RS_28]
                                        |        |     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
-                                       |        |     Select Operator [SEL_18]
+                                       |        |     Select Operator [SEL_16]
                                        |        |        
outputColumnNames:["_col0"]
                                        |        |        Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |        Filter Operator 
[FIL_126]
+                                       |        |        Filter Operator 
[FIL_110]
                                        |        |           
predicate:wr_order_number is not null (type: boolean)
                                        |        |           Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |           TableScan [TS_16]
+                                       |        |           TableScan [TS_14]
                                        |        |              alias:wr
                                        |        |              Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Reducer 13 [SIMPLE_EDGE]
-                                       |           Reduce Output Operator 
[RS_35]
+                                       |           Reduce Output Operator 
[RS_29]
                                        |              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
-                                       |              Select Operator [SEL_31]
+                                       |              Select Operator [SEL_27]
                                        |                 
outputColumnNames:["_col0"]
                                        |                 Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                 Filter Operator 
[FIL_127]
+                                       |                 Filter Operator 
[FIL_26]
                                        |                    predicate:(_col0 
<> _col2) (type: boolean)
                                        |                    Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    Merge Join 
Operator [MERGEJOIN_134]
+                                       |                    Merge Join 
Operator [MERGEJOIN_117]
                                        |                    |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                        |                    |  
keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                        |                    |  
outputColumnNames:["_col0","_col1","_col2"]
                                        |                    |  Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |<-Map 12 
[SIMPLE_EDGE]
-                                       |                    |  Reduce Output 
Operator [RS_26]
+                                       |                    |  Reduce Output 
Operator [RS_23]
                                        |                    |     key 
expressions:_col1 (type: int)
                                        |                    |     Map-reduce 
partition columns:_col1 (type: int)
                                        |                    |     sort order:+
                                        |                    |     
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |     value 
expressions:_col0 (type: int)
-                                       |                    |     Select 
Operator [SEL_21]
+                                       |                    |     Select 
Operator [SEL_19]
                                        |                    |        
outputColumnNames:["_col0","_col1"]
                                        |                    |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    |        Filter 
Operator [FIL_128]
+                                       |                    |        Filter 
Operator [FIL_111]
                                        |                    |           
predicate:ws_order_number is not null (type: boolean)
                                        |                    |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    |           
TableScan [TS_19]
+                                       |                    |           
TableScan [TS_17]
                                        |                    |              
alias:ws1
                                        |                    |              
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |<-Map 14 
[SIMPLE_EDGE]
-                                       |                       Reduce Output 
Operator [RS_28]
+                                       |                       Reduce Output 
Operator [RS_24]
                                        |                          key 
expressions:_col1 (type: int)
                                        |                          Map-reduce 
partition columns:_col1 (type: int)
                                        |                          sort order:+
                                        |                          
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                          value 
expressions:_col0 (type: int)
-                                       |                          Select 
Operator [SEL_24]
+                                       |                          Select 
Operator [SEL_22]
                                        |                             
outputColumnNames:["_col0","_col1"]
                                        |                             
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                             Filter 
Operator [FIL_129]
+                                       |                             Filter 
Operator [FIL_112]
                                        |                                
predicate:ws_order_number is not null (type: boolean)
                                        |                                
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                                
TableScan [TS_22]
+                                       |                                
TableScan [TS_20]
                                        |                                   
alias:ws1
                                        |                                   
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |<-Reducer 8 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_54]
+                                          Reduce Output Operator [RS_46]
                                              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
-                                             Group By Operator [GBY_48]
+                                             Group By Operator [GBY_42]
                                                 keys:_col0 (type: int)
                                                 outputColumnNames:["_col0"]
                                                 Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Select Operator [SEL_15]
+                                                Select Operator [SEL_13]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   Filter Operator [FIL_123]
+                                                   Filter Operator [FIL_12]
                                                       predicate:(_col0 <> 
_col2) (type: boolean)
                                                       Statistics:Num rows: 1 
Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      Merge Join Operator 
[MERGEJOIN_133]
+                                                      Merge Join Operator 
[MERGEJOIN_116]
                                                       |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col1 
(type: int)","1":"_col1 (type: int)"}
                                                       |  
outputColumnNames:["_col0","_col1","_col2"]
                                                       |  Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 7 [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:+
@@ -250,14 +250,14 @@ Stage-0
                                                       |     Select Operator 
[SEL_5]
                                                       |        
outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator 
[FIL_124]
+                                                      |        Filter Operator 
[FIL_108]
                                                       |           
predicate:ws_order_number is not null (type: boolean)
                                                       |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan 
[TS_3]
                                                       |              alias:ws1
                                                       |              
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 9 [SIMPLE_EDGE]
-                                                         Reduce Output 
Operator [RS_12]
+                                                         Reduce Output 
Operator [RS_10]
                                                             key 
expressions:_col1 (type: int)
                                                             Map-reduce 
partition columns:_col1 (type: int)
                                                             sort order:+
@@ -266,7 +266,7 @@ Stage-0
                                                             Select Operator 
[SEL_8]
                                                                
outputColumnNames:["_col0","_col1"]
                                                                Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               Filter Operator 
[FIL_125]
+                                                               Filter Operator 
[FIL_109]
                                                                   
predicate:ws_order_number is not null (type: boolean)
                                                                   
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   TableScan 
[TS_6]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query96.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query96.q.out 
b/ql/src/test/results/clientpositive/perf/query96.q.out
index 6290ff0..bba8965 100644
--- a/ql/src/test/results/clientpositive/perf/query96.q.out
+++ b/ql/src/test/results/clientpositive/perf/query96.q.out
@@ -16,40 +16,40 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_35]
+         File Output Operator [FS_29]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 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_34]
+            Limit [LIM_28]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-               Select Operator [SEL_33]
+               Select Operator [SEL_27]
                |  outputColumnNames:["_col0"]
                |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_32]
+                  Reduce Output Operator [RS_26]
                      key expressions:_col0 (type: bigint)
                      sort order:+
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                     Group By Operator [GBY_30]
+                     Group By Operator [GBY_24]
                      |  aggregations:["count(VALUE._col0)"]
                      |  outputColumnNames:["_col0"]
                      |  Statistics:Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_29]
+                        Reduce Output Operator [RS_23]
                            sort order:
                            Statistics:Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                            value expressions:_col0 (type: bigint)
-                           Group By Operator [GBY_28]
+                           Group By Operator [GBY_22]
                               aggregations:["count()"]
                               outputColumnNames:["_col0"]
                               Statistics:Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_51]
+                              Merge Join Operator [MERGEJOIN_45]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col2 (type: int)","1":"_col0 
(type: int)"}
                               |  Statistics:Num rows: 17424 Data size: 8206704 
Basic stats: COMPLETE Column stats: NONE
                               |<-Map 9 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_25]
+                              |  Reduce Output Operator [RS_19]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: 
int)
                               |     sort order:+
@@ -57,25 +57,25 @@ Stage-0
                               |     Select Operator [SEL_11]
                               |        outputColumnNames:["_col0"]
                               |        Statistics:Num rows: 852 Data size: 
1628138 Basic stats: COMPLETE Column stats: NONE
-                              |        Filter Operator [FIL_48]
+                              |        Filter Operator [FIL_42]
                               |           predicate:((s_store_name = 'ese') 
and s_store_sk is not null) (type: boolean)
                               |           Statistics:Num rows: 852 Data size: 
1628138 Basic stats: COMPLETE Column stats: NONE
                               |           TableScan [TS_9]
                               |              alias:store
                               |              Statistics:Num rows: 1704 Data 
size: 3256276 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 3 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_23]
+                                 Reduce Output Operator [RS_18]
                                     key expressions:_col2 (type: int)
                                     Map-reduce partition columns:_col2 (type: 
int)
                                     sort order:+
                                     Statistics:Num rows: 15840 Data size: 
7460640 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_50]
+                                    Merge Join Operator [MERGEJOIN_44]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col2"]
                                     |  Statistics:Num rows: 15840 Data size: 
7460640 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 8 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_20]
+                                    |  Reduce Output Operator [RS_16]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 
(type: int)
                                     |     sort order:+
@@ -83,26 +83,26 @@ Stage-0
                                     |     Select Operator [SEL_8]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 14400 Data 
size: 6782400 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_47]
+                                    |        Filter Operator [FIL_41]
                                     |           predicate:(((t_minute >= 30) 
and (t_hour = 8)) and t_time_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 14400 
Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_6]
                                     |              alias:time_dim
                                     |              Statistics:Num rows: 86400 
Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 2 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_18]
+                                       Reduce Output Operator [RS_15]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 
(type: int)
                                           sort order:+
                                           Statistics:Num rows: 3960 Data size: 
423720 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col2 (type: int)
-                                          Merge Join Operator [MERGEJOIN_49]
+                                          Merge Join Operator [MERGEJOIN_43]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col0","_col2"]
                                           |  Statistics:Num rows: 3960 Data 
size: 423720 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 1 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_13]
+                                          |  Reduce Output Operator [RS_12]
                                           |     key expressions:_col1 (type: 
int)
                                           |     Map-reduce partition 
columns:_col1 (type: int)
                                           |     sort order:+
@@ -111,14 +111,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_45]
+                                          |        Filter Operator [FIL_39]
                                           |           predicate:((ss_hdemo_sk 
is not null and ss_sold_time_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 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_15]
+                                             Reduce Output Operator [RS_13]
                                                 key expressions:_col0 (type: 
int)
                                                 Map-reduce partition 
columns:_col0 (type: int)
                                                 sort order:+
@@ -126,7 +126,7 @@ Stage-0
                                                 Select Operator [SEL_5]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 3600 
Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_46]
+                                                   Filter Operator [FIL_40]
                                                       predicate:((hd_dep_count 
= 5) and hd_demo_sk is not null) (type: boolean)
                                                       Statistics:Num rows: 
3600 Data size: 385200 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/query97.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query97.q.out 
b/ql/src/test/results/clientpositive/perf/query97.q.out
index 3e5d3bb..c4c384d 100644
--- a/ql/src/test/results/clientpositive/perf/query97.q.out
+++ b/ql/src/test/results/clientpositive/perf/query97.q.out
@@ -17,64 +17,64 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_42]
+         File Output Operator [FS_38]
             compressed:false
             Statistics:Num rows: 1 Data size: 24 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_41]
+            Limit [LIM_37]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
-               Group By Operator [GBY_39]
+               Group By Operator [GBY_35]
                |  
aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_38]
+                  Reduce Output Operator [RS_34]
                      sort order:
                      Statistics:Num rows: 1 Data size: 24 Basic stats: 
COMPLETE Column stats: NONE
                      value expressions:_col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: bigint)
-                     Group By Operator [GBY_37]
+                     Group By Operator [GBY_33]
                         aggregations:["sum(_col0)","sum(_col1)","sum(_col2)"]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 1 Data size: 24 Basic stats: 
COMPLETE Column stats: NONE
-                        Select Operator [SEL_35]
+                        Select Operator [SEL_31]
                            outputColumnNames:["_col0","_col1","_col2"]
                            Statistics:Num rows: 22096 Data size: 24726566 
Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_53]
+                           Merge Join Operator [MERGEJOIN_49]
                            |  condition map:[{"":"Outer Join 0 to 1"}]
                            |  keys:{"0":"_col0 (type: int), _col1 (type: 
int)","1":"_col0 (type: int), _col1 (type: int)"}
                            |  outputColumnNames:["_col0","_col2"]
                            |  Statistics:Num rows: 22096 Data size: 24726566 
Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 3 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_32]
+                           |  Reduce Output Operator [RS_28]
                            |     key expressions:_col0 (type: int), _col1 
(type: int)
                            |     Map-reduce partition columns:_col0 (type: 
int), _col1 (type: int)
                            |     sort order:++
                            |     Statistics:Num rows: 20088 Data size: 
22478696 Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_15]
+                           |     Select Operator [SEL_13]
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 20088 Data size: 
22478696 Basic stats: COMPLETE Column stats: NONE
-                           |        Group By Operator [GBY_14]
+                           |        Group By Operator [GBY_12]
                            |        |  keys:KEY._col0 (type: int), KEY._col1 
(type: int)
                            |        |  outputColumnNames:["_col0","_col1"]
                            |        |  Statistics:Num rows: 20088 Data size: 
22478696 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 2 [SIMPLE_EDGE]
-                           |           Reduce Output Operator [RS_13]
+                           |           Reduce Output Operator [RS_11]
                            |              key expressions:_col0 (type: int), 
_col1 (type: int)
                            |              Map-reduce partition columns:_col0 
(type: int), _col1 (type: int)
                            |              sort order:++
                            |              Statistics:Num rows: 40176 Data 
size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |              Group By Operator [GBY_12]
+                           |              Group By Operator [GBY_10]
                            |                 keys:_col1 (type: int), _col2 
(type: int)
                            |                 
outputColumnNames:["_col0","_col1"]
                            |                 Statistics:Num rows: 40176 Data 
size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_51]
+                           |                 Merge Join Operator [MERGEJOIN_47]
                            |                 |  condition map:[{"":"Inner Join 
0 to 1"}]
                            |                 |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                            |                 |  
outputColumnNames:["_col1","_col2"]
                            |                 |  Statistics:Num rows: 40176 
Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Map 1 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_7]
+                           |                 |  Reduce Output Operator [RS_6]
                            |                 |     key expressions:_col0 
(type: int)
                            |                 |     Map-reduce partition 
columns:_col0 (type: int)
                            |                 |     sort order:+
@@ -83,14 +83,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_47]
+                           |                 |        Filter Operator [FIL_43]
                            |                 |           
predicate:ss_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:store_sales
                            |                 |              Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |<-Map 6 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_9]
+                           |                    Reduce Output Operator [RS_7]
                            |                       key expressions:_col0 
(type: int)
                            |                       Map-reduce partition 
columns:_col0 (type: int)
                            |                       sort order:+
@@ -98,66 +98,66 @@ Stage-0
                            |                       Select Operator [SEL_5]
                            |                          
outputColumnNames:["_col0"]
                            |                          Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                          Filter Operator [FIL_48]
+                           |                          Filter Operator [FIL_44]
                            |                             
predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: 
boolean)
                            |                             Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                             TableScan [TS_3]
                            |                                alias:date_dim
                            |                                Statistics:Num 
rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 9 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_33]
+                              Reduce Output Operator [RS_29]
                                  key expressions:_col0 (type: int), _col1 
(type: int)
                                  Map-reduce partition columns:_col0 (type: 
int), _col1 (type: int)
                                  sort order:++
                                  Statistics:Num rows: 20088 Data size: 
22478696 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_30]
+                                 Group By Operator [GBY_26]
                                  |  keys:KEY._col0 (type: int), KEY._col1 
(type: int)
                                  |  outputColumnNames:["_col0","_col1"]
                                  |  Statistics:Num rows: 20088 Data size: 
22478696 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 8 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_29]
+                                    Reduce Output Operator [RS_25]
                                        key expressions:_col0 (type: int), 
_col1 (type: int)
                                        Map-reduce partition columns:_col0 
(type: int), _col1 (type: int)
                                        sort order:++
                                        Statistics:Num rows: 40176 Data size: 
44957392 Basic stats: COMPLETE Column stats: NONE
-                                       Group By Operator [GBY_28]
+                                       Group By Operator [GBY_24]
                                           keys:_col1 (type: int), _col2 (type: 
int)
                                           outputColumnNames:["_col0","_col1"]
                                           Statistics:Num rows: 40176 Data 
size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                          Merge Join Operator [MERGEJOIN_52]
+                                          Merge Join Operator [MERGEJOIN_48]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col1","_col2"]
                                           |  Statistics:Num rows: 40176 Data 
size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 10 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_25]
+                                          |  Reduce Output Operator [RS_21]
                                           |     key expressions:_col0 (type: 
int)
                                           |     Map-reduce partition 
columns:_col0 (type: int)
                                           |     sort order:+
                                           |     Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |     Select Operator [SEL_21]
+                                          |     Select Operator [SEL_19]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_50]
+                                          |        Filter Operator [FIL_46]
                                           |           predicate:(d_month_seq 
BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |           TableScan [TS_19]
+                                          |           TableScan [TS_17]
                                           |              alias:date_dim
                                           |              Statistics:Num rows: 
73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_23]
+                                             Reduce Output Operator [RS_20]
                                                 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), _col2 (type: int)
-                                                Select Operator [SEL_18]
+                                                Select Operator [SEL_16]
                                                    
outputColumnNames:["_col0","_col1","_col2"]
                                                    Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   Filter Operator [FIL_49]
+                                                   Filter Operator [FIL_45]
                                                       
predicate:cs_sold_date_sk is not null (type: boolean)
                                                       Statistics:Num rows: 1 
Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      TableScan [TS_16]
+                                                      TableScan [TS_14]
                                                          alias:catalog_sales
                                                          Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

Reply via email to