http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
index 5ceefe1..2464076 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
@@ -1322,29 +1322,26 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToDouble(_col0) (type: double)
+                      sort order: +
+                      Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToDouble(_col0) (type: double)
-                        sort order: +
-                        Map-reduce partition columns: UDFToDouble(_col0) 
(type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1451,20 +1448,17 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: (UDFToDouble(_col0) * UDFToDouble(2)) 
(type: double)
+                      sort order: +
+                      Map-reduce partition columns: (UDFToDouble(_col0) * 
UDFToDouble(2)) (type: double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: (UDFToDouble(_col0) * 2.0) (type: 
double)
-                        sort order: +
-                        Map-reduce partition columns: (UDFToDouble(_col0) * 
2.0) (type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
         Map 4 
             Map Operator Tree:
@@ -1507,7 +1501,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 (UDFToDouble(_col0) * 2.0) (type: double)
+                  0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
                   1 _col0 (type: double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -1580,29 +1574,26 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (hr is not null and UDFToDouble(hr) is not null) 
(type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToDouble(_col0) (type: double)
+                      sort order: +
+                      Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToDouble(_col0) (type: double)
-                        sort order: +
-                        Map-reduce partition columns: UDFToDouble(_col0) 
(type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1694,20 +1685,17 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (hr is not null and (UDFToDouble(hr) * 2.0) is 
not null) (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: (UDFToDouble(_col0) * UDFToDouble(2)) 
(type: double)
+                      sort order: +
+                      Map-reduce partition columns: (UDFToDouble(_col0) * 
UDFToDouble(2)) (type: double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: (UDFToDouble(_col0) * 2.0) (type: 
double)
-                        sort order: +
-                        Map-reduce partition columns: (UDFToDouble(_col0) * 
2.0) (type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
         Map 4 
             Map Operator Tree:
@@ -1735,7 +1723,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 (UDFToDouble(_col0) * 2.0) (type: double)
+                  0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
                   1 _col0 (type: double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -1821,29 +1809,26 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToString((UDFToDouble(hr) * 2.0)) is not null 
(type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToString((UDFToDouble(hr) * 2.0)) is not 
null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToString((UDFToDouble(_col0) * 
UDFToDouble(2))) (type: string)
+                      sort order: +
+                      Map-reduce partition columns: 
UDFToString((UDFToDouble(_col0) * UDFToDouble(2))) (type: string)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToString((UDFToDouble(_col0) * 
2.0)) (type: string)
-                        sort order: +
-                        Map-reduce partition columns: 
UDFToString((UDFToDouble(_col0) * 2.0)) (type: string)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToString(hr) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToString(hr) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1877,7 +1862,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 UDFToString((UDFToDouble(_col0) * 2.0)) (type: string)
+                  0 UDFToString((UDFToDouble(_col0) * UDFToDouble(2))) (type: 
string)
                   1 UDFToString(_col0) (type: string)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -2098,7 +2083,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 1000
-Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: -- non-equi join
 EXPLAIN select count(*) from srcpart, srcpart_date_hour where 
(srcpart_date_hour.`date` = '2008-04-08' and srcpart_date_hour.hour = 11) and 
(srcpart.ds = srcpart_date_hour.ds or srcpart.hr = srcpart_date_hour.hr)
 PREHOOK: type: QUERY
@@ -2196,7 +2181,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: select count(*) from srcpart, srcpart_date_hour where 
(srcpart_date_hour.`date` = '2008-04-08' and srcpart_date_hour.hour = 11) and 
(srcpart.ds = srcpart_date_hour.ds or srcpart.hr = srcpart_date_hour.hr)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -4269,43 +4254,40 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 UDFToDouble(_col0) (type: double)
-                          1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: 
double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 UDFToDouble(_col0) (type: double)
+                        1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: 
double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
             Execution mode: llap
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4393,34 +4375,31 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 (UDFToDouble(_col0) * 2.0) (type: double)
-                          1 _col0 (type: double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
+                        1 _col0 (type: double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
             Execution mode: llap
         Map 3 
             Map Operator Tree:
@@ -5461,43 +5440,39 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_orc
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 188000 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: ds (type: string), hr (type: int)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 2000 Data size: 188000 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: ds (type: string), hr (type: int)
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 2000 Data size: 188000 Basic 
stats: COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 _col0 (type: string), UDFToDouble(_col1) (type: 
double)
-                          1 _col0 (type: string), UDFToDouble(_col2) (type: 
double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 206800 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 _col0 (type: string), UDFToDouble(_col1) (type: 
double)
+                        1 _col0 (type: string), UDFToDouble(_col2) (type: 
double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 206800 Basic 
stats: COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
             Execution mode: llap
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) and UDFToDouble(hr) is not null) (type: boolean)
+                  filterExpr: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) and UDFToDouble(hr) is not null) (type: boolean)
+                    predicate: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
                     Statistics: Num rows: 2 Data size: 720 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/louter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
index 84dce67..1f685ae 100644
--- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
@@ -973,7 +973,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 
20.0)) and (UDFToDouble(key) > 15.0)) and (UDFToDouble(key) < 25.0)) and key is 
not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 
20.0)) and (UDFToDouble(key) > 15.0)) and (UDFToDouble(key) < 25.0)) (type: 
boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -993,7 +993,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (((((UDFToDouble(key) > 15.0) and (UDFToDouble(key) < 
25.0)) and (UDFToDouble(key) < 20.0)) and (UDFToDouble(key) > 10.0)) and key is 
not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 15.0) and (UDFToDouble(key) < 
25.0)) and (UDFToDouble(key) < 20.0)) and (UDFToDouble(key) > 10.0)) (type: 
boolean)
               Statistics: Num rows: 12 Data size: 127 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
index 14c6f18..416634b 100644
--- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
@@ -512,7 +512,7 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((value > 'val_450') and key is not null) and value 
is not null) (type: boolean)
+              predicate: ((value > 'val_450') and key is not null) (type: 
boolean)
               Statistics: Num rows: 666 Data size: 7075 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/multiMapJoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/multiMapJoin1.q.out 
b/ql/src/test/results/clientpositive/multiMapJoin1.q.out
index 02b2707..e2efec0 100644
--- a/ql/src/test/results/clientpositive/multiMapJoin1.q.out
+++ b/ql/src/test/results/clientpositive/multiMapJoin1.q.out
@@ -878,8 +878,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -1323,7 +1323,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col3 (type: string)
               Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), _col4 (type: string)
+              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string)
           TableScan
             alias: smalltbl2
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
@@ -1405,8 +1405,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -1461,8 +1461,8 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 5500 Data size: 79398 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 
(type: string), _col2 (type: string), _col2 (type: string)
-            outputColumnNames: _col0, _col1, _col2, _col3, _col4
+            expressions: _col0 (type: string), _col1 (type: string), _col3 
(type: string), _col2 (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 5500 Data size: 79398 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
@@ -1744,8 +1744,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -2038,8 +2038,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -2390,8 +2390,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -2835,7 +2835,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col3 (type: string)
               Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), _col4 (type: string)
+              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string)
           TableScan
             alias: smalltbl2
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
@@ -2917,8 +2917,8 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string), _col2 (type: string)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: string), _col2 (type: string)
+                    outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 5500 Data size: 79398 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -2973,8 +2973,8 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 5500 Data size: 79398 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 
(type: string), _col2 (type: string), _col2 (type: string)
-            outputColumnNames: _col0, _col1, _col2, _col3, _col4
+            expressions: _col0 (type: string), _col1 (type: string), _col3 
(type: string), _col2 (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 5500 Data size: 79398 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out 
b/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
index 9a24ad8..83be55d 100644
--- a/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
@@ -188,7 +188,7 @@ POSTHOOK: Input: default@src1
 406    val_406 25
 66     val_66  25
 98     val_98  25
-Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: -- Then, we convert the join to MapJoin.
 EXPLAIN
 SELECT tmp4.key as key, tmp4.value as value, tmp4.count as count
@@ -296,7 +296,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: SELECT tmp4.key as key, tmp4.value as value, tmp4.count as 
count
 FROM (SELECT tmp2.key as key, tmp2.value as value, tmp3.count as count
       FROM (SELECT *

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/orc_llap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_llap.q.out 
b/ql/src/test/results/clientpositive/orc_llap.q.out
index f67fcc6..7ab3d14 100644
--- a/ql/src/test/results/clientpositive/orc_llap.q.out
+++ b/ql/src/test/results/clientpositive/orc_llap.q.out
@@ -121,7 +121,7 @@ POSTHOOK: Output: default@orc_llap_small
 POSTHOOK: Lineage: orc_llap_small.cint SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: orc_llap_small.csmallint SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, 
comment:null), ]
 POSTHOOK: Lineage: orc_llap_small.ctinyint SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, 
comment:null), ]
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-2:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-2:MAPRED' is a cross 
product
 PREHOOK: query: -- Cross join with no projection - do it on small table
 explain
 select count(1) from orc_llap_small y join orc_llap_small x
@@ -202,7 +202,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-2:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-2:MAPRED' is a cross 
product
 PREHOOK: query: select count(1) from orc_llap_small y join orc_llap_small x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_llap_small
@@ -636,7 +636,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@llap_temp_table
 #### A masked pattern was here ####
 -735462183586256
-Warning: Map Join MAPJOIN[12][bigTable=?] in task 'Stage-4:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-4:MAPRED' is a cross 
product
 PREHOOK: query: -- multi-stripe test
 insert into table orc_llap
 select ctinyint + i, csmallint + i, cint + i, cbigint + i, cfloat + i, cdouble 
+ i, cstring1, cstring2, ctimestamp1, ctimestamp2, cboolean1, cboolean2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out 
b/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
index b257221..66d1fb3 100644
--- a/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
+++ b/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
@@ -400,7 +400,7 @@ STAGE PLANS:
           Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             isSamplingPred: false
-            predicate: ((((UDFToDouble(_col0) > 10.0) and (UDFToDouble(_col0) 
< 20.0)) and (UDFToDouble(_col2) > 15.0)) and (UDFToDouble(_col2) < 25.0)) 
(type: boolean)
+            predicate: ((UDFToDouble(_col0) > 10.0) and (UDFToDouble(_col0) < 
20.0) and (UDFToDouble(_col2) > 15.0) and (UDFToDouble(_col2) < 25.0)) (type: 
boolean)
             Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/partition_boolexpr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_boolexpr.q.out 
b/ql/src/test/results/clientpositive/partition_boolexpr.q.out
index 05fe761..f574f89 100644
--- a/ql/src/test/results/clientpositive/partition_boolexpr.q.out
+++ b/ql/src/test/results/clientpositive/partition_boolexpr.q.out
@@ -87,19 +87,21 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: srcpart
-            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Filter Operator
-              predicate: false (type: boolean)
-              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
+            Select Operator
+              Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: false (type: boolean)
+                Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
+                Group By Operator
+                  aggregations: count(1)
+                  mode: hash
+                  outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
+                  Reduce Output Operator
+                    sort order: 
+                    Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                    value expressions: _col0 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query13.q.out 
b/ql/src/test/results/clientpositive/perf/query13.q.out
index 0e59b0d..6113d18 100644
--- a/ql/src/test/results/clientpositive/perf/query13.q.out
+++ b/ql/src/test/results/clientpositive/perf/query13.q.out
@@ -121,97 +121,97 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_52]
+         File Output Operator [FS_42]
             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_50]
+            Group By Operator [GBY_40]
             |  
aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","sum(VALUE._col3)"]
             |  outputColumnNames:["_col0","_col1","_col2","_col3"]
             |  Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_49]
+               Reduce Output Operator [RS_39]
                   sort order:
                   Statistics:Num rows: 1 Data size: 112 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions:_col0 (type: 
struct<count:bigint,sum:double,input:int>), _col1 (type: 
struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col2 (type: 
struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col3 (type: 
decimal(17,2))
-                  Group By Operator [GBY_48]
+                  Group By Operator [GBY_38]
                      
aggregations:["avg(_col5)","avg(_col7)","avg(_col8)","sum(_col8)"]
                      outputColumnNames:["_col0","_col1","_col2","_col3"]
                      Statistics:Num rows: 1 Data size: 112 Basic stats: 
COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_85]
+                     Merge Join Operator [MERGEJOIN_73]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col5","_col7","_col8"]
                      |  Statistics:Num rows: 18150000 Data size: 18420070657 
Basic stats: COMPLETE Column stats: NONE
                      |<-Map 12 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_45]
+                     |  Reduce Output Operator [RS_35]
                      |     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_41]
+                     |     Select Operator [SEL_33]
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 36524 Data size: 40870356 
Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_80]
+                     |        Filter Operator [FIL_68]
                      |           predicate:(d_date_sk is not null and (d_year 
= 2001)) (type: boolean)
                      |           Statistics:Num rows: 36524 Data size: 
40870356 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_39]
+                     |           TableScan [TS_31]
                      |              alias:date_dim
                      |              Statistics:Num rows: 73049 Data size: 
81741831 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_43]
+                        Reduce Output Operator [RS_34]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 16500000 Data size: 
16745518417 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col5 (type: int), _col7 (type: 
decimal(7,2)), _col8 (type: decimal(7,2))
-                           Select Operator [SEL_38]
+                           Select Operator [SEL_30]
                               
outputColumnNames:["_col0","_col5","_col7","_col8"]
                               Statistics:Num rows: 16500000 Data size: 
16745518417 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_73]
+                              Filter Operator [FIL_29]
                                  predicate:(((_col17) IN ('KY', 'GA', 'NM') 
and _col9 BETWEEN 100 AND 200) or ((_col17) IN ('MT', 'OR', 'IN') and _col9 
BETWEEN 150 AND 300) or ((_col17) IN ('WI', 'MO', 'WV') and _col9 BETWEEN 50 
AND 250)) (type: boolean)
                                  Statistics:Num rows: 16500000 Data size: 
16745518417 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_84]
+                                 Merge Join Operator [MERGEJOIN_72]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col3 (type: int)","1":"_col0 
(type: int)"}
                                  |  
outputColumnNames:["_col0","_col5","_col7","_col8","_col9","_col17"]
                                  |  Statistics:Num rows: 22000000 Data size: 
22327357890 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_35]
+                                 |  Reduce Output Operator [RS_27]
                                  |     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
                                  |     value expressions:_col1 (type: string)
-                                 |     Select Operator [SEL_31]
+                                 |     Select Operator [SEL_25]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 20000000 Data 
size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_79]
+                                 |        Filter Operator [FIL_67]
                                  |           predicate:((((ca_state) IN ('KY', 
'GA', 'NM') or (ca_state) IN ('MT', 'OR', 'IN') or (ca_state) IN ('WI', 'MO', 
'WV')) and (ca_country = 'United States')) and ca_address_sk is not null) 
(type: boolean)
                                  |           Statistics:Num rows: 20000000 
Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_29]
+                                 |           TableScan [TS_23]
                                  |              alias:customer_address
                                  |              Statistics:Num rows: 40000000 
Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_33]
+                                    Reduce Output Operator [RS_26]
                                        key expressions:_col3 (type: int)
                                        Map-reduce partition columns:_col3 
(type: int)
                                        sort order:+
                                        Statistics:Num rows: 4491 Data size: 
1626526 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), 
_col5 (type: int), _col7 (type: decimal(7,2)), _col8 (type: decimal(7,2)), 
_col9 (type: decimal(7,2))
-                                       Select Operator [SEL_28]
+                                       Select Operator [SEL_22]
                                           
outputColumnNames:["_col0","_col3","_col5","_col7","_col8","_col9"]
                                           Statistics:Num rows: 4491 Data size: 
1626526 Basic stats: COMPLETE Column stats: NONE
-                                          Filter Operator [FIL_74]
+                                          Filter Operator [FIL_21]
                                              predicate:(((_col12 = 'M') and 
(_col13 = '4 yr Degree') and _col6 BETWEEN 100.0 AND 150.0 and (_col15 = 3)) or 
((_col12 = 'D') and (_col13 = 'Primary') and _col6 BETWEEN 50.0 AND 100.0 and 
(_col15 = 1)) or ((_col12 = 'U') and (_col13 = 'Advanced Degree') and _col6 
BETWEEN 150.0 AND 200.0 and (_col15 = 1))) (type: boolean)
                                              Statistics:Num rows: 4491 Data 
size: 1626526 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_83]
+                                             Merge Join Operator [MERGEJOIN_71]
                                              |  condition map:[{"":"Inner Join 
0 to 1"}]
                                              |  keys:{"0":"_col2 (type: 
int)","1":"_col0 (type: int)"}
                                              |  
outputColumnNames:["_col0","_col3","_col5","_col6","_col7","_col8","_col9","_col12","_col13","_col15"]
                                              |  Statistics:Num rows: 23958 
Data size: 8676981 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 10 [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:+
@@ -220,26 +220,26 @@ Stage-0
                                              |     Select Operator [SEL_11]
                                              |        
outputColumnNames:["_col0","_col1"]
                                              |        Statistics:Num rows: 
7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_78]
+                                             |        Filter Operator [FIL_66]
                                              |           
predicate:(((hd_dep_count = 3) or (hd_dep_count = 1)) and hd_demo_sk is not 
null) (type: boolean)
                                              |           Statistics:Num rows: 
7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_9]
                                              |              
alias:household_demographics
                                              |              Statistics:Num 
rows: 7200 Data size: 770400 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: 21780 
Data size: 7888165 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col0 
(type: int), _col3 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), 
_col7 (type: decimal(7,2)), _col8 (type: decimal(7,2)), _col9 (type: 
decimal(7,2)), _col12 (type: string), _col13 (type: string)
-                                                   Merge Join Operator 
[MERGEJOIN_82]
+                                                   Merge Join Operator 
[MERGEJOIN_70]
                                                    |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                                    |  
outputColumnNames:["_col0","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col12","_col13"]
                                                    |  Statistics:Num rows: 
21780 Data size: 7888165 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 9 [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:+
@@ -248,26 +248,26 @@ Stage-0
                                                    |     Select Operator 
[SEL_8]
                                                    |        
outputColumnNames:["_col0","_col1","_col2"]
                                                    |        Statistics:Num 
rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator 
[FIL_77]
+                                                   |        Filter Operator 
[FIL_65]
                                                    |           
predicate:((((cd_marital_status = 'M') or (cd_marital_status = 'D') or 
(cd_marital_status = 'U')) and ((cd_education_status = '4 yr Degree') or 
(cd_education_status = 'Primary') or (cd_education_status = 'Advanced 
Degree'))) and cd_demo_sk is not null) (type: boolean)
                                                    |           Statistics:Num 
rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                                    |           TableScan [TS_6]
                                                    |              
alias:customer_demographics
                                                    |              
Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column 
stats: NONE
                                                    |<-Reducer 2 [SIMPLE_EDGE]
-                                                      Reduce Output Operator 
[RS_18]
+                                                      Reduce Output Operator 
[RS_15]
                                                          key expressions:_col1 
(type: int)
                                                          Map-reduce partition 
columns:_col1 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 
1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                                          value 
expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col5 
(type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col8 
(type: decimal(7,2)), _col9 (type: decimal(7,2))
-                                                         Merge Join Operator 
[MERGEJOIN_81]
+                                                         Merge Join Operator 
[MERGEJOIN_69]
                                                          |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col4 
(type: int)","1":"_col0 (type: int)"}
                                                          |  
outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9"]
                                                          |  Statistics:Num 
rows: 1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 1 [SIMPLE_EDGE]
-                                                         |  Reduce Output 
Operator [RS_13]
+                                                         |  Reduce Output 
Operator [RS_12]
                                                          |     key 
expressions:_col4 (type: int)
                                                          |     Map-reduce 
partition columns:_col4 (type: int)
                                                          |     sort order:+
@@ -276,14 +276,14 @@ Stage-0
                                                          |     Select Operator 
[SEL_2]
                                                          |        
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                                                          |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                         |        Filter 
Operator [FIL_75]
+                                                         |        Filter 
Operator [FIL_63]
                                                          |           
predicate:(((((((ss_net_profit BETWEEN 100 AND 200 or ss_net_profit BETWEEN 150 
AND 300 or ss_net_profit BETWEEN 50 AND 250) and ss_store_sk is not null) and 
(ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 
100.0 or ss_sales_price BETWEEN 150.0 AND 200.0)) and ss_cdemo_sk is not null) 
and ss_hdemo_sk is not null) and ss_addr_sk is not null) and 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 8 [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:+
@@ -291,7 +291,7 @@ Stage-0
                                                                Select Operator 
[SEL_5]
                                                                   
outputColumnNames:["_col0"]
                                                                   
Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column 
stats: NONE
-                                                                  Filter 
Operator [FIL_76]
+                                                                  Filter 
Operator [FIL_64]
                                                                      
predicate:s_store_sk is not null (type: boolean)
                                                                      
Statistics:Num rows: 1704 Data size: 3256276 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/query15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query15.q.out 
b/ql/src/test/results/clientpositive/perf/query15.q.out
index 0ce4e52..c237828 100644
--- a/ql/src/test/results/clientpositive/perf/query15.q.out
+++ b/ql/src/test/results/clientpositive/perf/query15.q.out
@@ -16,82 +16,82 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_37]
+         File Output Operator [FS_31]
             compressed:false
             Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
             table:{"input 
format:":"org.apache.hadoop.mapred.TextInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_36]
+            Limit [LIM_30]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE 
Column stats: NONE
-               Select Operator [SEL_35]
+               Select Operator [SEL_29]
                |  outputColumnNames:["_col0","_col1"]
                |  Statistics:Num rows: 53240002 Data size: 45787477895 Basic 
stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_34]
+                  Reduce Output Operator [RS_28]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 53240002 Data size: 45787477895 
Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: decimal(17,2))
-                     Group By Operator [GBY_32]
+                     Group By Operator [GBY_26]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: string)
                      |  outputColumnNames:["_col0","_col1"]
                      |  Statistics:Num rows: 53240002 Data size: 45787477895 
Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_31]
+                        Reduce Output Operator [RS_25]
                            key expressions:_col0 (type: string)
                            Map-reduce partition columns:_col0 (type: string)
                            sort order:+
                            Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: decimal(17,2))
-                           Group By Operator [GBY_30]
+                           Group By Operator [GBY_24]
                               aggregations:["sum(_col2)"]
                               keys:_col7 (type: string)
                               outputColumnNames:["_col0","_col1"]
                               Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_29]
+                              Select Operator [SEL_23]
                                  outputColumnNames:["_col7","_col2"]
                                  Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_54]
+                                 Merge Join Operator [MERGEJOIN_47]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 
(type: int)"}
                                  |  outputColumnNames:["_col2","_col7"]
                                  |  Statistics:Num rows: 106480005 Data size: 
91574956652 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 9 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_27]
+                                 |  Reduce Output Operator [RS_21]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 
(type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 18262 Data size: 
20435178 Basic stats: COMPLETE Column stats: NONE
-                                 |     Select Operator [SEL_23]
+                                 |     Select Operator [SEL_19]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 18262 Data 
size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_51]
+                                 |        Filter Operator [FIL_44]
                                  |           predicate:(((d_qoy = 2) 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_21]
+                                 |           TableScan [TS_17]
                                  |              alias:date_dim
                                  |              Statistics:Num rows: 73049 
Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 3 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_25]
+                                    Reduce Output Operator [RS_20]
                                        key expressions:_col0 (type: int)
                                        Map-reduce partition columns:_col0 
(type: int)
                                        sort order:+
                                        Statistics:Num rows: 96800003 Data 
size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col2 (type: 
decimal(7,2)), _col7 (type: string)
-                                       Select Operator [SEL_20]
+                                       Select Operator [SEL_16]
                                           
outputColumnNames:["_col0","_col2","_col7"]
                                           Statistics:Num rows: 96800003 Data 
size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                                          Filter Operator [FIL_47]
+                                          Filter Operator [FIL_15]
                                              predicate:((substr(_col7, 1, 5)) 
IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', 
'81792') or (_col6) IN ('CA', 'WA', 'GA') or (_col2 > 500)) (type: boolean)
                                              Statistics:Num rows: 96800003 
Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_53]
+                                             Merge Join Operator [MERGEJOIN_46]
                                              |  condition map:[{"":"Inner Join 
0 to 1"}]
                                              |  keys:{"0":"_col4 (type: 
int)","1":"_col0 (type: int)"}
                                              |  
outputColumnNames:["_col0","_col2","_col6","_col7"]
                                              |  Statistics:Num rows: 96800003 
Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 8 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_17]
+                                             |  Reduce Output Operator [RS_13]
                                              |     key expressions:_col0 
(type: int)
                                              |     Map-reduce partition 
columns:_col0 (type: int)
                                              |     sort order:+
@@ -100,26 +100,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        
outputColumnNames:["_col0","_col1","_col2"]
                                              |        Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_50]
+                                             |        Filter Operator [FIL_43]
                                              |           
predicate:ca_address_sk is not null (type: boolean)
                                              |           Statistics:Num rows: 
40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              
alias:customer_address
                                              |              Statistics:Num 
rows: 40000000 Data size: 40595195284 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: 
88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col0 
(type: int), _col2 (type: decimal(7,2))
-                                                   Merge Join Operator 
[MERGEJOIN_52]
+                                                   Merge Join Operator 
[MERGEJOIN_45]
                                                    |  condition 
map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: 
int)","1":"_col0 (type: int)"}
                                                    |  
outputColumnNames:["_col0","_col2","_col4"]
                                                    |  Statistics:Num rows: 
88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator 
[RS_10]
+                                                   |  Reduce Output Operator 
[RS_9]
                                                    |     key expressions:_col1 
(type: int)
                                                    |     Map-reduce partition 
columns:_col1 (type: int)
                                                    |     sort order:+
@@ -128,14 +128,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_48]
+                                                   |        Filter Operator 
[FIL_41]
                                                    |           
predicate:(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_0]
                                                    |              
alias:catalog_sales
                                                    |              
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |<-Map 7 [SIMPLE_EDGE]
-                                                      Reduce Output Operator 
[RS_12]
+                                                      Reduce Output Operator 
[RS_10]
                                                          key expressions:_col0 
(type: int)
                                                          Map-reduce partition 
columns:_col0 (type: int)
                                                          sort order:+
@@ -144,7 +144,7 @@ Stage-0
                                                          Select Operator 
[SEL_5]
                                                             
outputColumnNames:["_col0","_col1"]
                                                             Statistics:Num 
rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                                            Filter Operator 
[FIL_49]
+                                                            Filter Operator 
[FIL_42]
                                                                
predicate:(c_customer_sk is not null and c_current_addr_sk is not null) (type: 
boolean)
                                                                Statistics:Num 
rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                                TableScan [TS_3]

Reply via email to