http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query28.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query28.q.out 
b/ql/src/test/results/clientpositive/perf/query28.q.out
index 51ae16f..cac9ac3 100644
--- a/ql/src/test/results/clientpositive/perf/query28.q.out
+++ b/ql/src/test/results/clientpositive/perf/query28.q.out
@@ -1,8 +1,8 @@
-Warning: Shuffle Join MERGEJOIN[76][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
-Warning: Shuffle Join MERGEJOIN[77][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 4' is a cross product
-Warning: Shuffle Join MERGEJOIN[78][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3]] in Stage 'Reducer 5' is a cross product
-Warning: Shuffle Join MERGEJOIN[79][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3, $hdt$_4]] in Stage 'Reducer 6' is a cross product
-Warning: Shuffle Join MERGEJOIN[80][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3, $hdt$_4, $hdt$_5]] in Stage 'Reducer 7' is a cross product
+Warning: Shuffle Join MERGEJOIN[71][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[72][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 4' is a cross product
+Warning: Shuffle Join MERGEJOIN[73][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3]] in Stage 'Reducer 5' is a cross product
+Warning: Shuffle Join MERGEJOIN[74][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3, $hdt$_4]] in Stage 'Reducer 6' is a cross product
+Warning: Shuffle Join MERGEJOIN[75][tables = [$hdt$_0, $hdt$_1, $hdt$_2, 
$hdt$_3, $hdt$_4, $hdt$_5]] in Stage 'Reducer 7' is a cross product
 PREHOOK: query: explain select  *
 from (select avg(ss_list_price) B1_LP
             ,count(ss_list_price) B1_CNT
@@ -135,7 +135,7 @@ Stage-0
                Select Operator [SEL_62]
                   
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"]
                   Statistics:Num rows: 1 Data size: 215 Basic stats: COMPLETE 
Column stats: NONE
-                  Merge Join Operator [MERGEJOIN_80]
+                  Merge Join Operator [MERGEJOIN_75]
                   |  condition map:[{"":"Inner Join 0 to 1"}]
                   |  keys:{}
                   |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"]
@@ -163,7 +163,7 @@ Stage-0
                   |              Select Operator [SEL_37]
                   |                 outputColumnNames:["ss_list_price"]
                   |                 Statistics:Num rows: 1 Data size: 0 Basic 
stats: PARTIAL Column stats: NONE
-                  |                 Filter Operator [FIL_75]
+                  |                 Filter Operator [FIL_70]
                   |                    predicate:(ss_quantity BETWEEN 6 AND 10 
and (ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or 
ss_wholesale_cost BETWEEN 32 AND 52)) (type: boolean)
                   |                    Statistics:Num rows: 1 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
                   |                    TableScan [TS_35]
@@ -174,7 +174,7 @@ Stage-0
                         sort order:
                         Statistics:Num rows: 1 Data size: 196 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions:_col0 (type: decimal(11,6)), _col1 
(type: bigint), _col2 (type: bigint), _col3 (type: decimal(11,6)), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: decimal(11,6)), _col7 (type: 
bigint), _col8 (type: bigint), _col9 (type: decimal(11,6)), _col10 (type: 
bigint), _col11 (type: bigint), _col12 (type: decimal(11,6)), _col13 (type: 
bigint), _col14 (type: bigint)
-                        Merge Join Operator [MERGEJOIN_79]
+                        Merge Join Operator [MERGEJOIN_74]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{}
                         |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
@@ -202,7 +202,7 @@ Stage-0
                         |              Select Operator [SEL_30]
                         |                 outputColumnNames:["ss_list_price"]
                         |                 Statistics:Num rows: 1 Data size: 0 
Basic stats: PARTIAL Column stats: NONE
-                        |                 Filter Operator [FIL_74]
+                        |                 Filter Operator [FIL_69]
                         |                    predicate:(ss_quantity BETWEEN 11 
AND 15 and (ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 
1920 or ss_wholesale_cost BETWEEN 4 AND 24)) (type: boolean)
                         |                    Statistics:Num rows: 1 Data size: 
0 Basic stats: PARTIAL Column stats: NONE
                         |                    TableScan [TS_28]
@@ -213,7 +213,7 @@ Stage-0
                               sort order:
                               Statistics:Num rows: 1 Data size: 179 Basic 
stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: decimal(11,6)), 
_col1 (type: bigint), _col2 (type: bigint), _col3 (type: decimal(11,6)), _col4 
(type: bigint), _col5 (type: bigint), _col6 (type: decimal(11,6)), _col7 (type: 
bigint), _col8 (type: bigint), _col9 (type: decimal(11,6)), _col10 (type: 
bigint), _col11 (type: bigint)
-                              Merge Join Operator [MERGEJOIN_78]
+                              Merge Join Operator [MERGEJOIN_73]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{}
                               |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
@@ -241,7 +241,7 @@ Stage-0
                               |              Select Operator [SEL_23]
                               |                 
outputColumnNames:["ss_list_price"]
                               |                 Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                              |                 Filter Operator [FIL_73]
+                              |                 Filter Operator [FIL_68]
                               |                    predicate:(ss_quantity 
BETWEEN 16 AND 20 and (ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt 
BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100)) (type: boolean)
                               |                    Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
                               |                    TableScan [TS_21]
@@ -252,7 +252,7 @@ Stage-0
                                     sort order:
                                     Statistics:Num rows: 1 Data size: 163 
Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col0 (type: 
decimal(11,6)), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: 
decimal(11,6)), _col4 (type: bigint), _col5 (type: bigint), _col6 (type: 
decimal(11,6)), _col7 (type: bigint), _col8 (type: bigint)
-                                    Merge Join Operator [MERGEJOIN_77]
+                                    Merge Join Operator [MERGEJOIN_72]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{}
                                     |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
@@ -280,7 +280,7 @@ Stage-0
                                     |              Select Operator [SEL_16]
                                     |                 
outputColumnNames:["ss_list_price"]
                                     |                 Statistics:Num rows: 1 
Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                 Filter Operator [FIL_72]
+                                    |                 Filter Operator [FIL_67]
                                     |                    
predicate:(ss_quantity BETWEEN 21 AND 25 and (ss_list_price BETWEEN 135 AND 145 
or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 
58)) (type: boolean)
                                     |                    Statistics:Num rows: 
1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                    TableScan [TS_14]
@@ -291,7 +291,7 @@ Stage-0
                                           sort order:
                                           Statistics:Num rows: 1 Data size: 
149 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col0 (type: 
decimal(11,6)), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: 
decimal(11,6)), _col4 (type: bigint), _col5 (type: bigint)
-                                          Merge Join Operator [MERGEJOIN_76]
+                                          Merge Join Operator [MERGEJOIN_71]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{}
                                           |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
@@ -319,7 +319,7 @@ Stage-0
                                           |              Select Operator 
[SEL_2]
                                           |                 
outputColumnNames:["ss_list_price"]
                                           |                 Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                          |                 Filter Operator 
[FIL_70]
+                                          |                 Filter Operator 
[FIL_65]
                                           |                    
predicate:(ss_quantity BETWEEN 0 AND 5 and (ss_list_price BETWEEN 11 AND 21 or 
ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34)) 
(type: boolean)
                                           |                    Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                           |                    TableScan [TS_0]
@@ -348,7 +348,7 @@ Stage-0
                                                          Select Operator 
[SEL_9]
                                                             
outputColumnNames:["ss_list_price"]
                                                             Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            Filter Operator 
[FIL_71]
+                                                            Filter Operator 
[FIL_66]
                                                                
predicate:(ss_quantity BETWEEN 26 AND 30 and (ss_list_price BETWEEN 28 AND 38 
or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62)) 
(type: boolean)
                                                                Statistics:Num 
rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                TableScan [TS_7]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query29.q.out 
b/ql/src/test/results/clientpositive/perf/query29.q.out
index e3d2e39..8991f35 100644
--- a/ql/src/test/results/clientpositive/perf/query29.q.out
+++ b/ql/src/test/results/clientpositive/perf/query29.q.out
@@ -20,52 +20,52 @@ Stage-0
       limit:100
       Stage-1
          Reducer 10
-         File Output Operator [FS_67]
+         File Output Operator [FS_53]
             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_66]
+            Limit [LIM_52]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: 
COMPLETE Column stats: NONE
-               Select Operator [SEL_65]
+               Select Operator [SEL_51]
                |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                |  Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 9 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_64]
+                  Reduce Output Operator [RS_50]
                      key expressions:_col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string)
                      sort order:++++
                      Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
                      value expressions:_col4 (type: bigint), _col5 (type: 
bigint), _col6 (type: bigint)
-                     Select Operator [SEL_63]
+                     Select Operator [SEL_49]
                         
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         Statistics:Num rows: 254100 Data size: 364958259 Basic 
stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_62]
+                        Group By Operator [GBY_48]
                         |  
aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: 
string), KEY._col2 (type: string), KEY._col3 (type: string)
                         |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         |  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), _col3 (type: string)
                               Map-reduce partition columns:_col0 (type: 
string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
                               sort order:++++
                               Statistics:Num rows: 508200 Data size: 729916518 
Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col4 (type: bigint), _col5 
(type: bigint), _col6 (type: bigint)
-                              Group By Operator [GBY_60]
+                              Group By Operator [GBY_46]
                                  
aggregations:["sum(_col5)","sum(_col10)","sum(_col14)"]
                                  keys:_col24 (type: string), _col25 (type: 
string), _col27 (type: string), _col28 (type: string)
                                  
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                  Statistics:Num rows: 508200 Data size: 
729916518 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_59]
+                                 Select Operator [SEL_45]
                                     
outputColumnNames:["_col24","_col25","_col27","_col28","_col5","_col10","_col14"]
                                     Statistics:Num rows: 508200 Data size: 
729916518 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_117]
+                                    Merge Join Operator [MERGEJOIN_103]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                     |  
outputColumnNames:["_col5","_col10","_col14","_col24","_col25","_col27","_col28"]
                                     |  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_110]
+                                    |        Filter Operator [FIL_96]
                                     |           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: 44193 Data 
size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col5 (type: int), 
_col10 (type: int), _col14 (type: int), _col24 (type: string), _col25 (type: 
string)
-                                          Merge Join Operator [MERGEJOIN_116]
+                                          Merge Join Operator [MERGEJOIN_102]
                                           |  condition map:[{"":"Inner Join 0 
to 1"}]
                                           |  keys:{"0":"_col3 (type: 
int)","1":"_col0 (type: int)"}
                                           |  
outputColumnNames:["_col1","_col5","_col10","_col14","_col24","_col25"]
                                           |  Statistics:Num rows: 44193 Data 
size: 49453132 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","_col2"]
                                           |        Statistics:Num rows: 1704 
Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_109]
+                                          |        Filter Operator [FIL_95]
                                           |           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: 40176 
Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (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":"_col11 (type: 
int)","1":"_col0 (type: int)"}
                                                 |  
outputColumnNames:["_col1","_col3","_col5","_col10","_col14"]
                                                 |  Statistics:Num rows: 40176 
Data size: 44957392 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_108]
+                                                |        Filter Operator 
[FIL_94]
                                                 |           
predicate:((d_year) IN (2000, 2001, 2002) 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: 
22096 Data size: 24726566 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_114]
+                                                      Merge Join Operator 
[MERGEJOIN_100]
                                                       |  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: 
22096 Data size: 24726566 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: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator 
[FIL_107]
+                                                      |        Filter Operator 
[FIL_93]
                                                       |           
predicate:((d_moy BETWEEN 2 AND 5 and (d_year = 2000)) and d_date_sk is not 
null) (type: boolean)
                                                       |           
Statistics:Num rows: 18262 Data size: 20435178 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: 20088 Data size: 22478696 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_113]
+                                                            Merge Join 
Operator [MERGEJOIN_99]
                                                             |  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: 20088 Data size: 22478696 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: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
-                                                            |        Filter 
Operator [FIL_106]
+                                                            |        Filter 
Operator [FIL_92]
                                                             |           
predicate:(((d_year = 2000) and (d_moy = 2)) and d_date_sk is not null) (type: 
boolean)
                                                             |           
Statistics:Num rows: 18262 Data size: 20435178 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_112]
+                                                                  Merge Join 
Operator [MERGEJOIN_98]
                                                                   |  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_105]
+                                                                  |        
Filter Operator [FIL_91]
                                                                   |           
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_111]
+                                                                        Merge 
Join Operator [MERGEJOIN_97]
                                                                         |  
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_103]
+                                                                        |      
  Filter Operator [FIL_89]
                                                                         |      
     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_104]
+                                                                               
  Filter Operator [FIL_90]
                                                                                
     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/query3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query3.q.out 
b/ql/src/test/results/clientpositive/perf/query3.q.out
index aa73399..871ad74 100644
--- a/ql/src/test/results/clientpositive/perf/query3.q.out
+++ b/ql/src/test/results/clientpositive/perf/query3.q.out
@@ -15,49 +15,49 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_28]
+         File Output Operator [FS_24]
             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_27]
+            Limit [LIM_23]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: 
COMPLETE Column stats: NONE
-               Select Operator [SEL_26]
+               Select Operator [SEL_22]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 127050 Data size: 182479129 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_25]
+                  Reduce Output Operator [RS_21]
                      key expressions:_col0 (type: int), _col3 (type: 
decimal(17,2)), _col1 (type: int)
                      sort order:+-+
                      Statistics:Num rows: 127050 Data size: 182479129 Basic 
stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: string)
-                     Group By Operator [GBY_22]
+                     Group By Operator [GBY_18]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int), KEY._col1 (type: int), 
KEY._col2 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                      |  Statistics:Num rows: 127050 Data size: 182479129 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), _col1 (type: 
int), _col2 (type: string)
                            Map-reduce partition columns:_col0 (type: int), 
_col1 (type: int), _col2 (type: string)
                            sort order:+++
                            Statistics:Num rows: 254100 Data size: 364958258 
Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col3 (type: decimal(17,2))
-                           Group By Operator [GBY_20]
+                           Group By Operator [GBY_16]
                               aggregations:["sum(_col5)"]
                               keys:_col1 (type: int), _col7 (type: int), _col8 
(type: string)
                               
outputColumnNames:["_col0","_col1","_col2","_col3"]
                               Statistics:Num rows: 254100 Data size: 364958258 
Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_19]
+                              Select Operator [SEL_15]
                                  
outputColumnNames:["_col1","_col7","_col8","_col5"]
                                  Statistics:Num rows: 254100 Data size: 
364958258 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_38]
+                                 Merge Join Operator [MERGEJOIN_34]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col4 (type: int)","1":"_col0 
(type: int)"}
                                  |  
outputColumnNames:["_col1","_col5","_col7","_col8"]
                                  |  Statistics:Num rows: 254100 Data size: 
364958258 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 7 [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:+
@@ -66,26 +66,26 @@ Stage-0
                                  |     Select Operator [SEL_8]
                                  |        
outputColumnNames:["_col0","_col1","_col2"]
                                  |        Statistics:Num rows: 231000 Data 
size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_36]
+                                 |        Filter Operator [FIL_32]
                                  |           predicate:((i_manufact_id = 436) 
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_15]
+                                    Reduce Output Operator [RS_12]
                                        key expressions:_col4 (type: int)
                                        Map-reduce partition columns:_col4 
(type: int)
                                        sort order:+
                                        Statistics:Num rows: 40176 Data size: 
44957392 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col1 (type: int), 
_col5 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_37]
+                                       Merge Join Operator [MERGEJOIN_33]
                                        |  condition map:[{"":"Inner Join 0 to 
1"}]
                                        |  keys:{"0":"_col0 (type: 
int)","1":"_col0 (type: int)"}
                                        |  
outputColumnNames:["_col1","_col4","_col5"]
                                        |  Statistics:Num rows: 40176 Data 
size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_10]
+                                       |  Reduce Output Operator [RS_9]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition 
columns:_col0 (type: int)
                                        |     sort order:+
@@ -94,14 +94,14 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        
outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_34]
+                                       |        Filter Operator [FIL_30]
                                        |           predicate:((d_moy = 12) and 
d_date_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:dt
                                        |              Statistics:Num rows: 
73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 6 [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:+
@@ -110,7 +110,7 @@ Stage-0
                                              Select Operator [SEL_5]
                                                 
outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Filter Operator [FIL_35]
+                                                Filter Operator [FIL_31]
                                                    predicate:(ss_sold_date_sk 
is not null and ss_item_sk is not null) (type: boolean)
                                                    Statistics:Num rows: 1 Data 
size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    TableScan [TS_3]

Reply via email to