You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2015/12/21 02:06:42 UTC

[01/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Repository: hive
Updated Branches:
  refs/heads/master 1628bf12a -> 6f44fc810


http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_varchar_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_varchar_mapjoin1.q.out b/ql/src/test/results/clientpositive/tez/vector_varchar_mapjoin1.q.out
index 30600e5..64af51b 100644
--- a/ql/src/test/results/clientpositive/tez/vector_varchar_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_varchar_mapjoin1.q.out
@@ -340,7 +340,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (c2 is not null and UDFToString(c2) is not null) (type: boolean)
+                    predicate: c2 is not null (type: boolean)
                     Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: c1 (type: int), c2 (type: varchar(10))

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
index 4f6cb91..3cb52be 100644
--- a/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
@@ -1303,28 +1303,25 @@ 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
         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)
@@ -1430,20 +1427,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
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1484,7 +1478,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
@@ -1557,28 +1551,25 @@ 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
         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)
@@ -1669,20 +1660,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
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1708,7 +1696,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
@@ -1794,28 +1782,25 @@ 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
         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)
@@ -1848,7 +1833,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
@@ -2066,7 +2051,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
@@ -2162,7 +2147,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
@@ -4205,42 +4190,39 @@ 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)
         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)
@@ -4328,34 +4310,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)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -5386,42 +5365,38 @@ 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)
         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/vector_auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/vector_auto_smb_mapjoin_14.q.out
index c5eedb5..abb2acc 100644
--- a/ql/src/test/results/clientpositive/vector_auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/vector_auto_smb_mapjoin_14.q.out
@@ -586,7 +586,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -707,7 +707,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -912,14 +912,11 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: int)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
             Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
@@ -930,14 +927,11 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: int)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1227,7 +1221,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_between_columns.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_between_columns.q.out b/ql/src/test/results/clientpositive/vector_between_columns.q.out
index 4837aba..397673c 100644
--- a/ql/src/test/results/clientpositive/vector_between_columns.q.out
+++ b/ql/src/test/results/clientpositive/vector_between_columns.q.out
@@ -60,7 +60,7 @@ POSTHOOK: Input: default@tint_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@TINT
 tint_txt.rnum	tint_txt.cint
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: -- We DO NOT expect the following to vectorized because the BETWEEN range expressions
 -- are not constants.  We currently do not support the range expressions being columns.
 explain
@@ -139,7 +139,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: select tint.rnum, tsint.rnum from tint , tsint where tint.cint between tsint.csint and tsint.csint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tint

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out
index 1febdbe..682e902 100644
--- a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out
+++ b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out
@@ -190,7 +190,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(*))
 FROM hundredorc t1 JOIN hundredorc t2 ON t2.bin = t2.bin
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out
index 0b89bec..7ca3790 100644
--- a/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out
@@ -362,7 +362,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (c2 is not null and UDFToString(c2) is not null) (type: boolean)
+              predicate: c2 is not null (type: boolean)
               Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c2 (type: char(10))

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out b/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out
index c410086..7cd7eb0 100644
--- a/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out
@@ -178,13 +178,10 @@ STAGE PLANS:
                 expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col1 is not null (type: boolean)
-                  Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                  HashTable Sink Operator
-                    keys:
-                      0 _col1 (type: interval_day_time), _col0 (type: string)
-                      1 _col1 (type: interval_day_time), _col0 (type: string)
+                HashTable Sink Operator
+                  keys:
+                    0 _col1 (type: interval_day_time), _col0 (type: string)
+                    1 _col1 (type: interval_day_time), _col0 (type: string)
 
   Stage: Stage-3
     Map Reduce
@@ -199,28 +196,25 @@ STAGE PLANS:
                 expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col1 is not null (type: boolean)
-                  Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                  Map Join Operator
-                    condition map:
-                         Inner Join 0 to 1
-                    keys:
-                      0 _col1 (type: interval_day_time), _col0 (type: string)
-                      1 _col1 (type: interval_day_time), _col0 (type: string)
+                Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  keys:
+                    0 _col1 (type: interval_day_time), _col0 (type: string)
+                    1 _col1 (type: interval_day_time), _col0 (type: string)
+                  outputColumnNames: _col0, _col1, _col2
+                  Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
-                      outputColumnNames: _col0, _col1, _col2
+                    File Output Operator
+                      compressed: false
                       Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                      File Output Operator
-                        compressed: false
-                        Statistics: Num rows: 1100 Data size: 506290 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
+                      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
       Execution mode: vectorized
       Local Work:
         Map Reduce Local Work

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_join_filters.q.out b/ql/src/test/results/clientpositive/vector_join_filters.q.out
index f33c7e0..61e5b2a 100644
--- a/ql/src/test/results/clientpositive/vector_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/vector_join_filters.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_join_nulls.q.out b/ql/src/test/results/clientpositive/vector_join_nulls.q.out
index 1ff5a0c..7b59cc4 100644
--- a/ql/src/test/results/clientpositive/vector_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/vector_join_nulls.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-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 sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/vector_varchar_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_varchar_mapjoin1.q.out b/ql/src/test/results/clientpositive/vector_varchar_mapjoin1.q.out
index 33dbf9e..e816367 100644
--- a/ql/src/test/results/clientpositive/vector_varchar_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/vector_varchar_mapjoin1.q.out
@@ -350,7 +350,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (c2 is not null and UDFToString(c2) is not null) (type: boolean)
+              predicate: c2 is not null (type: boolean)
               Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c2 (type: varchar(10))


[13/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query80.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query80.q.out b/ql/src/test/results/clientpositive/perf/query80.q.out
index 953e61f..37cb542 100644
--- a/ql/src/test/results/clientpositive/perf/query80.q.out
+++ b/ql/src/test/results/clientpositive/perf/query80.q.out
@@ -31,435 +31,429 @@ Stage-0
       limit:100
       Stage-1
          Reducer 10
-         File Output Operator [FS_149]
+         File Output Operator [FS_125]
             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_148]
+            Limit [LIM_124]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_147]
+               Select Operator [SEL_123]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 419265 Data size: 602181139 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 9 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_146]
+                  Reduce Output Operator [RS_122]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 419265 Data size: 602181139 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(27,2)), _col3 (type: decimal(32,2)), _col4 (type: decimal(33,2))
-                     Select Operator [SEL_145]
+                     Select Operator [SEL_121]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                         Statistics:Num rows: 419265 Data size: 602181139 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_144]
+                        Group By Operator [GBY_120]
                         |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col3","_col4","_col5"]
                         |  Statistics:Num rows: 419265 Data size: 602181139 Basic stats: COMPLETE Column stats: NONE
                         |<-Union 8 [SIMPLE_EDGE]
                            |<-Reducer 22 [CONTAINS]
-                           |  Reduce Output Operator [RS_143]
+                           |  Reduce Output Operator [RS_119]
                            |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     sort order:+++
                            |     Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col3 (type: decimal(27,2)), _col4 (type: decimal(32,2)), _col5 (type: decimal(33,2))
-                           |     Group By Operator [GBY_142]
+                           |     Group By Operator [GBY_118]
                            |        aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"]
                            |        keys:_col0 (type: string), _col1 (type: string), '0' (type: string)
                            |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                            |        Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
-                           |        Select Operator [SEL_91]
+                           |        Select Operator [SEL_75]
                            |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            |           Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
-                           |           Group By Operator [GBY_90]
+                           |           Group By Operator [GBY_74]
                            |           |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                            |           |  keys:KEY._col0 (type: string)
                            |           |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |           |  Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
                            |           |<-Reducer 21 [SIMPLE_EDGE]
-                           |              Reduce Output Operator [RS_89]
+                           |              Reduce Output Operator [RS_73]
                            |                 key expressions:_col0 (type: string)
                            |                 Map-reduce partition columns:_col0 (type: string)
                            |                 sort order:+
                            |                 Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                            |                 value expressions:_col1 (type: decimal(17,2)), _col2 (type: decimal(22,2)), _col3 (type: decimal(23,2))
-                           |                 Group By Operator [GBY_88]
+                           |                 Group By Operator [GBY_72]
                            |                    aggregations:["sum(_col1)","sum(_col2)","sum(_col3)"]
                            |                    keys:_col0 (type: string)
                            |                    outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                    Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                           |                    Select Operator [SEL_86]
+                           |                    Select Operator [SEL_70]
                            |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                       Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                           |                       Merge Join Operator [MERGEJOIN_234]
+                           |                       Merge Join Operator [MERGEJOIN_211]
                            |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                       |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                            |                       |  outputColumnNames:["_col5","_col6","_col9","_col10","_col14"]
                            |                       |  Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Map 27 [SIMPLE_EDGE]
-                           |                       |  Reduce Output Operator [RS_84]
+                           |                       |  Reduce Output Operator [RS_68]
                            |                       |     key expressions:_col0 (type: int)
                            |                       |     Map-reduce partition columns:_col0 (type: int)
                            |                       |     sort order:+
                            |                       |     Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |     Select Operator [SEL_62]
+                           |                       |     Select Operator [SEL_54]
                            |                       |        outputColumnNames:["_col0"]
                            |                       |        Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |        Filter Operator [FIL_218]
+                           |                       |        Filter Operator [FIL_194]
                            |                       |           predicate:((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean)
                            |                       |           Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |           TableScan [TS_60]
+                           |                       |           TableScan [TS_52]
                            |                       |              alias:promotion
                            |                       |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Reducer 20 [SIMPLE_EDGE]
-                           |                          Reduce Output Operator [RS_82]
+                           |                          Reduce Output Operator [RS_67]
                            |                             key expressions:_col3 (type: int)
                            |                             Map-reduce partition columns:_col3 (type: int)
                            |                             sort order:+
                            |                             Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                            |                             value expressions:_col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                           |                             Merge Join Operator [MERGEJOIN_233]
+                           |                             Merge Join Operator [MERGEJOIN_210]
                            |                             |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                             |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                            |                             |  outputColumnNames:["_col3","_col5","_col6","_col9","_col10","_col14"]
                            |                             |  Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                            |                             |<-Map 26 [SIMPLE_EDGE]
-                           |                             |  Reduce Output Operator [RS_79]
+                           |                             |  Reduce Output Operator [RS_65]
                            |                             |     key expressions:_col0 (type: int)
                            |                             |     Map-reduce partition columns:_col0 (type: int)
                            |                             |     sort order:+
                            |                             |     Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |     Select Operator [SEL_59]
+                           |                             |     Select Operator [SEL_51]
                            |                             |        outputColumnNames:["_col0"]
                            |                             |        Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |        Filter Operator [FIL_217]
+                           |                             |        Filter Operator [FIL_193]
                            |                             |           predicate:((i_current_price > 50) and i_item_sk is not null) (type: boolean)
                            |                             |           Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |           TableScan [TS_57]
+                           |                             |           TableScan [TS_49]
                            |                             |              alias:item
                            |                             |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |                             |<-Reducer 19 [SIMPLE_EDGE]
-                           |                                Reduce Output Operator [RS_77]
+                           |                                Reduce Output Operator [RS_64]
                            |                                   key expressions:_col2 (type: int)
                            |                                   Map-reduce partition columns:_col2 (type: int)
                            |                                   sort order:+
                            |                                   Statistics:Num rows: 50600 Data size: 23318689 Basic stats: COMPLETE Column stats: NONE
                            |                                   value expressions:_col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                           |                                   Merge Join Operator [MERGEJOIN_232]
+                           |                                   Merge Join Operator [MERGEJOIN_209]
                            |                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                                   |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |                                   |  outputColumnNames:["_col2","_col3","_col5","_col6","_col9","_col10","_col14"]
                            |                                   |  Statistics:Num rows: 50600 Data size: 23318689 Basic stats: COMPLETE Column stats: NONE
                            |                                   |<-Map 25 [SIMPLE_EDGE]
-                           |                                   |  Reduce Output Operator [RS_74]
+                           |                                   |  Reduce Output Operator [RS_62]
                            |                                   |     key expressions:_col0 (type: int)
                            |                                   |     Map-reduce partition columns:_col0 (type: int)
                            |                                   |     sort order:+
                            |                                   |     Statistics:Num rows: 46000 Data size: 21198808 Basic stats: COMPLETE Column stats: NONE
                            |                                   |     value expressions:_col1 (type: string)
-                           |                                   |     Select Operator [SEL_56]
+                           |                                   |     Select Operator [SEL_48]
                            |                                   |        outputColumnNames:["_col0","_col1"]
                            |                                   |        Statistics:Num rows: 46000 Data size: 21198808 Basic stats: COMPLETE Column stats: NONE
-                           |                                   |        Filter Operator [FIL_216]
+                           |                                   |        Filter Operator [FIL_192]
                            |                                   |           predicate:cp_catalog_page_sk is not null (type: boolean)
                            |                                   |           Statistics:Num rows: 46000 Data size: 21198808 Basic stats: COMPLETE Column stats: NONE
-                           |                                   |           TableScan [TS_54]
+                           |                                   |           TableScan [TS_46]
                            |                                   |              alias:catalog_page
                            |                                   |              Statistics:Num rows: 46000 Data size: 21198808 Basic stats: COMPLETE Column stats: NONE
                            |                                   |<-Reducer 18 [SIMPLE_EDGE]
-                           |                                      Reduce Output Operator [RS_72]
+                           |                                      Reduce Output Operator [RS_61]
                            |                                         key expressions:_col1 (type: int)
                            |                                         Map-reduce partition columns:_col1 (type: int)
                            |                                         sort order:+
                            |                                         Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                                         value expressions:_col2 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                           |                                         Merge Join Operator [MERGEJOIN_231]
+                           |                                         Merge Join Operator [MERGEJOIN_208]
                            |                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                                         |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                                         |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                            |                                         |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                                         |<-Map 24 [SIMPLE_EDGE]
-                           |                                         |  Reduce Output Operator [RS_69]
+                           |                                         |  Reduce Output Operator [RS_59]
                            |                                         |     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_53]
+                           |                                         |     Select Operator [SEL_45]
                            |                                         |        outputColumnNames:["_col0"]
                            |                                         |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                         |        Filter Operator [FIL_215]
+                           |                                         |        Filter Operator [FIL_191]
                            |                                         |           predicate:(d_date BETWEEN 1998-08-04 AND 1998-09-04 and d_date_sk is not null) (type: boolean)
                            |                                         |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                         |           TableScan [TS_51]
+                           |                                         |           TableScan [TS_43]
                            |                                         |              alias:date_dim
                            |                                         |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                                         |<-Reducer 17 [SIMPLE_EDGE]
-                           |                                            Reduce Output Operator [RS_67]
+                           |                                            Reduce Output Operator [RS_58]
                            |                                               key expressions:_col0 (type: int)
                            |                                               Map-reduce partition columns:_col0 (type: int)
                            |                                               sort order:+
                            |                                               Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                           |                                               Merge Join Operator [MERGEJOIN_230]
+                           |                                               Merge Join Operator [MERGEJOIN_202]
                            |                                               |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |                                               |  keys:{"0":"_col2 (type: int), _col4 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                            |                                               |  outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                            |                                               |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               |<-Map 16 [SIMPLE_EDGE]
-                           |                                               |  Reduce Output Operator [RS_63]
+                           |                                               |  Reduce Output Operator [RS_55]
                            |                                               |     key expressions:_col2 (type: int), _col4 (type: int)
                            |                                               |     Map-reduce partition columns:_col2 (type: int), _col4 (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: decimal(7,2)), _col6 (type: decimal(7,2))
-                           |                                               |     Select Operator [SEL_48]
+                           |                                               |     Select Operator [SEL_40]
                            |                                               |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |                                               |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                               |        Filter Operator [FIL_213]
+                           |                                               |        Filter Operator [FIL_189]
                            |                                               |           predicate:(((cs_sold_date_sk is not null and cs_catalog_page_sk is not null) and cs_item_sk is not null) and cs_promo_sk is not null) (type: boolean)
                            |                                               |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                               |           TableScan [TS_46]
+                           |                                               |           TableScan [TS_38]
                            |                                               |              alias:catalog_sales
                            |                                               |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               |<-Map 23 [SIMPLE_EDGE]
-                           |                                                  Reduce Output Operator [RS_64]
+                           |                                                  Reduce Output Operator [RS_56]
                            |                                                     key expressions:_col0 (type: int), _col1 (type: int)
                            |                                                     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                            |                                                     sort order:++
                            |                                                     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                                     value expressions:_col2 (type: decimal(7,2)), _col3 (type: decimal(7,2))
-                           |                                                     Select Operator [SEL_50]
+                           |                                                     Select Operator [SEL_42]
                            |                                                        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                                                        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                                        Filter Operator [FIL_214]
-                           |                                                           predicate:cr_item_sk is not null (type: boolean)
+                           |                                                        TableScan [TS_41]
+                           |                                                           alias:catalog_returns
                            |                                                           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                                           TableScan [TS_49]
-                           |                                                              alias:catalog_returns
-                           |                                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |<-Reducer 34 [CONTAINS]
-                           |  Reduce Output Operator [RS_143]
+                           |  Reduce Output Operator [RS_119]
                            |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     sort order:+++
                            |     Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col3 (type: decimal(27,2)), _col4 (type: decimal(32,2)), _col5 (type: decimal(33,2))
-                           |     Group By Operator [GBY_142]
+                           |     Group By Operator [GBY_118]
                            |        aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"]
                            |        keys:_col0 (type: string), _col1 (type: string), '0' (type: string)
                            |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                            |        Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
-                           |        Select Operator [SEL_139]
+                           |        Select Operator [SEL_115]
                            |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            |           Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
-                           |           Group By Operator [GBY_138]
+                           |           Group By Operator [GBY_114]
                            |           |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                            |           |  keys:KEY._col0 (type: string)
                            |           |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |           |  Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
                            |           |<-Reducer 33 [SIMPLE_EDGE]
-                           |              Reduce Output Operator [RS_137]
+                           |              Reduce Output Operator [RS_113]
                            |                 key expressions:_col0 (type: string)
                            |                 Map-reduce partition columns:_col0 (type: string)
                            |                 sort order:+
                            |                 Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                            |                 value expressions:_col1 (type: decimal(17,2)), _col2 (type: decimal(22,2)), _col3 (type: decimal(23,2))
-                           |                 Group By Operator [GBY_136]
+                           |                 Group By Operator [GBY_112]
                            |                    aggregations:["sum(_col1)","sum(_col2)","sum(_col3)"]
                            |                    keys:_col0 (type: string)
                            |                    outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                    Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                           |                    Select Operator [SEL_134]
+                           |                    Select Operator [SEL_110]
                            |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                       Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                           |                       Merge Join Operator [MERGEJOIN_239]
+                           |                       Merge Join Operator [MERGEJOIN_215]
                            |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                       |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                            |                       |  outputColumnNames:["_col5","_col6","_col9","_col10","_col14"]
                            |                       |  Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Map 39 [SIMPLE_EDGE]
-                           |                       |  Reduce Output Operator [RS_132]
+                           |                       |  Reduce Output Operator [RS_108]
                            |                       |     key expressions:_col0 (type: int)
                            |                       |     Map-reduce partition columns:_col0 (type: int)
                            |                       |     sort order:+
                            |                       |     Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |     Select Operator [SEL_110]
+                           |                       |     Select Operator [SEL_94]
                            |                       |        outputColumnNames:["_col0"]
                            |                       |        Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |        Filter Operator [FIL_224]
+                           |                       |        Filter Operator [FIL_200]
                            |                       |           predicate:((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean)
                            |                       |           Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                           |                       |           TableScan [TS_108]
+                           |                       |           TableScan [TS_92]
                            |                       |              alias:promotion
                            |                       |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Reducer 32 [SIMPLE_EDGE]
-                           |                          Reduce Output Operator [RS_130]
+                           |                          Reduce Output Operator [RS_107]
                            |                             key expressions:_col3 (type: int)
                            |                             Map-reduce partition columns:_col3 (type: int)
                            |                             sort order:+
                            |                             Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                            |                             value expressions:_col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                           |                             Merge Join Operator [MERGEJOIN_238]
+                           |                             Merge Join Operator [MERGEJOIN_214]
                            |                             |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                             |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |                             |  outputColumnNames:["_col3","_col5","_col6","_col9","_col10","_col14"]
                            |                             |  Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                            |                             |<-Map 38 [SIMPLE_EDGE]
-                           |                             |  Reduce Output Operator [RS_127]
+                           |                             |  Reduce Output Operator [RS_105]
                            |                             |     key expressions:_col0 (type: int)
                            |                             |     Map-reduce partition columns:_col0 (type: int)
                            |                             |     sort order:+
                            |                             |     Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |     Select Operator [SEL_107]
+                           |                             |     Select Operator [SEL_91]
                            |                             |        outputColumnNames:["_col0"]
                            |                             |        Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |        Filter Operator [FIL_223]
+                           |                             |        Filter Operator [FIL_199]
                            |                             |           predicate:((i_current_price > 50) and i_item_sk is not null) (type: boolean)
                            |                             |           Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                           |                             |           TableScan [TS_105]
+                           |                             |           TableScan [TS_89]
                            |                             |              alias:item
                            |                             |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |                             |<-Reducer 31 [SIMPLE_EDGE]
-                           |                                Reduce Output Operator [RS_125]
+                           |                                Reduce Output Operator [RS_104]
                            |                                   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:_col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                           |                                   Merge Join Operator [MERGEJOIN_237]
+                           |                                   Merge Join Operator [MERGEJOIN_213]
                            |                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                                   |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                            |                                   |  outputColumnNames:["_col1","_col3","_col5","_col6","_col9","_col10","_col14"]
                            |                                   |  Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                            |                                   |<-Map 37 [SIMPLE_EDGE]
-                           |                                   |  Reduce Output Operator [RS_122]
+                           |                                   |  Reduce Output Operator [RS_102]
                            |                                   |     key expressions:_col0 (type: int)
                            |                                   |     Map-reduce partition columns:_col0 (type: int)
                            |                                   |     sort order:+
                            |                                   |     Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
                            |                                   |     value expressions:_col1 (type: string)
-                           |                                   |     Select Operator [SEL_104]
+                           |                                   |     Select Operator [SEL_88]
                            |                                   |        outputColumnNames:["_col0","_col1"]
                            |                                   |        Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
-                           |                                   |        Filter Operator [FIL_222]
+                           |                                   |        Filter Operator [FIL_198]
                            |                                   |           predicate:web_site_sk is not null (type: boolean)
                            |                                   |           Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
-                           |                                   |           TableScan [TS_102]
+                           |                                   |           TableScan [TS_86]
                            |                                   |              alias:web_site
                            |                                   |              Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
                            |                                   |<-Reducer 30 [SIMPLE_EDGE]
-                           |                                      Reduce Output Operator [RS_120]
+                           |                                      Reduce Output Operator [RS_101]
                            |                                         key expressions:_col2 (type: int)
                            |                                         Map-reduce partition columns:_col2 (type: int)
                            |                                         sort order:+
                            |                                         Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                                         value expressions:_col1 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                           |                                         Merge Join Operator [MERGEJOIN_236]
+                           |                                         Merge Join Operator [MERGEJOIN_212]
                            |                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                                         |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                                         |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                            |                                         |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                                         |<-Map 36 [SIMPLE_EDGE]
-                           |                                         |  Reduce Output Operator [RS_117]
+                           |                                         |  Reduce Output Operator [RS_99]
                            |                                         |     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_101]
+                           |                                         |     Select Operator [SEL_85]
                            |                                         |        outputColumnNames:["_col0"]
                            |                                         |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                         |        Filter Operator [FIL_221]
+                           |                                         |        Filter Operator [FIL_197]
                            |                                         |           predicate:(d_date BETWEEN 1998-08-04 AND 1998-09-04 and d_date_sk is not null) (type: boolean)
                            |                                         |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                         |           TableScan [TS_99]
+                           |                                         |           TableScan [TS_83]
                            |                                         |              alias:date_dim
                            |                                         |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                                         |<-Reducer 29 [SIMPLE_EDGE]
-                           |                                            Reduce Output Operator [RS_115]
+                           |                                            Reduce Output Operator [RS_98]
                            |                                               key expressions:_col0 (type: int)
                            |                                               Map-reduce partition columns:_col0 (type: int)
                            |                                               sort order:+
                            |                                               Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                           |                                               Merge Join Operator [MERGEJOIN_235]
+                           |                                               Merge Join Operator [MERGEJOIN_203]
                            |                                               |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |                                               |  keys:{"0":"_col1 (type: int), _col4 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                            |                                               |  outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                            |                                               |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               |<-Map 28 [SIMPLE_EDGE]
-                           |                                               |  Reduce Output Operator [RS_111]
+                           |                                               |  Reduce Output Operator [RS_95]
                            |                                               |     key expressions:_col1 (type: int), _col4 (type: int)
                            |                                               |     Map-reduce partition columns:_col1 (type: int), _col4 (type: int)
                            |                                               |     sort order:++
                            |                                               |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2))
-                           |                                               |     Select Operator [SEL_96]
+                           |                                               |     Select Operator [SEL_80]
                            |                                               |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |                                               |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                               |        Filter Operator [FIL_219]
+                           |                                               |        Filter Operator [FIL_195]
                            |                                               |           predicate:(((ws_sold_date_sk is not null and ws_web_site_sk is not null) and ws_item_sk is not null) and ws_promo_sk is not null) (type: boolean)
                            |                                               |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                               |           TableScan [TS_94]
+                           |                                               |           TableScan [TS_78]
                            |                                               |              alias:web_sales
                            |                                               |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                               |<-Map 35 [SIMPLE_EDGE]
-                           |                                                  Reduce Output Operator [RS_112]
+                           |                                                  Reduce Output Operator [RS_96]
                            |                                                     key expressions:_col0 (type: int), _col1 (type: int)
                            |                                                     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                            |                                                     sort order:++
                            |                                                     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                                     value expressions:_col2 (type: decimal(7,2)), _col3 (type: decimal(7,2))
-                           |                                                     Select Operator [SEL_98]
+                           |                                                     Select Operator [SEL_82]
                            |                                                        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                                                        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                                        Filter Operator [FIL_220]
-                           |                                                           predicate:wr_item_sk is not null (type: boolean)
+                           |                                                        TableScan [TS_81]
+                           |                                                           alias:web_returns
                            |                                                           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                                           TableScan [TS_97]
-                           |                                                              alias:web_returns
-                           |                                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |<-Reducer 7 [CONTAINS]
-                              Reduce Output Operator [RS_143]
+                              Reduce Output Operator [RS_119]
                                  key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                  Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                  sort order:+++
                                  Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col3 (type: decimal(27,2)), _col4 (type: decimal(32,2)), _col5 (type: decimal(33,2))
-                                 Group By Operator [GBY_142]
+                                 Group By Operator [GBY_118]
                                     aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"]
                                     keys:_col0 (type: string), _col1 (type: string), '0' (type: string)
                                     outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     Statistics:Num rows: 838530 Data size: 1204362279 Basic stats: COMPLETE Column stats: NONE
-                                    Select Operator [SEL_45]
+                                    Select Operator [SEL_37]
                                        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                        Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
-                                       Group By Operator [GBY_44]
+                                       Group By Operator [GBY_36]
                                        |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                                        |  keys:KEY._col0 (type: string)
                                        |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                        |  Statistics:Num rows: 93170 Data size: 133818031 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 6 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_43]
+                                          Reduce Output Operator [RS_35]
                                              key expressions:_col0 (type: string)
                                              Map-reduce partition columns:_col0 (type: string)
                                              sort order:+
                                              Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col1 (type: decimal(17,2)), _col2 (type: decimal(22,2)), _col3 (type: decimal(23,2))
-                                             Group By Operator [GBY_42]
+                                             Group By Operator [GBY_34]
                                                 aggregations:["sum(_col1)","sum(_col2)","sum(_col3)"]
                                                 keys:_col0 (type: string)
                                                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                                                Select Operator [SEL_40]
+                                                Select Operator [SEL_32]
                                                    outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                    Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
-                                                   Merge Join Operator [MERGEJOIN_229]
+                                                   Merge Join Operator [MERGEJOIN_207]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col5","_col6","_col9","_col10","_col14"]
                                                    |  Statistics:Num rows: 186340 Data size: 267636062 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 15 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_38]
+                                                   |  Reduce Output Operator [RS_30]
                                                    |     key expressions:_col0 (type: int)
                                                    |     Map-reduce partition columns:_col0 (type: int)
                                                    |     sort order:+
@@ -467,26 +461,26 @@ Stage-0
                                                    |     Select Operator [SEL_16]
                                                    |        outputColumnNames:["_col0"]
                                                    |        Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator [FIL_212]
+                                                   |        Filter Operator [FIL_188]
                                                    |           predicate:((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE
                                                    |           TableScan [TS_14]
                                                    |              alias:promotion
                                                    |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Reducer 5 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_36]
+                                                      Reduce Output Operator [RS_29]
                                                          key expressions:_col3 (type: int)
                                                          Map-reduce partition columns:_col3 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                                                         Merge Join Operator [MERGEJOIN_228]
+                                                         Merge Join Operator [MERGEJOIN_206]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col3","_col5","_col6","_col9","_col10","_col14"]
                                                          |  Statistics:Num rows: 169400 Data size: 243305506 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 14 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_33]
+                                                         |  Reduce Output Operator [RS_27]
                                                          |     key expressions:_col0 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int)
                                                          |     sort order:+
@@ -494,26 +488,26 @@ Stage-0
                                                          |     Select Operator [SEL_13]
                                                          |        outputColumnNames:["_col0"]
                                                          |        Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_211]
+                                                         |        Filter Operator [FIL_187]
                                                          |           predicate:((i_current_price > 50) and i_item_sk is not null) (type: boolean)
                                                          |           Statistics:Num rows: 154000 Data size: 221186819 Basic stats: COMPLETE Column stats: NONE
                                                          |           TableScan [TS_11]
                                                          |              alias:item
                                                          |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 4 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_31]
+                                                            Reduce Output Operator [RS_26]
                                                                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:_col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: string)
-                                                               Merge Join Operator [MERGEJOIN_227]
+                                                               Merge Join Operator [MERGEJOIN_205]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col3","_col5","_col6","_col9","_col10","_col14"]
                                                                |  Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 13 [SIMPLE_EDGE]
-                                                               |  Reduce Output Operator [RS_28]
+                                                               |  Reduce Output Operator [RS_24]
                                                                |     key expressions:_col0 (type: int)
                                                                |     Map-reduce partition columns:_col0 (type: int)
                                                                |     sort order:+
@@ -522,26 +516,26 @@ Stage-0
                                                                |     Select Operator [SEL_10]
                                                                |        outputColumnNames:["_col0","_col1"]
                                                                |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                               |        Filter Operator [FIL_210]
+                                                               |        Filter Operator [FIL_186]
                                                                |           predicate:s_store_sk is not null (type: boolean)
                                                                |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                                |           TableScan [TS_8]
                                                                |              alias:store
                                                                |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Reducer 3 [SIMPLE_EDGE]
-                                                                  Reduce Output Operator [RS_26]
+                                                                  Reduce Output Operator [RS_23]
                                                                      key expressions:_col2 (type: int)
                                                                      Map-reduce partition columns:_col2 (type: int)
                                                                      sort order:+
                                                                      Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                      value expressions:_col1 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                                                                     Merge Join Operator [MERGEJOIN_226]
+                                                                     Merge Join Operator [MERGEJOIN_204]
                                                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                      |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                                                      |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Map 12 [SIMPLE_EDGE]
-                                                                     |  Reduce Output Operator [RS_23]
+                                                                     |  Reduce Output Operator [RS_21]
                                                                      |     key expressions:_col0 (type: int)
                                                                      |     Map-reduce partition columns:_col0 (type: int)
                                                                      |     sort order:+
@@ -549,20 +543,20 @@ Stage-0
                                                                      |     Select Operator [SEL_7]
                                                                      |        outputColumnNames:["_col0"]
                                                                      |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                                     |        Filter Operator [FIL_209]
+                                                                     |        Filter Operator [FIL_185]
                                                                      |           predicate:(d_date BETWEEN 1998-08-04 AND 1998-09-04 and d_date_sk is not null) (type: boolean)
                                                                      |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                      |           TableScan [TS_5]
                                                                      |              alias:date_dim
                                                                      |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Reducer 2 [SIMPLE_EDGE]
-                                                                        Reduce Output Operator [RS_21]
+                                                                        Reduce Output Operator [RS_20]
                                                                            key expressions:_col0 (type: int)
                                                                            Map-reduce partition columns:_col0 (type: int)
                                                                            sort order:+
                                                                            Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                            value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2))
-                                                                           Merge Join Operator [MERGEJOIN_225]
+                                                                           Merge Join Operator [MERGEJOIN_201]
                                                                            |  condition map:[{"":"Left Outer Join0 to 1"}]
                                                                            |  keys:{"0":"_col1 (type: int), _col4 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                                                                            |  outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
@@ -577,7 +571,7 @@ Stage-0
                                                                            |     Select Operator [SEL_2]
                                                                            |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                                            |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                           |        Filter Operator [FIL_207]
+                                                                           |        Filter Operator [FIL_183]
                                                                            |           predicate:(((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_item_sk is not null) and ss_promo_sk is not null) (type: boolean)
                                                                            |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                            |           TableScan [TS_0]
@@ -593,10 +587,7 @@ Stage-0
                                                                                  Select Operator [SEL_4]
                                                                                     outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                                     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                    Filter Operator [FIL_208]
-                                                                                       predicate:sr_item_sk is not null (type: boolean)
+                                                                                    TableScan [TS_3]
+                                                                                       alias:store_returns
                                                                                        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                       TableScan [TS_3]
-                                                                                          alias:store_returns
-                                                                                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query82.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query82.q.out b/ql/src/test/results/clientpositive/perf/query82.q.out
index 6f142ed..654a772 100644
--- a/ql/src/test/results/clientpositive/perf/query82.q.out
+++ b/ql/src/test/results/clientpositive/perf/query82.q.out
@@ -15,43 +15,43 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_32]
+         File Output Operator [FS_27]
             compressed:false
             Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_31]
+            Limit [LIM_26]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_30]
+               Select Operator [SEL_25]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_29]
+                  Reduce Output Operator [RS_24]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: string), _col2 (type: decimal(7,2))
-                     Group By Operator [GBY_27]
+                     Group By Operator [GBY_22]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: decimal(7,2))
                      |  outputColumnNames:["_col0","_col1","_col2"]
                      |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 3 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_26]
+                        Reduce Output Operator [RS_21]
                            key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: decimal(7,2))
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: decimal(7,2))
                            sort order:+++
                            Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                           Group By Operator [GBY_25]
+                           Group By Operator [GBY_20]
                               keys:_col1 (type: string), _col2 (type: string), _col3 (type: decimal(7,2))
                               outputColumnNames:["_col0","_col1","_col2"]
                               Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_48]
+                              Merge Join Operator [MERGEJOIN_43]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col1","_col2","_col3"]
                               |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 7 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_22]
+                              |  Reduce Output Operator [RS_17]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: int)
                               |     sort order:+
@@ -59,26 +59,26 @@ Stage-0
                               |     Select Operator [SEL_8]
                               |        outputColumnNames:["_col0"]
                               |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                              |        Filter Operator [FIL_45]
+                              |        Filter Operator [FIL_40]
                               |           predicate:(d_date BETWEEN '2002-05-30' AND '2002-07-30' and d_date_sk is not null) (type: boolean)
                               |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                               |           TableScan [TS_6]
                               |              alias:date_dim
                               |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 2 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_20]
+                                 Reduce Output Operator [RS_16]
                                     key expressions:_col5 (type: int)
                                     Map-reduce partition columns:_col5 (type: int)
                                     sort order:+
                                     Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: decimal(7,2))
-                                    Merge Join Operator [MERGEJOIN_47]
+                                    Merge Join Operator [MERGEJOIN_42]
                                     |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                                     |  keys:{"0":"_col0 (type: int)","1":"_col1 (type: int)","2":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col1","_col2","_col3","_col5"]
                                     |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 1 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_13]
+                                    |  Reduce Output Operator [RS_12]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -87,14 +87,14 @@ Stage-0
                                     |     Select Operator [SEL_2]
                                     |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |        Statistics:Num rows: 115500 Data size: 165890114 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_43]
+                                    |        Filter Operator [FIL_38]
                                     |           predicate:(((i_manufact_id) IN (437, 129, 727, 663) and i_current_price BETWEEN 30 AND 60) and i_item_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 115500 Data size: 165890114 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_0]
                                     |              alias:item
                                     |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 6 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_15]
+                                    |  Reduce Output Operator [RS_13]
                                     |     key expressions:_col1 (type: int)
                                     |     Map-reduce partition columns:_col1 (type: int)
                                     |     sort order:+
@@ -103,14 +103,14 @@ Stage-0
                                     |     Select Operator [SEL_5]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |        Filter Operator [FIL_44]
+                                    |        Filter Operator [FIL_39]
                                     |           predicate:((inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null) and inv_date_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           TableScan [TS_3]
                                     |              alias:inventory
                                     |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |<-Map 8 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_17]
+                                       Reduce Output Operator [RS_14]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
@@ -118,7 +118,7 @@ Stage-0
                                           Select Operator [SEL_11]
                                              outputColumnNames:["_col0"]
                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                             Filter Operator [FIL_46]
+                                             Filter Operator [FIL_41]
                                                 predicate:ss_item_sk is not null (type: boolean)
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 TableScan [TS_9]


[24/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query32.q.out b/ql/src/test/results/clientpositive/perf/query32.q.out
index f905498..da2ac8f 100644
--- a/ql/src/test/results/clientpositive/perf/query32.q.out
+++ b/ql/src/test/results/clientpositive/perf/query32.q.out
@@ -50,66 +50,66 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 4
-         File Output Operator [FS_44]
+         File Output Operator [FS_37]
             compressed:false
             Statistics:Num rows: 1 Data size: 112 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_42]
+            Group By Operator [GBY_35]
             |  aggregations:["sum(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 3 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_41]
+               Reduce Output Operator [RS_34]
                   sort order:
                   Statistics:Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: decimal(17,2))
-                  Group By Operator [GBY_40]
+                  Group By Operator [GBY_33]
                      aggregations:["sum(_col1)"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_39]
+                     Select Operator [SEL_32]
                         outputColumnNames:["_col1"]
                         Statistics:Num rows: 169400 Data size: 243305505 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_59]
+                        Filter Operator [FIL_31]
                            predicate:(_col1 > CAST( _col5 AS decimal(20,15))) (type: boolean)
                            Statistics:Num rows: 169400 Data size: 243305505 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_67]
+                           Merge Join Operator [MERGEJOIN_59]
                            |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 1 to 2"}]
                            |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                            |  outputColumnNames:["_col1","_col5"]
                            |  Statistics:Num rows: 508200 Data size: 729916517 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 6 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_34]
+                           |  Reduce Output Operator [RS_28]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_14]
+                           |     Select Operator [SEL_12]
                            |        outputColumnNames:["_col0"]
                            |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_62]
+                           |        Filter Operator [FIL_54]
                            |           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_12]
+                           |           TableScan [TS_10]
                            |              alias:i
                            |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 2 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_32]
+                           |  Reduce Output Operator [RS_27]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col1 (type: decimal(7,2))
-                           |     Select Operator [SEL_11]
+                           |     Select Operator [SEL_9]
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |        Merge Join Operator [MERGEJOIN_65]
+                           |        Merge Join Operator [MERGEJOIN_57]
                            |        |  condition map:[{"":"Inner Join 0 to 1"}]
                            |        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |        |  outputColumnNames:["_col1","_col2"]
                            |        |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Map 1 [SIMPLE_EDGE]
-                           |        |  Reduce Output Operator [RS_7]
+                           |        |  Reduce Output Operator [RS_6]
                            |        |     key expressions:_col0 (type: int)
                            |        |     Map-reduce partition columns:_col0 (type: int)
                            |        |     sort order:+
@@ -118,14 +118,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_60]
+                           |        |        Filter Operator [FIL_52]
                            |        |           predicate:(cs_sold_date_sk is not null and cs_item_sk is not null) (type: boolean)
                            |        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |           TableScan [TS_0]
                            |        |              alias:cs
                            |        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |<-Map 5 [SIMPLE_EDGE]
-                           |           Reduce Output Operator [RS_9]
+                           |           Reduce Output Operator [RS_7]
                            |              key expressions:_col0 (type: int)
                            |              Map-reduce partition columns:_col0 (type: int)
                            |              sort order:+
@@ -133,73 +133,73 @@ Stage-0
                            |              Select Operator [SEL_5]
                            |                 outputColumnNames:["_col0"]
                            |                 Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                 Filter Operator [FIL_61]
+                           |                 Filter Operator [FIL_53]
                            |                    predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null) (type: boolean)
                            |                    Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                    TableScan [TS_3]
                            |                       alias:d
                            |                       Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 9 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_36]
+                              Reduce Output Operator [RS_29]
                                  key expressions:_col0 (type: int)
                                  Map-reduce partition columns:_col0 (type: int)
                                  sort order:+
                                  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col1 (type: double)
-                                 Select Operator [SEL_30]
+                                 Select Operator [SEL_26]
                                     outputColumnNames:["_col0","_col1"]
                                     Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_29]
+                                    Group By Operator [GBY_25]
                                     |  aggregations:["avg(VALUE._col0)"]
                                     |  keys:KEY._col0 (type: int)
                                     |  outputColumnNames:["_col0","_col1"]
                                     |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 8 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_28]
+                                       Reduce Output Operator [RS_24]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col1 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
-                                          Group By Operator [GBY_27]
+                                          Group By Operator [GBY_23]
                                              aggregations:["avg(_col2)"]
                                              keys:_col1 (type: int)
                                              outputColumnNames:["_col0","_col1"]
                                              Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_66]
+                                             Merge Join Operator [MERGEJOIN_58]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col1","_col2"]
                                              |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 10 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_24]
+                                             |  Reduce Output Operator [RS_20]
                                              |     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_20]
+                                             |     Select Operator [SEL_18]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_64]
+                                             |        Filter Operator [FIL_56]
                                              |           predicate:(d_date BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |           TableScan [TS_18]
+                                             |           TableScan [TS_16]
                                              |              alias:d
                                              |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 7 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_22]
+                                                Reduce Output Operator [RS_19]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                                   Select Operator [SEL_17]
+                                                   Select Operator [SEL_15]
                                                       outputColumnNames:["_col0","_col1","_col2"]
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      Filter Operator [FIL_63]
+                                                      Filter Operator [FIL_55]
                                                          predicate:(cs_sold_date_sk is not null and cs_item_sk is not null) (type: boolean)
                                                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                         TableScan [TS_15]
+                                                         TableScan [TS_13]
                                                             alias:cs
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query34.q.out b/ql/src/test/results/clientpositive/perf/query34.q.out
index 193cf4f..1cb7c28 100644
--- a/ql/src/test/results/clientpositive/perf/query34.q.out
+++ b/ql/src/test/results/clientpositive/perf/query34.q.out
@@ -17,80 +17,80 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_45]
+         File Output Operator [FS_37]
             compressed:false
             Statistics:Num rows: 88000001 Data size: 75681779077 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"}
-            Select Operator [SEL_44]
+            Select Operator [SEL_36]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_43]
+               Reduce Output Operator [RS_35]
                   key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
                   sort order:+++-
                   Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col4 (type: int), _col5 (type: bigint)
-                  Select Operator [SEL_42]
+                  Select Operator [SEL_34]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_69]
+                     Merge Join Operator [MERGEJOIN_60]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col0","_col2","_col4","_col5","_col6","_col7"]
                      |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 11 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_40]
+                     |  Reduce Output Operator [RS_32]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                      |     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
-                     |     Select Operator [SEL_36]
+                     |     Select Operator [SEL_30]
                      |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                      |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_65]
+                     |        Filter Operator [FIL_56]
                      |           predicate:c_customer_sk is not null (type: boolean)
                      |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_34]
+                     |           TableScan [TS_28]
                      |              alias:customer
                      |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_38]
+                        Reduce Output Operator [RS_31]
                            key expressions:_col1 (type: int)
                            Map-reduce partition columns:_col1 (type: int)
                            sort order:+
                            Statistics:Num rows: 12153 Data size: 13599611 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col0 (type: int), _col2 (type: bigint)
-                           Select Operator [SEL_31]
-                              outputColumnNames:["_col0","_col1","_col2"]
+                           Filter Operator [FIL_26]
+                              predicate:_col2 BETWEEN 15 AND 20 (type: boolean)
                               Statistics:Num rows: 12153 Data size: 13599611 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_60]
-                                 predicate:_col2 BETWEEN 15 AND 20 (type: boolean)
-                                 Statistics:Num rows: 12153 Data size: 13599611 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_30]
+                              Select Operator [SEL_25]
+                                 outputColumnNames:["_col0","_col1","_col2"]
+                                 Statistics:Num rows: 24306 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
+                                 Group By Operator [GBY_24]
                                  |  aggregations:["count(VALUE._col0)"]
                                  |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                                  |  outputColumnNames:["_col0","_col1","_col2"]
                                  |  Statistics:Num rows: 24306 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_29]
+                                    Reduce Output Operator [RS_23]
                                        key expressions:_col0 (type: int), _col1 (type: int)
                                        Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                        sort order:++
                                        Statistics:Num rows: 48612 Data size: 54398446 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col2 (type: bigint)
-                                       Group By Operator [GBY_28]
+                                       Group By Operator [GBY_22]
                                           aggregations:["count()"]
                                           keys:_col1 (type: int), _col4 (type: int)
                                           outputColumnNames:["_col0","_col1","_col2"]
                                           Statistics:Num rows: 48612 Data size: 54398446 Basic stats: COMPLETE Column stats: NONE
-                                          Merge Join Operator [MERGEJOIN_68]
+                                          Merge Join Operator [MERGEJOIN_59]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col1","_col4"]
                                           |  Statistics:Num rows: 48612 Data size: 54398446 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:+
@@ -98,26 +98,26 @@ Stage-0
                                           |     Select Operator [SEL_11]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 800 Data size: 85600 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_64]
+                                          |        Filter Operator [FIL_55]
                                           |           predicate:((((CASE WHEN ((hd_vehicle_count > 0)) THEN ((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count))) ELSE (null) END > 1.2) and ((hd_buy_potential = '1001-5000') or (hd_buy_potential = '5001-10000'))) and (hd_vehicle_count > 0)) and hd_demo_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 800 Data size: 85600 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: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (type: int), _col4 (type: int)
-                                                Merge Join Operator [MERGEJOIN_67]
+                                                Merge Join Operator [MERGEJOIN_58]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col1","_col2","_col4"]
                                                 |  Statistics:Num rows: 44193 Data size: 49453132 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:+
@@ -125,26 +125,26 @@ Stage-0
                                                 |     Select Operator [SEL_8]
                                                 |        outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_63]
+                                                |        Filter Operator [FIL_54]
                                                 |           predicate:((s_county) IN ('Kittitas County', 'Adams County', 'Richland County', 'Furnas County', 'Orange County', 'Appanoose County', 'Franklin Parish', 'Tehama County') and s_store_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_6]
                                                 |              alias:store
                                                 |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_18]
+                                                   Reduce Output Operator [RS_15]
                                                       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), _col2 (type: int), _col4 (type: int)
-                                                      Merge Join Operator [MERGEJOIN_66]
+                                                      Merge Join Operator [MERGEJOIN_57]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col2","_col3","_col4"]
                                                       |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_13]
+                                                      |  Reduce Output Operator [RS_12]
                                                       |     key expressions:_col0 (type: int)
                                                       |     Map-reduce partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -153,14 +153,14 @@ Stage-0
                                                       |     Select Operator [SEL_2]
                                                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_61]
+                                                      |        Filter Operator [FIL_52]
                                                       |           predicate:(((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_hdemo_sk is not null) and ss_customer_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:+
@@ -168,7 +168,7 @@ Stage-0
                                                             Select Operator [SEL_5]
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                               Filter Operator [FIL_62]
+                                                               Filter Operator [FIL_53]
                                                                   predicate:(((d_year) IN (1998, 1999, 2000) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28)) and d_date_sk is not null) (type: boolean)
                                                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                   TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query39.q.out b/ql/src/test/results/clientpositive/perf/query39.q.out
index 0ad62cc..a18cdaf 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -21,197 +21,197 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_76]
+         File Output Operator [FS_62]
             compressed:false
             Statistics:Num rows: 112735 Data size: 161919824 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"}
-            Select Operator [SEL_75]
+            Select Operator [SEL_61]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
             |  Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_74]
+               Reduce Output Operator [RS_60]
                   key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: double), _col4 (type: double), _col7 (type: int), _col8 (type: double), _col9 (type: double)
                   sort order:++++++++
                   Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col5 (type: int), _col6 (type: int)
-                  Select Operator [SEL_73]
+                  Select Operator [SEL_59]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                      Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_121]
+                     Merge Join Operator [MERGEJOIN_103]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col2 (type: int), _col1 (type: int)"}
                      |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col7","_col8","_col9","_col10","_col11"]
                      |  Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 15 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_71]
+                     |  Reduce Output Operator [RS_57]
                      |     key expressions:_col2 (type: int), _col1 (type: int)
                      |     Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                      |     sort order:++
                      |     Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
                      |     value expressions:_col3 (type: int), _col4 (type: double), _col5 (type: double)
-                     |     Select Operator [SEL_65]
+                     |     Select Operator [SEL_55]
                      |        outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
                      |        Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_108]
+                     |        Filter Operator [FIL_54]
                      |           predicate:(CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
                      |           Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                     |           Select Operator [SEL_113]
-                     |              outputColumnNames:["_col0","_col1","_col3","_col4","_col5"]
+                     |           Select Operator [SEL_53]
+                     |              outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
                      |              Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
-                     |              Group By Operator [GBY_64]
+                     |              Group By Operator [GBY_52]
                      |              |  aggregations:["stddev_samp(VALUE._col0)","avg(VALUE._col1)"]
                      |              |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: int)
                      |              |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |              |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                      |              |<-Reducer 14 [SIMPLE_EDGE]
-                     |                 Reduce Output Operator [RS_63]
+                     |                 Reduce Output Operator [RS_51]
                      |                    key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
                      |                    Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
                      |                    sort order:++++
                      |                    Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                      |                    value expressions:_col4 (type: struct<count:bigint,sum:double,variance:double>), _col5 (type: struct<count:bigint,sum:double,input:int>)
-                     |                    Group By Operator [GBY_62]
+                     |                    Group By Operator [GBY_50]
                      |                       aggregations:["stddev_samp(_col3)","avg(_col3)"]
                      |                       keys:_col4 (type: int), _col5 (type: int), _col6 (type: string), _col9 (type: int)
                      |                       outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |                       Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                     |                       Select Operator [SEL_61]
+                     |                       Select Operator [SEL_49]
                      |                          outputColumnNames:["_col4","_col5","_col6","_col9","_col3"]
                      |                          Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                     |                          Merge Join Operator [MERGEJOIN_120]
+                     |                          Merge Join Operator [MERGEJOIN_102]
                      |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |                          |  outputColumnNames:["_col3","_col4","_col5","_col6"]
                      |                          |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                      |                          |<-Map 18 [SIMPLE_EDGE]
-                     |                          |  Reduce Output Operator [RS_59]
+                     |                          |  Reduce Output Operator [RS_47]
                      |                          |     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_45]
+                     |                          |     Select Operator [SEL_39]
                      |                          |        outputColumnNames:["_col0"]
                      |                          |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                     |                          |        Filter Operator [FIL_112]
+                     |                          |        Filter Operator [FIL_96]
                      |                          |           predicate:(((d_moy = 4) and d_date_sk is not null) and (d_year = 1999)) (type: boolean)
                      |                          |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                     |                          |           TableScan [TS_43]
+                     |                          |           TableScan [TS_37]
                      |                          |              alias:date_dim
                      |                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                      |                          |<-Reducer 13 [SIMPLE_EDGE]
-                     |                             Reduce Output Operator [RS_57]
+                     |                             Reduce Output Operator [RS_46]
                      |                                key expressions:_col0 (type: int)
                      |                                Map-reduce partition columns:_col0 (type: int)
                      |                                sort order:+
                      |                                Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                      |                                value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: string)
-                     |                                Merge Join Operator [MERGEJOIN_119]
+                     |                                Merge Join Operator [MERGEJOIN_101]
                      |                                |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                                |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                      |                                |  outputColumnNames:["_col0","_col3","_col4","_col5","_col6"]
                      |                                |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                      |                                |<-Map 17 [SIMPLE_EDGE]
-                     |                                |  Reduce Output Operator [RS_54]
+                     |                                |  Reduce Output Operator [RS_44]
                      |                                |     key expressions:_col0 (type: int)
                      |                                |     Map-reduce partition columns:_col0 (type: int)
                      |                                |     sort order:+
                      |                                |     Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                      |                                |     value expressions:_col1 (type: string)
-                     |                                |     Select Operator [SEL_42]
+                     |                                |     Select Operator [SEL_36]
                      |                                |        outputColumnNames:["_col0","_col1"]
                      |                                |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                     |                                |        Filter Operator [FIL_111]
+                     |                                |        Filter Operator [FIL_95]
                      |                                |           predicate:w_warehouse_sk is not null (type: boolean)
                      |                                |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                     |                                |           TableScan [TS_40]
+                     |                                |           TableScan [TS_34]
                      |                                |              alias:warehouse
                      |                                |              Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                      |                                |<-Reducer 12 [SIMPLE_EDGE]
-                     |                                   Reduce Output Operator [RS_52]
+                     |                                   Reduce Output Operator [RS_43]
                      |                                      key expressions:_col2 (type: int)
                      |                                      Map-reduce partition columns:_col2 (type: int)
                      |                                      sort order:+
                      |                                      Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                      |                                      value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: int)
-                     |                                      Merge Join Operator [MERGEJOIN_118]
+                     |                                      Merge Join Operator [MERGEJOIN_100]
                      |                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                                      |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                      |                                      |  outputColumnNames:["_col0","_col2","_col3","_col4"]
                      |                                      |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                      |                                      |<-Map 11 [SIMPLE_EDGE]
-                     |                                      |  Reduce Output Operator [RS_47]
+                     |                                      |  Reduce Output Operator [RS_40]
                      |                                      |     key expressions:_col1 (type: int)
                      |                                      |     Map-reduce partition columns:_col1 (type: int)
                      |                                      |     sort order:+
                      |                                      |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                      |                                      |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int)
-                     |                                      |     Select Operator [SEL_36]
+                     |                                      |     Select Operator [SEL_30]
                      |                                      |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                      |                                      |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                     |                                      |        Filter Operator [FIL_109]
+                     |                                      |        Filter Operator [FIL_93]
                      |                                      |           predicate:((inv_item_sk is not null and inv_warehouse_sk is not null) and inv_date_sk is not null) (type: boolean)
                      |                                      |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                     |                                      |           TableScan [TS_34]
+                     |                                      |           TableScan [TS_28]
                      |                                      |              alias:inventory
                      |                                      |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                      |                                      |<-Map 16 [SIMPLE_EDGE]
-                     |                                         Reduce Output Operator [RS_49]
+                     |                                         Reduce Output Operator [RS_41]
                      |                                            key expressions:_col0 (type: int)
                      |                                            Map-reduce partition columns:_col0 (type: int)
                      |                                            sort order:+
                      |                                            Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                     |                                            Select Operator [SEL_39]
+                     |                                            Select Operator [SEL_33]
                      |                                               outputColumnNames:["_col0"]
                      |                                               Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                     |                                               Filter Operator [FIL_110]
+                     |                                               Filter Operator [FIL_94]
                      |                                                  predicate:i_item_sk is not null (type: boolean)
                      |                                                  Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                     |                                                  TableScan [TS_37]
+                     |                                                  TableScan [TS_31]
                      |                                                     alias:item
                      |                                                     Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_69]
+                        Reduce Output Operator [RS_56]
                            key expressions:_col2 (type: int), _col1 (type: int)
                            Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                            sort order:++
                            Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col3 (type: int), _col4 (type: double), _col5 (type: double)
-                           Select Operator [SEL_31]
+                           Select Operator [SEL_27]
                               outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
                               Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_103]
+                              Filter Operator [FIL_26]
                                  predicate:(CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
                                  Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_114]
-                                    outputColumnNames:["_col0","_col1","_col3","_col4","_col5"]
+                                 Select Operator [SEL_25]
+                                    outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
                                     Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_30]
+                                    Group By Operator [GBY_24]
                                     |  aggregations:["stddev_samp(VALUE._col0)","avg(VALUE._col1)"]
                                     |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: int)
                                     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_29]
+                                       Reduce Output Operator [RS_23]
                                           key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
                                           Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
                                           sort order:++++
                                           Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col4 (type: struct<count:bigint,sum:double,variance:double>), _col5 (type: struct<count:bigint,sum:double,input:int>)
-                                          Group By Operator [GBY_28]
+                                          Group By Operator [GBY_22]
                                              aggregations:["stddev_samp(_col3)","avg(_col3)"]
                                              keys:_col4 (type: int), _col5 (type: int), _col6 (type: string), _col9 (type: int)
                                              outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                              Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_27]
+                                             Select Operator [SEL_21]
                                                 outputColumnNames:["_col4","_col5","_col6","_col9","_col3"]
                                                 Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_117]
+                                                Merge Join Operator [MERGEJOIN_99]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col3","_col4","_col5","_col6"]
                                                 |  Statistics:Num rows: 614922 Data size: 883199024 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:+
@@ -219,26 +219,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_107]
+                                                |        Filter Operator [FIL_92]
                                                 |           predicate:(((d_moy = 3) and d_date_sk is not null) and (d_year = 1999)) (type: boolean)
                                                 |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_9]
                                                 |              alias:date_dim
                                                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_23]
+                                                   Reduce Output Operator [RS_18]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: string)
-                                                      Merge Join Operator [MERGEJOIN_116]
+                                                      Merge Join Operator [MERGEJOIN_98]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col3","_col4","_col5","_col6"]
                                                       |  Statistics:Num rows: 559020 Data size: 802908187 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:+
@@ -247,26 +247,26 @@ Stage-0
                                                       |     Select Operator [SEL_8]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_106]
+                                                      |        Filter Operator [FIL_91]
                                                       |           predicate:w_warehouse_sk is not null (type: boolean)
                                                       |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_6]
                                                       |              alias:warehouse
                                                       |              Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 2 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_18]
+                                                         Reduce Output Operator [RS_15]
                                                             key expressions:_col2 (type: int)
                                                             Map-reduce partition columns:_col2 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: int)
-                                                            Merge Join Operator [MERGEJOIN_115]
+                                                            Merge Join Operator [MERGEJOIN_97]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col0","_col2","_col3","_col4"]
                                                             |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 1 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_13]
+                                                            |  Reduce Output Operator [RS_12]
                                                             |     key expressions:_col1 (type: int)
                                                             |     Map-reduce partition columns:_col1 (type: int)
                                                             |     sort order:+
@@ -275,14 +275,14 @@ Stage-0
                                                             |     Select Operator [SEL_2]
                                                             |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                             |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            |        Filter Operator [FIL_104]
+                                                            |        Filter Operator [FIL_89]
                                                             |           predicate:((inv_item_sk is not null and inv_warehouse_sk is not null) and inv_date_sk is not null) (type: boolean)
                                                             |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                             |           TableScan [TS_0]
                                                             |              alias:inventory
                                                             |              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:+
@@ -290,7 +290,7 @@ Stage-0
                                                                   Select Operator [SEL_5]
                                                                      outputColumnNames:["_col0"]
                                                                      Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                                     Filter Operator [FIL_105]
+                                                                     Filter Operator [FIL_90]
                                                                         predicate:i_item_sk is not null (type: boolean)
                                                                         Statistics:Num rows: 462000 Data size: 663560457 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/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query40.q.out b/ql/src/test/results/clientpositive/perf/query40.q.out
index 08c3e49..b2d6262 100644
--- a/ql/src/test/results/clientpositive/perf/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/query40.q.out
@@ -17,49 +17,49 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_41]
+         File Output Operator [FS_35]
             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_40]
+            Limit [LIM_34]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_39]
+               Select Operator [SEL_33]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_38]
+                  Reduce Output Operator [RS_32]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(23,2)), _col3 (type: decimal(23,2))
-                     Group By Operator [GBY_36]
+                     Group By Operator [GBY_30]
                      |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                      |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_35]
+                        Reduce Output Operator [RS_29]
                            key expressions:_col0 (type: string), _col1 (type: string)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            sort order:++
                            Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col2 (type: decimal(23,2)), _col3 (type: decimal(23,2))
-                           Group By Operator [GBY_34]
+                           Group By Operator [GBY_28]
                               aggregations:["sum(_col2)","sum(_col3)"]
                               keys:_col0 (type: string), _col1 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3"]
                               Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_32]
+                              Select Operator [SEL_26]
                                  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_63]
+                                 Merge Join Operator [MERGEJOIN_57]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col4","_col7","_col9","_col11","_col14"]
                                  |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_30]
+                                 |  Reduce Output Operator [RS_24]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -68,26 +68,26 @@ Stage-0
                                  |     Select Operator [SEL_13]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_59]
+                                 |        Filter Operator [FIL_53]
                                  |           predicate:(d_date BETWEEN '1998-03-09' AND '1998-05-08' and d_date_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_11]
                                  |              alias:date_dim
                                  |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_28]
+                                    Reduce Output Operator [RS_23]
                                        key expressions:_col0 (type: int)
                                        Map-reduce partition columns:_col0 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col4 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col9 (type: string), _col11 (type: string)
-                                       Merge Join Operator [MERGEJOIN_62]
+                                       Merge Join Operator [MERGEJOIN_56]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col0","_col4","_col7","_col9","_col11"]
                                        |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_25]
+                                       |  Reduce Output Operator [RS_21]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -96,26 +96,26 @@ Stage-0
                                        |     Select Operator [SEL_10]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_58]
+                                       |        Filter Operator [FIL_52]
                                        |           predicate:(i_current_price BETWEEN 0.99 AND 1.49 and i_item_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_8]
                                        |              alias:item
                                        |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 3 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_23]
+                                          Reduce Output Operator [RS_20]
                                              key expressions:_col2 (type: int)
                                              Map-reduce partition columns:_col2 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col0 (type: int), _col4 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col9 (type: string)
-                                             Merge Join Operator [MERGEJOIN_61]
+                                             Merge Join Operator [MERGEJOIN_55]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col0","_col2","_col4","_col7","_col9"]
                                              |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 9 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_20]
+                                             |  Reduce Output Operator [RS_18]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -124,20 +124,20 @@ Stage-0
                                              |     Select Operator [SEL_7]
                                              |        outputColumnNames:["_col0","_col1"]
                                              |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_57]
+                                             |        Filter Operator [FIL_51]
                                              |           predicate:w_warehouse_sk is not null (type: boolean)
                                              |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_5]
                                              |              alias:warehouse
                                              |              Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_18]
+                                                Reduce Output Operator [RS_17]
                                                    key expressions:_col1 (type: int)
                                                    Map-reduce partition columns:_col1 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    value expressions:_col0 (type: int), _col2 (type: int), _col4 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                   Merge Join Operator [MERGEJOIN_60]
+                                                   Merge Join Operator [MERGEJOIN_54]
                                                    |  condition map:[{"":"Left Outer Join0 to 1"}]
                                                    |  keys:{"0":"_col3 (type: int), _col2 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col1","_col2","_col4","_col7"]
@@ -152,7 +152,7 @@ Stage-0
                                                    |     Select Operator [SEL_2]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_55]
+                                                   |        Filter Operator [FIL_49]
                                                    |           predicate:((cs_warehouse_sk is not null and cs_item_sk is not null) and cs_sold_date_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |           TableScan [TS_0]
@@ -168,10 +168,7 @@ Stage-0
                                                          Select Operator [SEL_4]
                                                             outputColumnNames:["_col0","_col1","_col2"]
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            Filter Operator [FIL_56]
-                                                               predicate:cr_item_sk is not null (type: boolean)
+                                                            TableScan [TS_3]
+                                                               alias:catalog_returns
                                                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               TableScan [TS_3]
-                                                                  alias:catalog_returns
-                                                                  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query42.q.out b/ql/src/test/results/clientpositive/perf/query42.q.out
index a3264c7..3954829 100644
--- a/ql/src/test/results/clientpositive/perf/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/query42.q.out
@@ -15,48 +15,48 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_27]
+         File Output Operator [FS_23]
             compressed:false
             Statistics:Num rows: 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_26]
+            Limit [LIM_22]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_25]
+               Select Operator [SEL_21]
                |  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_24]
+                  Reduce Output Operator [RS_20]
                      key expressions:_col3 (type: decimal(17,2)), _col0 (type: int), _col1 (type: int), _col2 (type: string)
                      sort order:-+++
                      Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_22]
+                     Group By Operator [GBY_18]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int), 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_37]
+                                 Merge Join Operator [MERGEJOIN_33]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_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:+
@@ -65,26 +65,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_35]
+                                 |        Filter Operator [FIL_31]
                                  |           predicate:((i_manager_id = 1) 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: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col5 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_36]
+                                       Merge Join Operator [MERGEJOIN_32]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col4","_col5"]
                                        |  Statistics:Num rows: 20088 Data size: 22478696 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:+
@@ -92,14 +92,14 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_33]
+                                       |        Filter Operator [FIL_29]
                                        |           predicate:(((d_year = 1998) and (d_moy = 12)) and d_date_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 18262 Data size: 20435178 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:+
@@ -108,7 +108,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_34]
+                                                Filter Operator [FIL_30]
                                                    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]


[21/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query58.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query58.q.out b/ql/src/test/results/clientpositive/perf/query58.q.out
index 5379e87..c2f7189 100644
--- a/ql/src/test/results/clientpositive/perf/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/query58.q.out
@@ -119,385 +119,385 @@ Stage-0
       limit:100
       Stage-1
          Reducer 8
-         File Output Operator [FS_140]
+         File Output Operator [FS_112]
             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_139]
+            Limit [LIM_111]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_138]
+               Select Operator [SEL_110]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                |  Statistics:Num rows: 21137 Data size: 30358620 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 7 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_137]
+                  Reduce Output Operator [RS_109]
                      key expressions:_col0 (type: string), _col1 (type: decimal(17,2))
                      sort order:++
                      Statistics:Num rows: 21137 Data size: 30358620 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(38,21)), _col3 (type: decimal(17,2)), _col4 (type: decimal(38,21)), _col5 (type: decimal(17,2)), _col6 (type: decimal(38,21)), _col7 (type: decimal(23,6))
-                     Select Operator [SEL_136]
+                     Select Operator [SEL_108]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                         Statistics:Num rows: 21137 Data size: 30358620 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_202]
-                           predicate:(((_col1 BETWEEN (0.9 * UDFToDouble(_col5)) AND (1.1 * UDFToDouble(_col5)) and _col3 BETWEEN (0.9 * UDFToDouble(_col5)) AND (1.1 * UDFToDouble(_col5))) and _col5 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1))) and _col5 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3))) (type: boolean)
+                        Filter Operator [FIL_107]
+                           predicate:(_col1 BETWEEN (0.9 * UDFToDouble(_col5)) AND (1.1 * UDFToDouble(_col5)) and _col3 BETWEEN (0.9 * UDFToDouble(_col5)) AND (1.1 * UDFToDouble(_col5)) and _col5 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1)) and _col5 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3))) (type: boolean)
                            Statistics:Num rows: 21137 Data size: 30358620 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_232]
+                           Merge Join Operator [MERGEJOIN_202]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                            |  outputColumnNames:["_col0","_col1","_col3","_col5"]
                            |  Statistics:Num rows: 338207 Data size: 485759473 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 28 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_133]
+                           |  Reduce Output Operator [RS_105]
                            |     key expressions:_col0 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string)
                            |     sort order:+
                            |     Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col1 (type: decimal(17,2))
-                           |     Group By Operator [GBY_128]
+                           |     Group By Operator [GBY_102]
                            |     |  aggregations:["sum(VALUE._col0)"]
                            |     |  keys:KEY._col0 (type: string)
                            |     |  outputColumnNames:["_col0","_col1"]
                            |     |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                            |     |<-Reducer 27 [SIMPLE_EDGE]
-                           |        Reduce Output Operator [RS_127]
+                           |        Reduce Output Operator [RS_101]
                            |           key expressions:_col0 (type: string)
                            |           Map-reduce partition columns:_col0 (type: string)
                            |           sort order:+
                            |           Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                            |           value expressions:_col1 (type: decimal(17,2))
-                           |           Group By Operator [GBY_126]
+                           |           Group By Operator [GBY_100]
                            |              aggregations:["sum(_col2)"]
                            |              keys:_col4 (type: string)
                            |              outputColumnNames:["_col0","_col1"]
                            |              Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                           |              Select Operator [SEL_125]
+                           |              Select Operator [SEL_99]
                            |                 outputColumnNames:["_col4","_col2"]
                            |                 Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_230]
+                           |                 Merge Join Operator [MERGEJOIN_200]
                            |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |  keys:{"0":"_col6 (type: string)","1":"_col0 (type: string)"}
                            |                 |  outputColumnNames:["_col2","_col4"]
                            |                 |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Reducer 26 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_121]
+                           |                 |  Reduce Output Operator [RS_96]
                            |                 |     key expressions:_col6 (type: string)
                            |                 |     Map-reduce partition columns:_col6 (type: string)
                            |                 |     sort order:+
                            |                 |     Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                            |                 |     value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                           |                 |     Merge Join Operator [MERGEJOIN_226]
+                           |                 |     Merge Join Operator [MERGEJOIN_196]
                            |                 |     |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                 |     |  outputColumnNames:["_col2","_col4","_col6"]
                            |                 |     |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                            |                 |     |<-Map 30 [SIMPLE_EDGE]
-                           |                 |     |  Reduce Output Operator [RS_118]
+                           |                 |     |  Reduce Output Operator [RS_94]
                            |                 |     |     key expressions:_col0 (type: int)
                            |                 |     |     Map-reduce partition columns:_col0 (type: int)
                            |                 |     |     sort order:+
                            |                 |     |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                 |     |     value expressions:_col1 (type: string)
-                           |                 |     |     Select Operator [SEL_97]
+                           |                 |     |     Select Operator [SEL_79]
                            |                 |     |        outputColumnNames:["_col0","_col1"]
                            |                 |     |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                           |                 |     |        Filter Operator [FIL_216]
+                           |                 |     |        Filter Operator [FIL_186]
                            |                 |     |           predicate:(d_date_sk is not null and d_date is not null) (type: boolean)
                            |                 |     |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                           |                 |     |           TableScan [TS_95]
+                           |                 |     |           TableScan [TS_77]
                            |                 |     |              alias:date_dim
                            |                 |     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                 |     |<-Reducer 25 [SIMPLE_EDGE]
-                           |                 |        Reduce Output Operator [RS_116]
+                           |                 |        Reduce Output Operator [RS_93]
                            |                 |           key expressions:_col0 (type: int)
                            |                 |           Map-reduce partition columns:_col0 (type: int)
                            |                 |           sort order:+
                            |                 |           Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                            |                 |           value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                           |                 |           Merge Join Operator [MERGEJOIN_225]
+                           |                 |           Merge Join Operator [MERGEJOIN_195]
                            |                 |           |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |                 |           |  outputColumnNames:["_col0","_col2","_col4"]
                            |                 |           |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                            |                 |           |<-Map 24 [SIMPLE_EDGE]
-                           |                 |           |  Reduce Output Operator [RS_111]
+                           |                 |           |  Reduce Output Operator [RS_90]
                            |                 |           |     key expressions:_col1 (type: int)
                            |                 |           |     Map-reduce partition columns:_col1 (type: int)
                            |                 |           |     sort order:+
                            |                 |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |           |     value expressions:_col0 (type: int), _col2 (type: decimal(7,2))
-                           |                 |           |     Select Operator [SEL_91]
+                           |                 |           |     Select Operator [SEL_73]
                            |                 |           |        outputColumnNames:["_col0","_col1","_col2"]
                            |                 |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                 |           |        Filter Operator [FIL_214]
+                           |                 |           |        Filter Operator [FIL_184]
                            |                 |           |           predicate:(ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean)
                            |                 |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                 |           |           TableScan [TS_89]
+                           |                 |           |           TableScan [TS_71]
                            |                 |           |              alias:web_sales
                            |                 |           |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |           |<-Map 29 [SIMPLE_EDGE]
-                           |                 |              Reduce Output Operator [RS_113]
+                           |                 |              Reduce Output Operator [RS_91]
                            |                 |                 key expressions:_col0 (type: int)
                            |                 |                 Map-reduce partition columns:_col0 (type: int)
                            |                 |                 sort order:+
                            |                 |                 Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |                 |                 value expressions:_col1 (type: string)
-                           |                 |                 Select Operator [SEL_94]
+                           |                 |                 Select Operator [SEL_76]
                            |                 |                    outputColumnNames:["_col0","_col1"]
                            |                 |                    Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                           |                 |                    Filter Operator [FIL_215]
+                           |                 |                    Filter Operator [FIL_185]
                            |                 |                       predicate:(i_item_sk is not null and i_item_id is not null) (type: boolean)
                            |                 |                       Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                           |                 |                       TableScan [TS_92]
+                           |                 |                       TableScan [TS_74]
                            |                 |                          alias:item
                            |                 |                          Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Reducer 32 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_123]
+                           |                    Reduce Output Operator [RS_97]
                            |                       key expressions:_col0 (type: string)
                            |                       Map-reduce partition columns:_col0 (type: string)
                            |                       sort order:+
                            |                       Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
-                           |                       Merge Join Operator [MERGEJOIN_227]
+                           |                       Merge Join Operator [MERGEJOIN_197]
                            |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                       |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                            |                       |  outputColumnNames:["_col0"]
                            |                       |  Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Map 31 [SIMPLE_EDGE]
-                           |                       |  Reduce Output Operator [RS_105]
+                           |                       |  Reduce Output Operator [RS_86]
                            |                       |     key expressions:_col1 (type: int)
                            |                       |     Map-reduce partition columns:_col1 (type: int)
                            |                       |     sort order:+
                            |                       |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                       |     value expressions:_col0 (type: string)
-                           |                       |     Select Operator [SEL_100]
+                           |                       |     Select Operator [SEL_82]
                            |                       |        outputColumnNames:["_col0","_col1"]
                            |                       |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                           |                       |        Filter Operator [FIL_217]
+                           |                       |        Filter Operator [FIL_187]
                            |                       |           predicate:(d_week_seq is not null and d_date is not null) (type: boolean)
                            |                       |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                           |                       |           TableScan [TS_98]
+                           |                       |           TableScan [TS_80]
                            |                       |              alias:date_dim
                            |                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Map 33 [SIMPLE_EDGE]
-                           |                          Reduce Output Operator [RS_107]
+                           |                          Reduce Output Operator [RS_87]
                            |                             key expressions:_col1 (type: int)
                            |                             Map-reduce partition columns:_col1 (type: int)
                            |                             sort order:+
                            |                             Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                             Select Operator [SEL_103]
+                           |                             Select Operator [SEL_85]
                            |                                outputColumnNames:["_col1"]
                            |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                Filter Operator [FIL_218]
+                           |                                Filter Operator [FIL_188]
                            |                                   predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
                            |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                   TableScan [TS_101]
+                           |                                   TableScan [TS_83]
                            |                                      alias:date_dim
                            |                                      Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 6 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_131]
+                              Reduce Output Operator [RS_104]
                                  key expressions:_col0 (type: string)
                                  Map-reduce partition columns:_col0 (type: string)
                                  sort order:+
                                  Statistics:Num rows: 84551 Data size: 121438791 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col1 (type: decimal(17,2)), _col3 (type: decimal(17,2))
-                                 Filter Operator [FIL_203]
-                                    predicate:(_col1 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3)) and _col3 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1))) (type: boolean)
+                                 Filter Operator [FIL_69]
+                                    predicate:(_col3 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1)) and _col1 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3))) (type: boolean)
                                     Statistics:Num rows: 84551 Data size: 121438791 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_231]
+                                    Merge Join Operator [MERGEJOIN_201]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                     |  outputColumnNames:["_col0","_col1","_col3"]
                                     |  Statistics:Num rows: 338207 Data size: 485759473 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 18 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_85]
+                                    |  Reduce Output Operator [RS_67]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col1 (type: decimal(17,2))
-                                    |     Group By Operator [GBY_80]
+                                    |     Group By Operator [GBY_64]
                                     |     |  aggregations:["sum(VALUE._col0)"]
                                     |     |  keys:KEY._col0 (type: string)
                                     |     |  outputColumnNames:["_col0","_col1"]
                                     |     |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                     |     |<-Reducer 17 [SIMPLE_EDGE]
-                                    |        Reduce Output Operator [RS_79]
+                                    |        Reduce Output Operator [RS_63]
                                     |           key expressions:_col0 (type: string)
                                     |           Map-reduce partition columns:_col0 (type: string)
                                     |           sort order:+
                                     |           Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                     |           value expressions:_col1 (type: decimal(17,2))
-                                    |           Group By Operator [GBY_78]
+                                    |           Group By Operator [GBY_62]
                                     |              aggregations:["sum(_col2)"]
                                     |              keys:_col4 (type: string)
                                     |              outputColumnNames:["_col0","_col1"]
                                     |              Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                    |              Select Operator [SEL_77]
+                                    |              Select Operator [SEL_61]
                                     |                 outputColumnNames:["_col4","_col2"]
                                     |                 Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Merge Join Operator [MERGEJOIN_229]
+                                    |                 Merge Join Operator [MERGEJOIN_199]
                                     |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                 |  keys:{"0":"_col6 (type: string)","1":"_col0 (type: string)"}
                                     |                 |  outputColumnNames:["_col2","_col4"]
                                     |                 |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Reducer 16 [SIMPLE_EDGE]
-                                    |                 |  Reduce Output Operator [RS_73]
+                                    |                 |  Reduce Output Operator [RS_58]
                                     |                 |     key expressions:_col6 (type: string)
                                     |                 |     Map-reduce partition columns:_col6 (type: string)
                                     |                 |     sort order:+
                                     |                 |     Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                     |                 |     value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                                    |                 |     Merge Join Operator [MERGEJOIN_223]
+                                    |                 |     Merge Join Operator [MERGEJOIN_193]
                                     |                 |     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                 |     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                 |     |  outputColumnNames:["_col2","_col4","_col6"]
                                     |                 |     |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                     |                 |     |<-Map 20 [SIMPLE_EDGE]
-                                    |                 |     |  Reduce Output Operator [RS_70]
+                                    |                 |     |  Reduce Output Operator [RS_56]
                                     |                 |     |     key expressions:_col0 (type: int)
                                     |                 |     |     Map-reduce partition columns:_col0 (type: int)
                                     |                 |     |     sort order:+
                                     |                 |     |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                 |     |     value expressions:_col1 (type: string)
-                                    |                 |     |     Select Operator [SEL_49]
+                                    |                 |     |     Select Operator [SEL_41]
                                     |                 |     |        outputColumnNames:["_col0","_col1"]
                                     |                 |     |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |     |        Filter Operator [FIL_211]
+                                    |                 |     |        Filter Operator [FIL_181]
                                     |                 |     |           predicate:(d_date_sk is not null and d_date is not null) (type: boolean)
                                     |                 |     |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |     |           TableScan [TS_47]
+                                    |                 |     |           TableScan [TS_39]
                                     |                 |     |              alias:date_dim
                                     |                 |     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                 |     |<-Reducer 15 [SIMPLE_EDGE]
-                                    |                 |        Reduce Output Operator [RS_68]
+                                    |                 |        Reduce Output Operator [RS_55]
                                     |                 |           key expressions:_col0 (type: int)
                                     |                 |           Map-reduce partition columns:_col0 (type: int)
                                     |                 |           sort order:+
                                     |                 |           Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                     |                 |           value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                                    |                 |           Merge Join Operator [MERGEJOIN_222]
+                                    |                 |           Merge Join Operator [MERGEJOIN_192]
                                     |                 |           |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                 |           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                 |           |  outputColumnNames:["_col0","_col2","_col4"]
                                     |                 |           |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                     |                 |           |<-Map 14 [SIMPLE_EDGE]
-                                    |                 |           |  Reduce Output Operator [RS_63]
+                                    |                 |           |  Reduce Output Operator [RS_52]
                                     |                 |           |     key expressions:_col1 (type: int)
                                     |                 |           |     Map-reduce partition columns:_col1 (type: int)
                                     |                 |           |     sort order:+
                                     |                 |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                 |           |     value expressions:_col0 (type: int), _col2 (type: decimal(7,2))
-                                    |                 |           |     Select Operator [SEL_43]
+                                    |                 |           |     Select Operator [SEL_35]
                                     |                 |           |        outputColumnNames:["_col0","_col1","_col2"]
                                     |                 |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                 |           |        Filter Operator [FIL_209]
+                                    |                 |           |        Filter Operator [FIL_179]
                                     |                 |           |           predicate:(cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean)
                                     |                 |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                 |           |           TableScan [TS_41]
+                                    |                 |           |           TableScan [TS_33]
                                     |                 |           |              alias:catalog_sales
                                     |                 |           |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                 |           |<-Map 19 [SIMPLE_EDGE]
-                                    |                 |              Reduce Output Operator [RS_65]
+                                    |                 |              Reduce Output Operator [RS_53]
                                     |                 |                 key expressions:_col0 (type: int)
                                     |                 |                 Map-reduce partition columns:_col0 (type: int)
                                     |                 |                 sort order:+
                                     |                 |                 Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |                 |                 value expressions:_col1 (type: string)
-                                    |                 |                 Select Operator [SEL_46]
+                                    |                 |                 Select Operator [SEL_38]
                                     |                 |                    outputColumnNames:["_col0","_col1"]
                                     |                 |                    Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |                    Filter Operator [FIL_210]
+                                    |                 |                    Filter Operator [FIL_180]
                                     |                 |                       predicate:(i_item_sk is not null and i_item_id is not null) (type: boolean)
                                     |                 |                       Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |                       TableScan [TS_44]
+                                    |                 |                       TableScan [TS_36]
                                     |                 |                          alias:item
                                     |                 |                          Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Reducer 22 [SIMPLE_EDGE]
-                                    |                    Reduce Output Operator [RS_75]
+                                    |                    Reduce Output Operator [RS_59]
                                     |                       key expressions:_col0 (type: string)
                                     |                       Map-reduce partition columns:_col0 (type: string)
                                     |                       sort order:+
                                     |                       Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
-                                    |                       Merge Join Operator [MERGEJOIN_224]
+                                    |                       Merge Join Operator [MERGEJOIN_194]
                                     |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                       |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                     |                       |  outputColumnNames:["_col0"]
                                     |                       |  Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 21 [SIMPLE_EDGE]
-                                    |                       |  Reduce Output Operator [RS_57]
+                                    |                       |  Reduce Output Operator [RS_48]
                                     |                       |     key expressions:_col1 (type: int)
                                     |                       |     Map-reduce partition columns:_col1 (type: int)
                                     |                       |     sort order:+
                                     |                       |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                       |     value expressions:_col0 (type: string)
-                                    |                       |     Select Operator [SEL_52]
+                                    |                       |     Select Operator [SEL_44]
                                     |                       |        outputColumnNames:["_col0","_col1"]
                                     |                       |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                    |                       |        Filter Operator [FIL_212]
+                                    |                       |        Filter Operator [FIL_182]
                                     |                       |           predicate:(d_week_seq is not null and d_date is not null) (type: boolean)
                                     |                       |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                    |                       |           TableScan [TS_50]
+                                    |                       |           TableScan [TS_42]
                                     |                       |              alias:date_dim
                                     |                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 23 [SIMPLE_EDGE]
-                                    |                          Reduce Output Operator [RS_59]
+                                    |                          Reduce Output Operator [RS_49]
                                     |                             key expressions:_col1 (type: int)
                                     |                             Map-reduce partition columns:_col1 (type: int)
                                     |                             sort order:+
                                     |                             Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                             Select Operator [SEL_55]
+                                    |                             Select Operator [SEL_47]
                                     |                                outputColumnNames:["_col1"]
                                     |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                                Filter Operator [FIL_213]
+                                    |                                Filter Operator [FIL_183]
                                     |                                   predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
                                     |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   TableScan [TS_53]
+                                    |                                   TableScan [TS_45]
                                     |                                      alias:date_dim
                                     |                                      Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 5 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_83]
+                                       Reduce Output Operator [RS_66]
                                           key expressions:_col0 (type: string)
                                           Map-reduce partition columns:_col0 (type: string)
                                           sort order:+
                                           Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col1 (type: decimal(17,2))
-                                          Group By Operator [GBY_39]
+                                          Group By Operator [GBY_31]
                                           |  aggregations:["sum(VALUE._col0)"]
                                           |  keys:KEY._col0 (type: string)
                                           |  outputColumnNames:["_col0","_col1"]
                                           |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 4 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_38]
+                                             Reduce Output Operator [RS_30]
                                                 key expressions:_col0 (type: string)
                                                 Map-reduce partition columns:_col0 (type: string)
                                                 sort order:+
                                                 Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (type: decimal(17,2))
-                                                Group By Operator [GBY_37]
+                                                Group By Operator [GBY_29]
                                                    aggregations:["sum(_col2)"]
                                                    keys:_col4 (type: string)
                                                    outputColumnNames:["_col0","_col1"]
                                                    Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                                   Select Operator [SEL_36]
+                                                   Select Operator [SEL_28]
                                                       outputColumnNames:["_col4","_col2"]
                                                       Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_228]
+                                                      Merge Join Operator [MERGEJOIN_198]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col6 (type: string)","1":"_col0 (type: string)"}
                                                       |  outputColumnNames:["_col2","_col4"]
                                                       |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 12 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_34]
+                                                      |  Reduce Output Operator [RS_26]
                                                       |     key expressions:_col0 (type: string)
                                                       |     Map-reduce partition columns:_col0 (type: string)
                                                       |     sort order:+
                                                       |     Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
-                                                      |     Merge Join Operator [MERGEJOIN_221]
+                                                      |     Merge Join Operator [MERGEJOIN_191]
                                                       |     |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |     |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                                       |     |  outputColumnNames:["_col0"]
                                                       |     |  Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
                                                       |     |<-Map 11 [SIMPLE_EDGE]
-                                                      |     |  Reduce Output Operator [RS_16]
+                                                      |     |  Reduce Output Operator [RS_15]
                                                       |     |     key expressions:_col1 (type: int)
                                                       |     |     Map-reduce partition columns:_col1 (type: int)
                                                       |     |     sort order:+
@@ -506,14 +506,14 @@ Stage-0
                                                       |     |     Select Operator [SEL_11]
                                                       |     |        outputColumnNames:["_col0","_col1"]
                                                       |     |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                      |     |        Filter Operator [FIL_207]
+                                                      |     |        Filter Operator [FIL_177]
                                                       |     |           predicate:(d_week_seq is not null and d_date is not null) (type: boolean)
                                                       |     |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                       |     |           TableScan [TS_9]
                                                       |     |              alias:date_dim
                                                       |     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                       |     |<-Map 13 [SIMPLE_EDGE]
-                                                      |        Reduce Output Operator [RS_18]
+                                                      |        Reduce Output Operator [RS_16]
                                                       |           key expressions:_col1 (type: int)
                                                       |           Map-reduce partition columns:_col1 (type: int)
                                                       |           sort order:+
@@ -521,26 +521,26 @@ Stage-0
                                                       |           Select Operator [SEL_14]
                                                       |              outputColumnNames:["_col1"]
                                                       |              Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                      |              Filter Operator [FIL_208]
+                                                      |              Filter Operator [FIL_178]
                                                       |                 predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
                                                       |                 Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                       |                 TableScan [TS_12]
                                                       |                    alias:date_dim
                                                       |                    Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 3 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_32]
+                                                         Reduce Output Operator [RS_25]
                                                             key expressions:_col6 (type: string)
                                                             Map-reduce partition columns:_col6 (type: string)
                                                             sort order:+
                                                             Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                                                            Merge Join Operator [MERGEJOIN_220]
+                                                            Merge Join Operator [MERGEJOIN_190]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col2","_col4","_col6"]
                                                             |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 10 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_29]
+                                                            |  Reduce Output Operator [RS_23]
                                                             |     key expressions:_col0 (type: int)
                                                             |     Map-reduce partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -549,26 +549,26 @@ Stage-0
                                                             |     Select Operator [SEL_8]
                                                             |        outputColumnNames:["_col0","_col1"]
                                                             |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                            |        Filter Operator [FIL_206]
+                                                            |        Filter Operator [FIL_176]
                                                             |           predicate:(d_date_sk is not null and d_date is not null) (type: boolean)
                                                             |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                             |           TableScan [TS_6]
                                                             |              alias:date_dim
                                                             |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Reducer 2 [SIMPLE_EDGE]
-                                                               Reduce Output Operator [RS_27]
+                                                               Reduce Output Operator [RS_22]
                                                                   key expressions:_col0 (type: int)
                                                                   Map-reduce partition columns:_col0 (type: int)
                                                                   sort order:+
                                                                   Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                                   value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                                                                  Merge Join Operator [MERGEJOIN_219]
+                                                                  Merge Join Operator [MERGEJOIN_189]
                                                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                   |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                                   |  outputColumnNames:["_col0","_col2","_col4"]
                                                                   |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Map 1 [SIMPLE_EDGE]
-                                                                  |  Reduce Output Operator [RS_22]
+                                                                  |  Reduce Output Operator [RS_19]
                                                                   |     key expressions:_col1 (type: int)
                                                                   |     Map-reduce partition columns:_col1 (type: int)
                                                                   |     sort order:+
@@ -577,14 +577,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_204]
+                                                                  |        Filter Operator [FIL_174]
                                                                   |           predicate:(ss_item_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 9 [SIMPLE_EDGE]
-                                                                     Reduce Output Operator [RS_24]
+                                                                     Reduce Output Operator [RS_20]
                                                                         key expressions:_col0 (type: int)
                                                                         Map-reduce partition columns:_col0 (type: int)
                                                                         sort order:+
@@ -593,7 +593,7 @@ Stage-0
                                                                         Select Operator [SEL_5]
                                                                            outputColumnNames:["_col0","_col1"]
                                                                            Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                                           Filter Operator [FIL_205]
+                                                                           Filter Operator [FIL_175]
                                                                               predicate:(i_item_sk is not null and i_item_id is not null) (type: boolean)
                                                                               Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                                               TableScan [TS_3]


[30/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
index 56c5176..f701122 100644
--- a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
@@ -398,7 +398,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
@@ -867,7 +867,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(_col3) > 15.0)) and (UDFToDouble(_col3) < 25.0)) (type: boolean)
+            predicate: ((UDFToDouble(_col0) > 10.0) and (UDFToDouble(_col0) < 20.0) and (UDFToDouble(_col3) > 15.0) and (UDFToDouble(_col3) < 25.0)) (type: boolean)
             Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string), _col4 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
index 3db64e6..66acb74 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
@@ -74,16 +74,19 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
-          Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
-            outputColumnNames: _col0, _col1, _col2
+          Filter Operator
+            predicate: _col0 is not null (type: boolean)
             Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+            Select Operator
+              expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-2
     Map Reduce
@@ -148,16 +151,19 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
-          Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
-            outputColumnNames: _col0, _col1, _col2
+          Filter Operator
+            predicate: _col0 is not null (type: boolean)
             Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+            Select Operator
+              expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -274,16 +280,19 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
-          Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
-            outputColumnNames: _col0, _col1, _col2
+          Filter Operator
+            predicate: _col0 is not null (type: boolean)
             Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+            Select Operator
+              expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-3
     Map Reduce
@@ -372,16 +381,19 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
-          Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
-            outputColumnNames: _col0, _col1, _col2
+          Filter Operator
+            predicate: _col0 is not null (type: boolean)
             Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+            Select Operator
+              expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_position.q.out b/ql/src/test/results/clientpositive/groupby_position.q.out
index ade6cb5..c2566f2 100644
--- a/ql/src/test/results/clientpositive/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/groupby_position.q.out
@@ -561,7 +561,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              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
               Group By Operator
                 keys: key (type: string), value (type: string)
@@ -647,7 +647,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              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: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/having2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/having2.q.out b/ql/src/test/results/clientpositive/having2.q.out
index 65d97d0..eaacc71 100644
--- a/ql/src/test/results/clientpositive/having2.q.out
+++ b/ql/src/test/results/clientpositive/having2.q.out
@@ -345,7 +345,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: (((_col1 <= 4074689.000000041) and (_col2 <= 822.0)) and (_col3 > 4)) (type: boolean)
+            predicate: ((_col1 <= 4074689.000000041) and (_col2 <= 822.0) and (_col3 > 4)) (type: boolean)
             Statistics: Num rows: 10 Data size: 106 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
@@ -467,20 +467,24 @@ STAGE PLANS:
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (((_col1 <= 4074689.000000041) and (_col2 <= 822.0)) and (_col3 > 4)) (type: boolean)
-            Statistics: Num rows: 10 Data size: 106 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: _col0 (type: string)
-              outputColumnNames: _col0
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: double), _col2 (type: double), _col3 (type: bigint)
+            outputColumnNames: _col1, _col2, _col3, _col4
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              predicate: ((_col2 <= 4074689.000000041) and (_col3 <= 822.0) and (_col4 > 4)) (type: boolean)
               Statistics: Num rows: 10 Data size: 106 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator
-                compressed: false
+              Select Operator
+                expressions: _col1 (type: string)
+                outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 106 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
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 10 Data size: 106 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
 
   Stage: Stage-0
     Fetch Operator
@@ -590,20 +594,24 @@ STAGE PLANS:
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (((_col1 <= 4074689.000000041) and (_col2 <= 822.0)) and (_col3 > 4)) (type: boolean)
-            Statistics: Num rows: 10 Data size: 106 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: _col0 (type: string), _col0 (type: string)
-              outputColumnNames: _col0, _col1
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: double), _col2 (type: double), _col3 (type: bigint)
+            outputColumnNames: _col1, _col2, _col3, _col4
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              predicate: ((_col2 <= 4074689.000000041) and (_col3 <= 822.0) and (_col4 > 4)) (type: boolean)
               Statistics: Num rows: 10 Data size: 106 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator
-                compressed: false
+              Select Operator
+                expressions: _col1 (type: string), _col1 (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 10 Data size: 106 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
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 10 Data size: 106 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
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out b/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
index 33caa53..8c71925 100644
--- a/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
+++ b/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.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)
@@ -38,7 +38,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -260,10 +260,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
-            filterExpr: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+            filterExpr: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.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)
@@ -277,10 +277,10 @@ STAGE PLANS:
                   value expressions: _col1 (type: string)
           TableScan
             alias: b
-            filterExpr: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+            filterExpr: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out b/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
index 10bd3d9..b3e6989 100644
--- a/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
+++ b/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.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)
@@ -38,7 +38,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -260,10 +260,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
-            filterExpr: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+            filterExpr: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 70.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)
@@ -277,10 +277,10 @@ STAGE PLANS:
                   value expressions: _col1 (type: string)
           TableScan
             alias: b
-            filterExpr: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+            filterExpr: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
index 61a5fa4..325ed2c 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
@@ -245,7 +245,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 is not null and UDFToDouble(_col1) is not null) (type: boolean)
+                  predicate: _col1 is not null (type: boolean)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: UDFToDouble(_col1) (type: double)
@@ -257,7 +257,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (value is not null and UDFToDouble(value) is not null) (type: boolean)
+              predicate: value is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join12.q.out b/ql/src/test/results/clientpositive/join12.q.out
index 672777f..8217c86 100644
--- a/ql/src/test/results/clientpositive/join12.q.out
+++ b/ql/src/test/results/clientpositive/join12.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -51,7 +51,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join13.q.out b/ql/src/test/results/clientpositive/join13.q.out
index ff873e4..3ccff63 100644
--- a/ql/src/test/results/clientpositive/join13.q.out
+++ b/ql/src/test/results/clientpositive/join13.q.out
@@ -73,15 +73,12 @@ STAGE PLANS:
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) is not null (type: boolean)
-            Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+          File Output Operator
+            compressed: false
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-2
     Map Reduce
@@ -97,7 +94,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and UDFToDouble(key) is not null) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join16.q.out b/ql/src/test/results/clientpositive/join16.q.out
index de88802..244eb46 100644
--- a/ql/src/test/results/clientpositive/join16.q.out
+++ b/ql/src/test/results/clientpositive/join16.q.out
@@ -14,7 +14,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) and key is not null) and value is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) (type: boolean)
               Statistics: Num rows: 18 Data size: 191 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -29,7 +29,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) and key is not null) and value is not null) (type: boolean)
+              predicate: (((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) (type: boolean)
               Statistics: Num rows: 18 Data size: 191 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/join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join2.q.out b/ql/src/test/results/clientpositive/join2.q.out
index ef35f8f..1ad7285 100644
--- a/ql/src/test/results/clientpositive/join2.q.out
+++ b/ql/src/test/results/clientpositive/join2.q.out
@@ -67,15 +67,12 @@ STAGE PLANS:
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-            Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+          File Output Operator
+            compressed: false
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-2
     Map Reduce
@@ -91,7 +88,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 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/join_cond_pushdown_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out
index 517345e..2ce9a87 100644
--- a/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out
+++ b/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out
@@ -281,7 +281,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select *
 from part p1 join part p2 join part p3 on p2.p_partkey = 1 and p3.p_name = p2.p_name
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out
index a96e134..a361439 100644
--- a/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out
+++ b/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out
@@ -287,7 +287,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select *
 from part p1 join part p2 join part p3 
 where p2.p_partkey = 1 and p3.p_name = p2.p_name

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/join_reorder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder.q.out b/ql/src/test/results/clientpositive/join_reorder.q.out
index f71f4e1..c79e36f 100644
--- a/ql/src/test/results/clientpositive/join_reorder.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder.q.out
@@ -68,7 +68,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -84,16 +84,16 @@ STAGE PLANS:
             alias: c
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (UDFToDouble(key) + 1.0) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: (UDFToDouble(_col0) + 1.0) (type: double)
+                  key expressions: (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
                   sort order: +
-                  Map-reduce partition columns: (UDFToDouble(_col0) + 1.0) (type: double)
+                  Map-reduce partition columns: (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: string)
       Reduce Operator Tree:
@@ -102,7 +102,7 @@ STAGE PLANS:
                Inner Join 0 to 1
           keys:
             0 UDFToDouble(_col0) (type: double)
-            1 (UDFToDouble(_col0) + 1.0) (type: double)
+            1 (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
index 824f0fd..5e7af65 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
@@ -260,7 +260,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -279,7 +279,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -338,7 +338,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 1) and (key > 2)) and key is not null) (type: boolean)
+                    predicate: ((key > 1) and (key > 2)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -369,7 +369,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 2) and (key > 1)) and key is not null) (type: boolean)
+                    predicate: ((key > 2) and (key > 1)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -640,7 +640,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and UDFToDouble(value) is not null) (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: value (type: string)
@@ -659,7 +659,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
index c6dc55c..a7e974a 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/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: 14 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: 7 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: 14 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: 7 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: 14 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: 7 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: 14 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: 7 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: 108 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: 54 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/llap/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
index bf82492..9fac69f 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
@@ -140,7 +140,6 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: decimal(6,2))
                         Statistics: Num rows: 1049 Data size: 117488 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: decimal(4,0))
             Execution mode: llap
         Reducer 2 
             Execution mode: uber

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
index 09b9ca4..56f0165 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -63,7 +63,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -81,7 +81,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -235,7 +235,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -254,7 +254,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -272,7 +272,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -424,7 +424,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -443,7 +443,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -461,7 +461,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
index 051fbe3..9eef871 100644
--- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -63,7 +63,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -81,7 +81,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -235,7 +235,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -254,7 +254,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -272,7 +272,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -424,7 +424,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -443,7 +443,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -461,7 +461,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/llap/vector_join_part_col_char.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_join_part_col_char.q.out b/ql/src/test/results/clientpositive/llap/vector_join_part_col_char.q.out
index d72ebe1..104c907 100644
--- a/ql/src/test/results/clientpositive/llap/vector_join_part_col_char.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_join_part_col_char.q.out
@@ -157,7 +157,7 @@ STAGE PLANS:
                       sort order: +
                       Map-reduce partition columns: _col2 (type: char(50))
                       Statistics: Num rows: 2 Data size: 203 Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string), _col1 (type: int), _col2 (type: char(5))
+                      value expressions: _col0 (type: string), _col1 (type: int)
             Execution mode: vectorized, llap
         Reducer 2 
             Execution mode: llap


[32/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6f44fc81
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6f44fc81
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6f44fc81

Branch: refs/heads/master
Commit: 6f44fc8108d5063594fa75cf4e0cdd7e899692b7
Parents: 1628bf1
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Fri Dec 18 23:17:26 2015 +0100
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Mon Dec 21 02:06:08 2015 +0100

----------------------------------------------------------------------
 .../test/results/positive/hbase_queries.q.out   |   12 +-
 .../hadoop/hive/ql/optimizer/Optimizer.java     |   16 +-
 .../calcite/reloperators/HiveProject.java       |    4 +-
 .../rules/HiveFilterProjectTSTransposeRule.java |    2 +-
 .../rules/HiveFilterProjectTransposeRule.java   |   18 +-
 .../rules/HiveFilterSortTransposeRule.java      |   71 ++
 .../calcite/rules/HiveJoinAddNotNullRule.java   |   39 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |   23 +-
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |    8 +-
 .../apache/hadoop/hive/ql/plan/FilterDesc.java  |    9 +
 .../hadoop/hive/ql/ppd/OpProcFactory.java       |   50 +-
 .../hive/ql/ppd/SimplePredicatePushDown.java    |  110 ++
 .../hive/ql/ppd/SyntheticJoinPredicate.java     |    4 +-
 .../results/clientpositive/auto_join12.q.out    |    4 +-
 .../results/clientpositive/auto_join13.q.out    |   41 +-
 .../results/clientpositive/auto_join16.q.out    |    4 +-
 .../results/clientpositive/auto_join2.q.out     |   41 +-
 .../results/clientpositive/auto_join33.q.out    |   12 +-
 .../clientpositive/auto_join_filters.q.out      |    8 +-
 .../clientpositive/auto_join_nulls.q.out        |    2 +-
 .../clientpositive/auto_join_stats.q.out        |  127 +-
 .../clientpositive/auto_join_stats2.q.out       |   75 +-
 .../auto_join_without_localtask.q.out           |    6 +-
 .../clientpositive/auto_smb_mapjoin_14.q.out    |   28 +-
 .../clientpositive/auto_sortmerge_join_12.q.out |    4 +-
 .../clientpositive/auto_sortmerge_join_6.q.out  |    8 +-
 .../clientpositive/auto_sortmerge_join_9.q.out  |   80 +-
 .../bucketsortoptimize_insert_7.q.out           |    2 +-
 .../cbo_rp_cross_product_check_2.q.out          |    4 +-
 .../results/clientpositive/cbo_rp_join0.q.out   |   29 +-
 .../results/clientpositive/cbo_rp_join1.q.out   |   96 +-
 .../clientpositive/cbo_rp_lineage2.q.out        |    8 +-
 .../cbo_rp_outer_join_ppr.q.java1.7.out         |   28 +-
 .../clientpositive/correlationoptimizer10.q.out |   24 +-
 .../clientpositive/correlationoptimizer13.q.out |    4 +-
 .../clientpositive/correlationoptimizer9.q.out  |   16 +-
 .../results/clientpositive/cross_join.q.out     |    4 +-
 .../clientpositive/cross_product_check_1.q.out  |    6 +-
 .../clientpositive/cross_product_check_2.q.out  |   16 +-
 .../clientpositive/dynamic_rdd_cache.q.out      |   12 +-
 .../encryption_join_unencrypted_tbl.q.out       |    4 +-
 .../clientpositive/explain_logical.q.out        |   74 +-
 .../clientpositive/filter_cond_pushdown.q.out   |    2 +-
 .../clientpositive/fouter_join_ppr.q.out        |    4 +-
 .../clientpositive/groupby_grouping_sets4.q.out |   84 +-
 .../clientpositive/groupby_position.q.out       |    4 +-
 .../test/results/clientpositive/having2.q.out   |   58 +-
 .../clientpositive/index_auto_mult_tables.q.out |   12 +-
 .../index_auto_mult_tables_compact.q.out        |   12 +-
 .../infer_bucket_sort_map_operators.q.out       |    4 +-
 ql/src/test/results/clientpositive/join12.q.out |    4 +-
 ql/src/test/results/clientpositive/join13.q.out |   17 +-
 ql/src/test/results/clientpositive/join16.q.out |    4 +-
 ql/src/test/results/clientpositive/join2.q.out  |   17 +-
 .../clientpositive/join_cond_pushdown_1.q.out   |    2 +-
 .../clientpositive/join_cond_pushdown_3.q.out   |    2 +-
 .../results/clientpositive/join_reorder.q.out   |   10 +-
 .../llap/bucket_map_join_tez2.q.out             |   12 +-
 .../llap/dynamic_partition_pruning.q.out        |  265 ++--
 .../clientpositive/llap/mapjoin_decimal.q.out   |    1 -
 .../llap/tez_dynpart_hashjoin_2.q.out           |   18 +-
 .../llap/tez_vector_dynpart_hashjoin_2.q.out    |   18 +-
 .../llap/vector_join_part_col_char.q.out        |    2 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  265 ++--
 .../clientpositive/louter_join_ppr.q.out        |    4 +-
 .../clientpositive/mapjoin_mapjoin.q.out        |    2 +-
 .../results/clientpositive/multiMapJoin1.q.out  |   36 +-
 .../nonblock_op_deduplicate.q.out               |    4 +-
 .../test/results/clientpositive/orc_llap.q.out  |    6 +-
 .../clientpositive/outer_join_ppr.q.java1.7.out |    2 +-
 .../clientpositive/partition_boolexpr.q.out     |   26 +-
 .../results/clientpositive/perf/query13.q.out   |   66 +-
 .../results/clientpositive/perf/query15.q.out   |   50 +-
 .../results/clientpositive/perf/query17.q.out   |   76 +-
 .../results/clientpositive/perf/query18.q.out   |   68 +-
 .../results/clientpositive/perf/query19.q.out   |   60 +-
 .../results/clientpositive/perf/query20.q.out   |   44 +-
 .../results/clientpositive/perf/query21.q.out   |   44 +-
 .../results/clientpositive/perf/query22.q.out   |   44 +-
 .../results/clientpositive/perf/query25.q.out   |   76 +-
 .../results/clientpositive/perf/query26.q.out   |   50 +-
 .../results/clientpositive/perf/query27.q.out   |   52 +-
 .../results/clientpositive/perf/query28.q.out   |   32 +-
 .../results/clientpositive/perf/query29.q.out   |   76 +-
 .../results/clientpositive/perf/query3.q.out    |   34 +-
 .../results/clientpositive/perf/query31.q.out   |  260 ++--
 .../results/clientpositive/perf/query32.q.out   |   64 +-
 .../results/clientpositive/perf/query34.q.out   |   62 +-
 .../results/clientpositive/perf/query39.q.out   |  114 +-
 .../results/clientpositive/perf/query40.q.out   |   51 +-
 .../results/clientpositive/perf/query42.q.out   |   34 +-
 .../results/clientpositive/perf/query43.q.out   |   34 +-
 .../results/clientpositive/perf/query45.q.out   |   60 +-
 .../results/clientpositive/perf/query46.q.out   |   80 +-
 .../results/clientpositive/perf/query48.q.out   |   50 +-
 .../results/clientpositive/perf/query50.q.out   |   50 +-
 .../results/clientpositive/perf/query51.q.out   |   76 +-
 .../results/clientpositive/perf/query52.q.out   |   34 +-
 .../results/clientpositive/perf/query54.q.out   |  108 +-
 .../results/clientpositive/perf/query55.q.out   |   34 +-
 .../results/clientpositive/perf/query58.q.out   |  196 +--
 .../results/clientpositive/perf/query64.q.out   |  468 +++----
 .../results/clientpositive/perf/query65.q.out   |   88 +-
 .../results/clientpositive/perf/query66.q.out   |  130 +-
 .../results/clientpositive/perf/query67.q.out   |   52 +-
 .../results/clientpositive/perf/query68.q.out   |   80 +-
 .../results/clientpositive/perf/query7.q.out    |   50 +-
 .../results/clientpositive/perf/query70.q.out   |   88 +-
 .../results/clientpositive/perf/query71.q.out   |   90 +-
 .../results/clientpositive/perf/query72.q.out   |  138 +-
 .../results/clientpositive/perf/query73.q.out   |   62 +-
 .../results/clientpositive/perf/query75.q.out   |  282 ++---
 .../results/clientpositive/perf/query76.q.out   |  106 +-
 .../results/clientpositive/perf/query79.q.out   |   58 +-
 .../results/clientpositive/perf/query80.q.out   |  235 ++--
 .../results/clientpositive/perf/query82.q.out   |   36 +-
 .../results/clientpositive/perf/query84.q.out   |   48 +-
 .../results/clientpositive/perf/query85.q.out   |  100 +-
 .../results/clientpositive/perf/query87.q.out   |  130 +-
 .../results/clientpositive/perf/query88.q.out   |  426 +++----
 .../results/clientpositive/perf/query89.q.out   |   56 +-
 .../results/clientpositive/perf/query90.q.out   |   98 +-
 .../results/clientpositive/perf/query91.q.out   |   66 +-
 .../results/clientpositive/perf/query92.q.out   |   58 +-
 .../results/clientpositive/perf/query93.q.out   |   41 +-
 .../results/clientpositive/perf/query94.q.out   |   84 +-
 .../results/clientpositive/perf/query95.q.out   |  106 +-
 .../results/clientpositive/perf/query96.q.out   |   40 +-
 .../results/clientpositive/perf/query97.q.out   |   60 +-
 .../results/clientpositive/perf/query98.q.out   |   42 +-
 .../results/clientpositive/ppd_gby_join.q.out   |   30 +-
 .../test/results/clientpositive/ppd_join.q.out  |   32 +-
 .../test/results/clientpositive/ppd_join2.q.out |   60 +-
 .../test/results/clientpositive/ppd_join3.q.out |   62 +-
 .../test/results/clientpositive/ppd_join5.q.out |    6 +-
 .../clientpositive/ppd_join_filter.q.out        |  108 +-
 .../clientpositive/ppd_outer_join2.q.out        |   34 +-
 .../clientpositive/ppd_outer_join3.q.out        |   34 +-
 .../clientpositive/ppd_outer_join4.q.out        |   49 +-
 .../results/clientpositive/ppd_random.q.out     |   24 +-
 .../clientpositive/ppd_repeated_alias.q.out     |    2 +-
 .../results/clientpositive/ppd_udf_case.q.out   |   26 +-
 .../results/clientpositive/ptfgroupbyjoin.q.out |   48 +-
 .../clientpositive/router_join_ppr.q.out        |    4 +-
 .../test/results/clientpositive/skewjoin.q.out  |   14 +-
 .../results/clientpositive/skewjoinopt18.q.out  |    4 +-
 .../clientpositive/spark/auto_join12.q.out      |    4 +-
 .../clientpositive/spark/auto_join13.q.out      |   45 +-
 .../clientpositive/spark/auto_join16.q.out      |    4 +-
 .../clientpositive/spark/auto_join2.q.out       |   45 +-
 .../spark/auto_join_filters.q.out               |    8 +-
 .../clientpositive/spark/auto_join_nulls.q.out  |    2 +-
 .../clientpositive/spark/auto_join_stats.q.out  |   85 +-
 .../clientpositive/spark/auto_join_stats2.q.out |   85 +-
 .../spark/auto_join_without_localtask.q.out     |    2 +-
 .../spark/auto_smb_mapjoin_14.q.out             |   28 +-
 .../spark/auto_sortmerge_join_12.q.out          |    4 +-
 .../spark/auto_sortmerge_join_6.q.out           |    8 +-
 .../spark/auto_sortmerge_join_9.q.out           |   66 +-
 .../spark/bucket_map_join_tez2.q.out            |   12 +-
 .../spark/bucketsortoptimize_insert_7.q.out     |    4 +-
 .../clientpositive/spark/cross_join.q.out       |    4 +-
 .../spark/cross_product_check_1.q.out           |    6 +-
 .../spark/cross_product_check_2.q.out           |   12 +-
 .../spark/dynamic_rdd_cache.q.out               |   12 +-
 .../clientpositive/spark/groupby_position.q.out |    4 +-
 .../spark/infer_bucket_sort_map_operators.q.out |    4 +-
 .../results/clientpositive/spark/join12.q.out   |    4 +-
 .../results/clientpositive/spark/join13.q.out   |   15 +-
 .../results/clientpositive/spark/join16.q.out   |    4 +-
 .../results/clientpositive/spark/join2.q.out    |   15 +-
 .../spark/join_cond_pushdown_1.q.out            |    2 +-
 .../spark/join_cond_pushdown_3.q.out            |    2 +-
 .../clientpositive/spark/join_reorder.q.out     |   10 +-
 .../clientpositive/spark/louter_join_ppr.q.out  |    4 +-
 .../clientpositive/spark/mapjoin_mapjoin.q.out  |    2 +-
 .../spark/outer_join_ppr.q.java1.7.out          |    2 +-
 .../clientpositive/spark/ppd_gby_join.q.out     |   30 +-
 .../results/clientpositive/spark/ppd_join.q.out |   32 +-
 .../clientpositive/spark/ppd_join2.q.out        |   58 +-
 .../clientpositive/spark/ppd_join3.q.out        |   60 +-
 .../clientpositive/spark/ppd_join5.q.out        |    6 +-
 .../clientpositive/spark/ppd_join_filter.q.out  |   68 +-
 .../clientpositive/spark/ppd_outer_join2.q.out  |   34 +-
 .../clientpositive/spark/ppd_outer_join3.q.out  |   34 +-
 .../clientpositive/spark/ppd_outer_join4.q.out  |   49 +-
 .../clientpositive/spark/router_join_ppr.q.out  |    4 +-
 .../results/clientpositive/spark/skewjoin.q.out |   14 +-
 .../clientpositive/spark/skewjoinopt18.q.out    |    4 +-
 .../clientpositive/spark/subquery_exists.q.out  |    4 +-
 .../clientpositive/spark/subquery_in.q.out      |   21 +-
 .../spark/table_access_keys_stats.q.out         |   24 +-
 .../clientpositive/subquery_exists.q.out        |    4 +-
 .../results/clientpositive/subquery_in.q.out    |   21 +-
 .../clientpositive/subquery_in_having.q.out     |    4 +-
 .../subquery_notin_having.q.java1.7.out         |    2 +-
 .../subquery_unqualcolumnrefs.q.out             |   16 +-
 .../results/clientpositive/subquery_views.q.out |    4 +-
 .../table_access_keys_stats.q.out               |   24 +-
 .../clientpositive/tez/auto_join_filters.q.out  |   10 +-
 .../clientpositive/tez/auto_join_nulls.q.out    |    2 +-
 .../tez/auto_sortmerge_join_12.q.out            |    4 +-
 .../tez/auto_sortmerge_join_6.q.out             |   12 +-
 .../tez/auto_sortmerge_join_9.q.out             |   74 +-
 .../tez/bucket_map_join_tez2.q.out              |   12 +-
 .../results/clientpositive/tez/cross_join.q.out |    8 +-
 .../tez/cross_product_check_1.q.out             |   12 +-
 .../tez/cross_product_check_2.q.out             |   12 +-
 .../tez/dynamic_partition_pruning.q.out         |  265 ++--
 .../clientpositive/tez/explainuser_1.q.out      | 1015 ++++++++-------
 .../clientpositive/tez/explainuser_2.q.out      | 1180 +++++++++---------
 .../clientpositive/tez/explainuser_3.q.out      |   12 +-
 .../clientpositive/tez/mapjoin_decimal.q.out    |    1 -
 .../clientpositive/tez/mapjoin_mapjoin.q.out    |    2 +-
 .../results/clientpositive/tez/mergejoin.q.out  |    2 +-
 .../results/clientpositive/tez/skewjoin.q.out   |   14 +-
 .../clientpositive/tez/subquery_exists.q.out    |    4 +-
 .../clientpositive/tez/subquery_in.q.out        |   21 +-
 .../tez/tez_dynpart_hashjoin_2.q.out            |   18 +-
 .../tez/tez_vector_dynpart_hashjoin_2.q.out     |   18 +-
 .../tez/vector_auto_smb_mapjoin_14.q.out        |  234 ++--
 .../tez/vector_between_columns.q.out            |    4 +-
 .../tez/vector_binary_join_groupby.q.out        |    2 +-
 .../tez/vector_char_mapjoin1.q.out              |    4 +-
 .../tez/vector_decimal_mapjoin.q.out            |    1 -
 .../tez/vector_interval_mapjoin.q.out           |   52 +-
 .../tez/vector_join_filters.q.out               |    2 +-
 .../clientpositive/tez/vector_join_nulls.q.out  |    2 +-
 .../tez/vector_join_part_col_char.q.out         |   22 +-
 .../tez/vector_varchar_mapjoin1.q.out           |    2 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  265 ++--
 .../vector_auto_smb_mapjoin_14.q.out            |   28 +-
 .../clientpositive/vector_between_columns.q.out |    4 +-
 .../vector_binary_join_groupby.q.out            |    2 +-
 .../clientpositive/vector_char_mapjoin1.q.out   |    2 +-
 .../vector_interval_mapjoin.q.out               |   46 +-
 .../clientpositive/vector_join_filters.q.out    |    2 +-
 .../clientpositive/vector_join_nulls.q.out      |    2 +-
 .../vector_varchar_mapjoin1.q.out               |    2 +-
 239 files changed, 6109 insertions(+), 6252 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/hbase-handler/src/test/results/positive/hbase_queries.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out
index 3907bc9..4f10564 100644
--- a/hbase-handler/src/test/results/positive/hbase_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out
@@ -121,7 +121,7 @@ STAGE PLANS:
             alias: hbase_table_1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -136,7 +136,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -272,7 +272,7 @@ STAGE PLANS:
             alias: hbase_table_1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
-              predicate: (((100 < key) and (key < 120)) and key is not null) (type: boolean)
+              predicate: ((100 < key) and (key < 120)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -287,7 +287,7 @@ STAGE PLANS:
             alias: hbase_table_2
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
-              predicate: (((key < 120) and (100 < key)) and key is not null) (type: boolean)
+              predicate: ((key < 120) and (100 < key)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
@@ -494,7 +494,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Group By Operator
                 aggregations: count(key)
@@ -529,7 +529,7 @@ STAGE PLANS:
             alias: hbase_table_1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
index 8f48e7d..7ec068c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
@@ -22,8 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.optimizer.calcite.translator.HiveOpConverterPostProc;
 import org.apache.hadoop.hive.ql.optimizer.correlation.CorrelationOptimizer;
@@ -40,7 +38,10 @@ import org.apache.hadoop.hive.ql.parse.ParseContext;
 import org.apache.hadoop.hive.ql.parse.SemanticException;
 import org.apache.hadoop.hive.ql.ppd.PredicatePushDown;
 import org.apache.hadoop.hive.ql.ppd.PredicateTransitivePropagate;
+import org.apache.hadoop.hive.ql.ppd.SimplePredicatePushDown;
 import org.apache.hadoop.hive.ql.ppd.SyntheticJoinPredicate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
@@ -91,18 +92,25 @@ public class Optimizer {
         transformations.add(new PartitionColumnsSeparator());
     }
 
-    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) {
+    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD) &&
+            !pctx.getContext().isCboSucceeded()) {
       transformations.add(new PredicateTransitivePropagate());
       if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCONSTANTPROPAGATION)) {
         transformations.add(new ConstantPropagate());
       }
       transformations.add(new SyntheticJoinPredicate());
       transformations.add(new PredicatePushDown());
+    } else if (pctx.getContext().isCboSucceeded()) {
+      if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCONSTANTPROPAGATION)) {
+        transformations.add(new ConstantPropagate());
+      }
+      transformations.add(new SyntheticJoinPredicate());
+      transformations.add(new SimplePredicatePushDown());
     }
     if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCONSTANTPROPAGATION)) {
       // We run constant propagation twice because after predicate pushdown, filter expressions
       // are combined and may become eligible for reduction (like is not null filter).
-        transformations.add(new ConstantPropagate());
+      transformations.add(new ConstantPropagate());
     }
 
     if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
index 142812c..c5376bf 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
@@ -166,7 +166,7 @@ public class HiveProject extends Project implements HiveRelNode {
   public Project copy(RelTraitSet traitSet, RelNode input, List<RexNode> exps, RelDataType rowType) {
     assert traitSet.containsIfApplicable(HiveRelNode.CONVENTION);
     HiveProject hp = new HiveProject(getCluster(), traitSet, input, exps, rowType, getFlags());
-    if (this.isSysnthetic()) {
+    if (this.isSynthetic()) {
       hp.setSynthetic();
     }
 
@@ -192,7 +192,7 @@ public class HiveProject extends Project implements HiveRelNode {
     this.isSysnthetic = true;
   }
 
-  public boolean isSysnthetic() {
+  public boolean isSynthetic() {
     return isSysnthetic;
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTSTransposeRule.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTSTransposeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTSTransposeRule.java
index 8321504..f81c21b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTSTransposeRule.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTSTransposeRule.java
@@ -58,7 +58,7 @@ public class HiveFilterProjectTSTransposeRule extends RelOptRule {
     // 2. If ProjectRel is not synthetic then PPD would have already pushed
     // relevant pieces down and hence no point in running PPD again.
     // 3. For synthetic Projects we don't care about non deterministic UDFs
-    if (!projRel.isSysnthetic()) {
+    if (!projRel.isSynthetic()) {
       return false;
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTransposeRule.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTransposeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTransposeRule.java
index 7e484b9..1e947c3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTransposeRule.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterProjectTransposeRule.java
@@ -25,23 +25,37 @@ import org.apache.calcite.rel.core.RelFactories.ProjectFactory;
 import org.apache.calcite.rel.rules.FilterProjectTransposeRule;
 import org.apache.calcite.rex.RexNode;
 import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil;
+import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelFactories;
+import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject;
 
 public class HiveFilterProjectTransposeRule extends FilterProjectTransposeRule {
 
+  public static final HiveFilterProjectTransposeRule INSTANCE_DETERMINISTIC =
+          new HiveFilterProjectTransposeRule(Filter.class, HiveRelFactories.HIVE_FILTER_FACTORY,
+          HiveProject.class, HiveRelFactories.HIVE_PROJECT_FACTORY, true);
+
+  public static final HiveFilterProjectTransposeRule INSTANCE =
+          new HiveFilterProjectTransposeRule(Filter.class, HiveRelFactories.HIVE_FILTER_FACTORY,
+          HiveProject.class, HiveRelFactories.HIVE_PROJECT_FACTORY, false);
+
+  private final boolean onlyDeterministic;
+
   public HiveFilterProjectTransposeRule(Class<? extends Filter> filterClass,
       FilterFactory filterFactory, Class<? extends Project> projectClass,
-      ProjectFactory projectFactory) {
+      ProjectFactory projectFactory, boolean onlyDeterministic) {
     super(filterClass, filterFactory, projectClass, projectFactory);
+    this.onlyDeterministic = onlyDeterministic;
   }
 
   @Override
   public boolean matches(RelOptRuleCall call) {
     final Filter filterRel = call.rel(0);
     RexNode condition = filterRel.getCondition();
-    if (!HiveCalciteUtil.isDeterministic(condition)) {
+    if (this.onlyDeterministic && !HiveCalciteUtil.isDeterministic(condition)) {
       return false;
     }
 
     return super.matches(call);
   }
+
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortTransposeRule.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortTransposeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortTransposeRule.java
new file mode 100644
index 0000000..cfd879f
--- /dev/null
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortTransposeRule.java
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.optimizer.calcite.rules;
+
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.rel.RelNode;
+import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil;
+import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter;
+import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveSortLimit;
+
+import com.google.common.collect.ImmutableList;
+
+public class HiveFilterSortTransposeRule extends RelOptRule {
+
+  public static final HiveFilterSortTransposeRule INSTANCE =
+      new HiveFilterSortTransposeRule();
+
+  //~ Constructors -----------------------------------------------------------
+
+  /**
+   * Creates a HiveFilterSortTransposeRule.
+   */
+  private HiveFilterSortTransposeRule() {
+    super(
+        operand(
+            HiveFilter.class,
+            operand(HiveSortLimit.class, any())));
+  }
+
+  //~ Methods ----------------------------------------------------------------
+
+  public boolean matches(RelOptRuleCall call) {
+    final HiveSortLimit sort = call.rel(1);
+
+    // If sort contains a limit operation, we bail out
+    if (HiveCalciteUtil.limitRelNode(sort)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  public void onMatch(RelOptRuleCall call) {
+    final HiveFilter filter = call.rel(0);
+    final HiveSortLimit sort = call.rel(1);
+
+    final RelNode newFilter = filter.copy(sort.getInput().getTraitSet(),
+            ImmutableList.<RelNode>of(sort.getInput()));
+    final HiveSortLimit newSort = sort.copy(sort.getTraitSet(),
+            newFilter, sort.collation, sort.offset, sort.fetch);
+
+    call.transformTo(newSort);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinAddNotNullRule.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinAddNotNullRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinAddNotNullRule.java
index c8de1d8..de880ce 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinAddNotNullRule.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinAddNotNullRule.java
@@ -36,19 +36,13 @@ import org.apache.calcite.rex.RexCall;
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.rex.RexUtil;
 import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlOperator;
-import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSemanticException;
 import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil;
 import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil.JoinLeafPredicateInfo;
 import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil.JoinPredicateInfo;
 import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelFactories;
 import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter;
-import org.apache.hadoop.hive.ql.optimizer.calcite.translator.SqlFunctionConverter;
-import org.apache.hadoop.hive.ql.parse.SemanticException;
-
-import com.google.common.collect.ImmutableList;
 
 public final class HiveJoinAddNotNullRule extends RelOptRule {
 
@@ -146,9 +140,6 @@ public final class HiveJoinAddNotNullRule extends RelOptRule {
 
     boolean added = false;
 
-    final RelDataType returnType = cluster.getTypeFactory().
-            createSqlType(SqlTypeName.BOOLEAN);
-
     final Map<String,RexNode> newConditions;
     if (input instanceof HiveFilter) {
       newConditions = splitCondition(((HiveFilter) input).getCondition());
@@ -157,23 +148,17 @@ public final class HiveJoinAddNotNullRule extends RelOptRule {
       newConditions = new HashMap<String,RexNode>();
     }
     for (int pos : inputKeyPositions) {
-      try {
-        RelDataType keyType = input.getRowType().getFieldList().get(pos).getType();
-        // Nothing to do if key cannot be null
-        if (!keyType.isNullable()) {
-          continue;
-        }
-        SqlOperator funcCall = SqlFunctionConverter.getCalciteOperator(NOT_NULL_FUNC_NAME,
-                FunctionRegistry.getFunctionInfo(NOT_NULL_FUNC_NAME).getGenericUDF(),
-                ImmutableList.of(keyType), returnType);
-        RexNode cond = rexBuilder.makeCall(funcCall, rexBuilder.makeInputRef(input, pos));
-        String digest = cond.toString();
-        if (!newConditions.containsKey(digest)) {
-          newConditions.put(digest,cond);
-          added = true;
-        }
-      } catch (SemanticException e) {
-        throw new AssertionError(e.getMessage());
+      RelDataType keyType = input.getRowType().getFieldList().get(pos).getType();
+      // Nothing to do if key cannot be null
+      if (!keyType.isNullable()) {
+        continue;
+      }
+      RexNode cond = rexBuilder.makeCall(SqlStdOperatorTable.IS_NOT_NULL,
+              rexBuilder.makeInputRef(input, pos));
+      String digest = cond.toString();
+      if (!newConditions.containsKey(digest)) {
+        newConditions.put(digest,cond);
+        added = true;
       }
     }
     // Nothing will be added to the expression

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
index f2da304..87b18b7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
@@ -21,12 +21,12 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.math.BigDecimal;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -143,6 +143,7 @@ import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterJoinRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterProjectTSTransposeRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterProjectTransposeRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterSetOpTransposeRule;
+import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterSortTransposeRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveInsertExchange4JoinRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveJoinAddNotNullRule;
 import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveJoinCommuteRule;
@@ -489,6 +490,11 @@ public class CalcitePlanner extends SemanticAnalyzer {
   }
 
   @Override
+  boolean isCBOExecuted() {
+    return runCBO;
+  }
+
+  @Override
   boolean continueJoinMerge() {
     return !(runCBO && disableSemJoinReordering);
   }
@@ -995,6 +1001,9 @@ public class CalcitePlanner extends SemanticAnalyzer {
         calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, false, mdProvider.getMetadataProvider(),
                 HepMatchOrder.BOTTOM_UP, ProjectRemoveRule.INSTANCE,
                 new ProjectMergeRule(false, HiveRelFactories.HIVE_PROJECT_FACTORY));
+        calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, true, mdProvider.getMetadataProvider(),
+            new HiveFilterProjectTSTransposeRule(Filter.class, HiveRelFactories.HIVE_FILTER_FACTORY,
+                    HiveProject.class, HiveRelFactories.HIVE_PROJECT_FACTORY, HiveTableScan.class));
 
         // 8.2.  Introduce exchange operators below join/multijoin operators
         calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, false, mdProvider.getMetadataProvider(),
@@ -1061,10 +1070,8 @@ public class CalcitePlanner extends SemanticAnalyzer {
       // TODO: Add in ReduceExpressionrules (Constant folding) to below once
       // HIVE-11927 is fixed.
       perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER);
-      basePlan = hepPlan(basePlan, true, mdProvider, new HiveFilterProjectTransposeRule(
-          Filter.class, HiveRelFactories.HIVE_FILTER_FACTORY, HiveProject.class,
-          HiveRelFactories.HIVE_PROJECT_FACTORY), new HiveFilterSetOpTransposeRule(
-          HiveRelFactories.HIVE_FILTER_FACTORY), HiveFilterJoinRule.JOIN,
+      basePlan = hepPlan(basePlan, true, mdProvider, HiveFilterProjectTransposeRule.INSTANCE_DETERMINISTIC,
+          HiveFilterSetOpTransposeRule.INSTANCE, HiveFilterSortTransposeRule.INSTANCE, HiveFilterJoinRule.JOIN,
           HiveFilterJoinRule.FILTER_ON_JOIN, new HiveFilterAggregateTransposeRule(Filter.class,
               HiveRelFactories.HIVE_FILTER_FACTORY, Aggregate.class), new FilterMergeRule(
               HiveRelFactories.HIVE_FILTER_FACTORY));
@@ -1115,10 +1122,8 @@ public class CalcitePlanner extends SemanticAnalyzer {
       // TODO: Add in ReduceExpressionrules (Constant folding) to below once
       // HIVE-11927 is fixed.
       perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER);
-      basePlan = hepPlan(basePlan, true, mdProvider, new HiveFilterProjectTransposeRule(
-          Filter.class, HiveRelFactories.HIVE_FILTER_FACTORY, HiveProject.class,
-          HiveRelFactories.HIVE_PROJECT_FACTORY), new HiveFilterSetOpTransposeRule(
-          HiveRelFactories.HIVE_FILTER_FACTORY), HiveFilterJoinRule.JOIN,
+      basePlan = hepPlan(basePlan, true, mdProvider, HiveFilterProjectTransposeRule.INSTANCE_DETERMINISTIC,
+          HiveFilterSetOpTransposeRule.INSTANCE, HiveFilterSortTransposeRule.INSTANCE, HiveFilterJoinRule.JOIN,
           HiveFilterJoinRule.FILTER_ON_JOIN, new HiveFilterAggregateTransposeRule(Filter.class,
               HiveRelFactories.HIVE_FILTER_FACTORY, Aggregate.class), new FilterMergeRule(
               HiveRelFactories.HIVE_FILTER_FACTORY));

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index 27549dc..ea776ca 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -7566,7 +7566,9 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
     for (int i = 0; i < srcOps.length; i++) {
       // generate a ReduceSink operator for the join
       String[] srcs = baseSrc[i] != null ? new String[] {baseSrc[i]} : joinTree.getLeftAliases();
-      srcOps[i] = genNotNullFilterForJoinSourcePlan(qb, srcOps[i], joinTree, joinKeys[i]);
+      if (!isCBOExecuted()) {
+        srcOps[i] = genNotNullFilterForJoinSourcePlan(qb, srcOps[i], joinTree, joinKeys[i]);
+      }
       srcOps[i] = genJoinReduceSinkChild(qb, joinKeys[i], srcOps[i], srcs, joinTree.getNextTag());
     }
 
@@ -8436,6 +8438,10 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
     return new ObjectPair(res, tgtToNodeExprMap);
   }
 
+  boolean isCBOExecuted() {
+    return false;
+  }
+
   boolean continueJoinMerge() {
     return true;
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
index ccc4bb4..d04cb78 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java
@@ -80,6 +80,7 @@ public class FilterDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   private org.apache.hadoop.hive.ql.plan.ExprNodeDesc predicate;
   private boolean isSamplingPred;
+  private boolean syntheticJoinPredicate;
   private transient SampleDesc sampleDescr;
   //Is this a filter that should perform a comparison for sorted searches
   private boolean isSortedFilter;
@@ -163,6 +164,14 @@ public class FilterDesc extends AbstractOperatorDesc {
     this.isGenerated = isGenerated;
   }
 
+  public boolean isSyntheticJoinPredicate() {
+    return syntheticJoinPredicate;
+  }
+
+  public void setSyntheticJoinPredicate(boolean syntheticJoinPredicate) {
+    this.syntheticJoinPredicate = syntheticJoinPredicate;
+  }
+
   @Override
   public Object clone() {
     FilterDesc filterDesc = new FilterDesc(getPredicate().clone(), getIsSamplingPred());

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
index 1702628..4702f01 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
@@ -28,8 +28,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.exec.FilterOperator;
 import org.apache.hadoop.hive.ql.exec.JoinOperator;
@@ -39,6 +37,7 @@ import org.apache.hadoop.hive.ql.exec.OperatorFactory;
 import org.apache.hadoop.hive.ql.exec.PTFOperator;
 import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator;
 import org.apache.hadoop.hive.ql.exec.RowSchema;
+import org.apache.hadoop.hive.ql.exec.SelectOperator;
 import org.apache.hadoop.hive.ql.exec.TableScanOperator;
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.lib.Node;
@@ -75,6 +74,8 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPLessThan;
 import org.apache.hadoop.hive.serde2.Deserializer;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 import org.apache.hadoop.mapred.JobConf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Operator factory for predicate pushdown processing of operator graph Each
@@ -400,6 +401,11 @@ public final class OpProcFactory {
     @Override
     public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
         Object... nodeOutputs) throws SemanticException {
+      return process(nd, stack, procCtx, false, nodeOutputs);
+    }
+
+    Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
+            boolean onlySyntheticJoinPredicate, Object... nodeOutputs) throws SemanticException {
       LOG.info("Processing for " + nd.getName() + "("
           + ((Operator) nd).getIdentifier() + ")");
 
@@ -411,7 +417,9 @@ public final class OpProcFactory {
       // Don't push a sampling predicate since createFilter() always creates filter
       // with isSamplePred = false. Also, the filterop with sampling pred is always
       // a child of TableScan, so there is no need to push this predicate.
-      if (ewi == null && !((FilterOperator)op).getConf().getIsSamplingPred()) {
+      if (ewi == null && !((FilterOperator)op).getConf().getIsSamplingPred()
+              && (!onlySyntheticJoinPredicate
+                      || ((FilterOperator)op).getConf().isSyntheticJoinPredicate())) {
         // get pushdown predicates for this operator's predicate
         ExprNodeDesc predicate = (((FilterOperator) nd).getConf()).getPredicate();
         ewi = ExprWalkerProcFactory.extractPushdownPreds(owi, op, predicate);
@@ -447,6 +455,38 @@ public final class OpProcFactory {
     }
   }
 
+  public static class SimpleFilterPPD extends FilterPPD implements NodeProcessor {
+    @Override
+    public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
+        Object... nodeOutputs) throws SemanticException {
+      FilterOperator filterOp = (FilterOperator) nd;
+      // We try to push the full Filter predicate iff:
+      // - the Filter is on top of a TableScan, or
+      // - the Filter is on top of a PTF (between PTF and Filter, there might be Select operators)
+      // Otherwise, we push only the synthetic join predicates
+      // Note : pushing Filter on top of PTF is necessary so the LimitPushdownOptimizer for Rank
+      // functions gets enabled
+      boolean parentTableScan = filterOp.getParentOperators().get(0) instanceof TableScanOperator;
+      boolean ancestorPTF = false;
+      if (!parentTableScan) {
+        Operator<?> parent = filterOp;
+        while (true) {
+          assert parent.getParentOperators().size() == 1;
+          parent = parent.getParentOperators().get(0);
+          if (parent instanceof SelectOperator) {
+            continue;
+          } else if (parent instanceof PTFOperator) {
+            ancestorPTF = true;
+            break;
+          } else {
+            break;
+          }
+        }
+      }
+      return process(nd, stack, procCtx, !parentTableScan && !ancestorPTF, nodeOutputs);
+    }
+  }
+
   /**
    * Determines predicates for which alias can be pushed to it's parents. See
    * the comments for getQualifiedAliases function.
@@ -971,6 +1011,10 @@ public final class OpProcFactory {
     return new FilterPPD();
   }
 
+  public static NodeProcessor getFilterSyntheticJoinPredicateProc() {
+    return new SimpleFilterPPD();
+  }
+
   public static NodeProcessor getJoinProc() {
     return new JoinPPD();
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/ppd/SimplePredicatePushDown.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ppd/SimplePredicatePushDown.java b/ql/src/java/org/apache/hadoop/hive/ql/ppd/SimplePredicatePushDown.java
new file mode 100644
index 0000000..2395c7a
--- /dev/null
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ppd/SimplePredicatePushDown.java
@@ -0,0 +1,110 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.ppd;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.hadoop.hive.ql.exec.CommonJoinOperator;
+import org.apache.hadoop.hive.ql.exec.FilterOperator;
+import org.apache.hadoop.hive.ql.exec.LateralViewForwardOperator;
+import org.apache.hadoop.hive.ql.exec.LateralViewJoinOperator;
+import org.apache.hadoop.hive.ql.exec.LimitOperator;
+import org.apache.hadoop.hive.ql.exec.Operator;
+import org.apache.hadoop.hive.ql.exec.PTFOperator;
+import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator;
+import org.apache.hadoop.hive.ql.exec.ScriptOperator;
+import org.apache.hadoop.hive.ql.exec.TableScanOperator;
+import org.apache.hadoop.hive.ql.exec.UDTFOperator;
+import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker;
+import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher;
+import org.apache.hadoop.hive.ql.lib.Dispatcher;
+import org.apache.hadoop.hive.ql.lib.GraphWalker;
+import org.apache.hadoop.hive.ql.lib.Node;
+import org.apache.hadoop.hive.ql.lib.NodeProcessor;
+import org.apache.hadoop.hive.ql.lib.Rule;
+import org.apache.hadoop.hive.ql.lib.RuleRegExp;
+import org.apache.hadoop.hive.ql.optimizer.Transform;
+import org.apache.hadoop.hive.ql.parse.ParseContext;
+import org.apache.hadoop.hive.ql.parse.SemanticException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimplePredicatePushDown extends Transform {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SimplePredicatePushDown.class);
+  private ParseContext pGraphContext;
+
+  @Override
+  public ParseContext transform(ParseContext pctx) throws SemanticException {
+    pGraphContext = pctx;
+
+    // create a the context for walking operators
+    OpWalkerInfo opWalkerInfo = new OpWalkerInfo(pGraphContext);
+
+    Map<Rule, NodeProcessor> opRules = new LinkedHashMap<Rule, NodeProcessor>();
+    opRules.put(new RuleRegExp("R1",
+      FilterOperator.getOperatorName() + "%"),
+      OpProcFactory.getFilterSyntheticJoinPredicateProc());
+    opRules.put(new RuleRegExp("R2",
+      PTFOperator.getOperatorName() + "%"),
+      OpProcFactory.getPTFProc());
+    opRules.put(new RuleRegExp("R3",
+      CommonJoinOperator.getOperatorName() + "%"),
+      OpProcFactory.getJoinProc());
+    opRules.put(new RuleRegExp("R4",
+      TableScanOperator.getOperatorName() + "%"),
+      OpProcFactory.getTSProc());
+    opRules.put(new RuleRegExp("R5",
+      ScriptOperator.getOperatorName() + "%"),
+      OpProcFactory.getSCRProc());
+    opRules.put(new RuleRegExp("R6",
+      LimitOperator.getOperatorName() + "%"),
+      OpProcFactory.getLIMProc());
+    opRules.put(new RuleRegExp("R7",
+      UDTFOperator.getOperatorName() + "%"),
+      OpProcFactory.getUDTFProc());
+    opRules.put(new RuleRegExp("R8",
+      LateralViewForwardOperator.getOperatorName() + "%"),
+      OpProcFactory.getLVFProc());
+    opRules.put(new RuleRegExp("R9",
+      LateralViewJoinOperator.getOperatorName() + "%"),
+      OpProcFactory.getLVJProc());
+    opRules.put(new RuleRegExp("R10",
+        ReduceSinkOperator.getOperatorName() + "%"),
+        OpProcFactory.getRSProc());
+
+    // The dispatcher fires the processor corresponding to the closest matching
+    // rule and passes the context along
+    Dispatcher disp = new DefaultRuleDispatcher(OpProcFactory.getDefaultProc(),
+        opRules, opWalkerInfo);
+    GraphWalker ogw = new DefaultGraphWalker(disp);
+
+    // Create a list of topop nodes
+    ArrayList<Node> topNodes = new ArrayList<Node>();
+    topNodes.addAll(pGraphContext.getTopOps().values());
+    ogw.startWalking(topNodes, null);
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("After PPD:\n" + Operator.toString(pctx.getTopOps().values()));
+    }
+    return pGraphContext;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/java/org/apache/hadoop/hive/ql/ppd/SyntheticJoinPredicate.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ppd/SyntheticJoinPredicate.java b/ql/src/java/org/apache/hadoop/hive/ql/ppd/SyntheticJoinPredicate.java
index accfb3b..5d5f02d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ppd/SyntheticJoinPredicate.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ppd/SyntheticJoinPredicate.java
@@ -105,7 +105,9 @@ public class SyntheticJoinPredicate extends Transform {
   // insert filter operator between target(child) and input(parent)
   private static Operator<FilterDesc> createFilter(Operator<?> target, Operator<?> parent,
       RowSchema parentRS, ExprNodeDesc filterExpr) {
-    Operator<FilterDesc> filter = OperatorFactory.get(new FilterDesc(filterExpr, false),
+    FilterDesc filterDesc = new FilterDesc(filterExpr, false);
+    filterDesc.setSyntheticJoinPredicate(true);
+    Operator<FilterDesc> filter = OperatorFactory.get(filterDesc,
         new RowSchema(parentRS.getSignature()));
     filter.getParentOperators().add(parent);
     filter.getChildOperators().add(target);

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join12.q.out b/ql/src/test/results/clientpositive/auto_join12.q.out
index 6f08aa8..8ef3664 100644
--- a/ql/src/test/results/clientpositive/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/auto_join12.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -57,7 +57,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join13.q.out b/ql/src/test/results/clientpositive/auto_join13.q.out
index d29818c..fa03d2c 100644
--- a/ql/src/test/results/clientpositive/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/auto_join13.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and UDFToDouble(key) is not null) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -88,30 +88,27 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) is not null (type: boolean)
-                    Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                    Map Join Operator
-                      condition map:
-                           Inner Join 0 to 1
-                      keys:
-                        0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-                        1 UDFToDouble(_col0) (type: double)
-                      outputColumnNames: _col1, _col2
+                  Map Join Operator
+                    condition map:
+                         Inner Join 0 to 1
+                    keys:
+                      0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
+                      1 UDFToDouble(_col0) (type: double)
+                    outputColumnNames: _col1, _col2
+                    Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: hash(_col2,_col1) (type: int)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: hash(_col2,_col1) (type: int)
+                      Group By Operator
+                        aggregations: sum(_col0)
+                        mode: hash
                         outputColumnNames: _col0
-                        Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator
-                          aggregations: sum(_col0)
-                          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)
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join16.q.out b/ql/src/test/results/clientpositive/auto_join16.q.out
index 38738ed..c1da6d2 100644
--- a/ql/src/test/results/clientpositive/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/auto_join16.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) and key is not null) and value is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) (type: boolean)
               Statistics: Num rows: 18 Data size: 191 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -50,7 +50,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) and key is not null) and value is not null) (type: boolean)
+              predicate: (((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) (type: boolean)
               Statistics: Num rows: 18 Data size: 191 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/auto_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out b/ql/src/test/results/clientpositive/auto_join2.q.out
index ce40ff3..26d16ee 100644
--- a/ql/src/test/results/clientpositive/auto_join2.q.out
+++ b/ql/src/test/results/clientpositive/auto_join2.q.out
@@ -51,7 +51,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -83,29 +83,26 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    Map Join Operator
-                      condition map:
-                           Inner Join 0 to 1
-                      keys:
-                        0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                        1 UDFToDouble(_col0) (type: double)
-                      outputColumnNames: _col0, _col3
+                  Map Join Operator
+                    condition map:
+                         Inner Join 0 to 1
+                    keys:
+                      0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                      1 UDFToDouble(_col0) (type: double)
+                    outputColumnNames: _col0, _col3
+                    Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: UDFToInteger(_col0) (type: int), _col3 (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: UDFToInteger(_col0) (type: int), _col3 (type: string)
-                        outputColumnNames: _col0, _col1
+                      File Output Operator
+                        compressed: false
                         Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                        File Output Operator
-                          compressed: false
-                          Statistics: Num rows: 605 Data size: 6427 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
-                              name: default.dest_j2
+                        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
+                            name: default.dest_j2
       Local Work:
         Map Reduce Local Work
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join33.q.out b/ql/src/test/results/clientpositive/auto_join33.q.out
index 8b13bd0..b7aed2c 100644
--- a/ql/src/test/results/clientpositive/auto_join33.q.out
+++ b/ql/src/test/results/clientpositive/auto_join33.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((UDFToDouble(key) + 1.0) < 10.0) and key is not null) and (UDFToDouble(key) + 1.0) is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) + 1.0) < 10.0) and key is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -42,8 +42,8 @@ STAGE PLANS:
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 (UDFToDouble(_col0) + 1.0) (type: double)
-                    1 (UDFToDouble(_col0) + 2.0) (type: double)
+                    0 (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
+                    1 (UDFToDouble(_col0) + UDFToDouble(2)) (type: double)
 
   Stage: Stage-3
     Map Reduce
@@ -52,7 +52,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((UDFToDouble(key) + 2.0) < 10.0) and key is not null) and (UDFToDouble(key) + 2.0) is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) + 2.0) < 10.0) and key is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -62,8 +62,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 (UDFToDouble(_col0) + 1.0) (type: double)
-                    1 (UDFToDouble(_col0) + 2.0) (type: double)
+                    0 (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
+                    1 (UDFToDouble(_col0) + UDFToDouble(2)) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_filters.q.out b/ql/src/test/results/clientpositive/auto_join_filters.q.out
index e0ed373..2fdf470 100644
--- a/ql/src/test/results/clientpositive/auto_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_filters.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -300,7 +300,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table sm
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_input2
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -310,7 +310,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a LEFT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -320,7 +320,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a RIGHT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_nulls.q.out b/ql/src/test/results/clientpositive/auto_join_nulls.q.out
index 954bf06..4af5535 100644
--- a/ql/src/test/results/clientpositive/auto_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_nulls.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-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 sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_stats.q.out b/ql/src/test/results/clientpositive/auto_join_stats.q.out
index feb8186..9d9e111 100644
--- a/ql/src/test/results/clientpositive/auto_join_stats.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_stats.q.out
@@ -91,15 +91,12 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                          serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  File Output Operator
+                    compressed: false
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
 
@@ -115,7 +112,7 @@ STAGE PLANS:
             alias: smalltable
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -192,15 +189,12 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                          serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  File Output Operator
+                    compressed: false
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
 
@@ -246,15 +240,12 @@ STAGE PLANS:
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-            Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+          File Output Operator
+            compressed: false
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -361,15 +352,12 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                          serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  File Output Operator
+                    compressed: false
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
 
@@ -388,7 +376,7 @@ STAGE PLANS:
             alias: smalltable
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -403,7 +391,7 @@ STAGE PLANS:
             alias: smalltable2
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -426,24 +414,21 @@ STAGE PLANS:
                 1 UDFToDouble(_col0) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-              Filter Operator
-                predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                    1 UDFToDouble(_col0) (type: double)
-                  outputColumnNames: _col0, _col1, _col2
+              Map Join Operator
+                condition map:
+                     Inner Join 0 to 1
+                keys:
+                  0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                  1 UDFToDouble(_col0) (type: double)
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 665 Data size: 7069 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
+                  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
       Local Work:
         Map Reduce Local Work
 
@@ -491,15 +476,12 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                          serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  File Output Operator
+                    compressed: false
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
 
@@ -545,15 +527,12 @@ STAGE PLANS:
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-            Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+          File Output Operator
+            compressed: false
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join_stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_stats2.q.out b/ql/src/test/results/clientpositive/auto_join_stats2.q.out
index e0d0146..007ea03 100644
--- a/ql/src/test/results/clientpositive/auto_join_stats2.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_stats2.q.out
@@ -60,7 +60,7 @@ STAGE PLANS:
             alias: smalltable
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -92,24 +92,21 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    Map Join Operator
-                      condition map:
-                           Inner Join 0 to 1
-                      keys:
-                        0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                        1 UDFToDouble(_col0) (type: double)
-                      outputColumnNames: _col0, _col1, _col2
+                  Map Join Operator
+                    condition map:
+                         Inner Join 0 to 1
+                    keys:
+                      0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                      1 UDFToDouble(_col0) (type: double)
+                    outputColumnNames: _col0, _col1, _col2
+                    Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
+                    File Output Operator
+                      compressed: false
                       Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                      File Output Operator
-                        compressed: false
-                        Statistics: Num rows: 605 Data size: 6427 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
+                      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
       Local Work:
         Map Reduce Local Work
 
@@ -198,7 +195,7 @@ STAGE PLANS:
             alias: smalltable
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -213,7 +210,7 @@ STAGE PLANS:
             alias: smalltable2
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -245,9 +242,14 @@ STAGE PLANS:
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                  Map Join Operator
+                    condition map:
+                         Inner Join 0 to 1
+                    keys:
+                      0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                      1 UDFToDouble(_col0) (type: double)
+                    outputColumnNames: _col0, _col1, _col2
+                    Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -255,25 +257,14 @@ STAGE PLANS:
                         0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
                         1 UDFToDouble(_col0) (type: double)
                       outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                        Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                            1 UDFToDouble(_col0) (type: double)
-                          outputColumnNames: _col0, _col1, _col2
-                          Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
-                          File Output Operator
-                            compressed: false
-                            Statistics: Num rows: 665 Data size: 7069 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
+                      Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
+                      File Output Operator
+                        compressed: false
+                        Statistics: Num rows: 665 Data size: 7069 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
       Local Work:
         Map Reduce Local Work
 


[06/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
index 08275f3..bd3dc4d 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
@@ -40,40 +40,34 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -314,7 +308,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -331,7 +325,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/ppd_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_join.q.out
index 2357adc..fb1d563 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join.q.out
@@ -37,41 +37,35 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -576,7 +570,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -593,7 +587,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 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/spark/ppd_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
index 68cbc5a..5848609 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
@@ -50,56 +50,47 @@ STAGE PLANS:
                       expressions: value (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) and key is not null) (type: boolean)
+                    predicate: (((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Map 5 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -138,15 +129,12 @@ STAGE PLANS:
                     expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string)
                     outputColumnNames: _col0, _col1, _col3
                     Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: _col1 is not null (type: boolean)
+                    Reduce Output Operator
+                      key expressions: _col1 (type: string)
+                      sort order: +
+                      Map-reduce partition columns: _col1 (type: string)
                       Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col1 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col1 (type: string)
-                        Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col3 (type: string)
+                      value expressions: _col0 (type: string), _col3 (type: string)
 
   Stage: Stage-0
     Fetch Operator
@@ -1757,7 +1745,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) and key is not null) (type: boolean)
+                    predicate: (((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1775,7 +1763,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 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/spark/ppd_join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out
index 573b352..c78d4cb 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out
@@ -44,61 +44,52 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: (((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) and key is not null) (type: boolean)
+                    predicate: ((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
         Map 5 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -137,15 +128,12 @@ STAGE PLANS:
                     expressions: _col0 (type: string), _col2 (type: string)
                     outputColumnNames: _col0, _col2
                     Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: _col0 is not null (type: boolean)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: string)
+                      value expressions: _col2 (type: string)
 
   Stage: Stage-0
     Fetch Operator
@@ -1796,7 +1784,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) and key is not null) (type: boolean)
+                    predicate: (((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -1813,7 +1801,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) and key is not null) (type: boolean)
+                    predicate: ((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -1830,7 +1818,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) and key is not null) (type: boolean)
+                    predicate: (((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 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/spark/ppd_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join5.q.out b/ql/src/test/results/clientpositive/spark/ppd_join5.q.out
index 377d8ac..8b51969 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join5.q.out
@@ -32,7 +32,7 @@ POSTHOOK: Lineage: t1.id1 SIMPLE []
 POSTHOOK: Lineage: t1.id2 SIMPLE []
 POSTHOOK: Lineage: t2.d SIMPLE []
 POSTHOOK: Lineage: t2.id SIMPLE []
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain
 select a.*,b.d d1,c.d d2 from
   t1 a join t2 b on (a.id1 = b.id)
@@ -148,7 +148,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain
 select * from (
 select a.*,b.d d1,c.d d2 from
@@ -271,7 +271,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: select * from (
 select a.*,b.d d1,c.d d2 from
   t1 a join t2 b on (a.id1 = b.id)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
index b1a3e49..fd2d590 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
@@ -145,17 +145,13 @@ STAGE PLANS:
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        isSamplingPred: false
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          auto parallelism: false
+                        tag: 0
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -332,18 +328,14 @@ STAGE PLANS:
                     expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) (type: double), (UDFToDouble(_col1) + 3.0) (type: double)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      isSamplingPred: false
-                      predicate: _col0 is not null (type: boolean)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                        tag: 1
-                        value expressions: _col1 (type: double), _col2 (type: double)
-                        auto parallelism: false
+                      tag: 1
+                      value expressions: _col1 (type: double), _col2 (type: double)
+                      auto parallelism: false
 
   Stage: Stage-0
     Fetch Operator
@@ -911,17 +903,13 @@ STAGE PLANS:
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        isSamplingPred: false
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          auto parallelism: false
+                        tag: 0
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -1098,18 +1086,14 @@ STAGE PLANS:
                     expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) (type: double), (UDFToDouble(_col1) + 3.0) (type: double)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      isSamplingPred: false
-                      predicate: _col0 is not null (type: boolean)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                        tag: 1
-                        value expressions: _col1 (type: double), _col2 (type: double)
-                        auto parallelism: false
+                      tag: 1
+                      value expressions: _col1 (type: double), _col2 (type: double)
+                      auto parallelism: false
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
index ea95e18..8695961 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
@@ -37,42 +37,36 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+                    predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -278,7 +272,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+                    predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -296,7 +290,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 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/spark/ppd_outer_join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
index c54029b..4a8c58c 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
@@ -37,42 +37,36 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+                    predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -278,7 +272,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+                    predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -296,7 +290,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 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/spark/ppd_outer_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out
index 9ac30c7..8d08308 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out
@@ -43,62 +43,53 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) and key is not null) (type: boolean)
+                    predicate: (((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.0)) and key is not null) (type: boolean)
+                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.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)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: string)
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -426,7 +417,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) and key is not null) (type: boolean)
+                    predicate: (((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -443,7 +434,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.0)) and key is not null) (type: boolean)
+                    predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.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)
@@ -461,7 +452,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+                    predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
                     Statistics: Num rows: 6 Data size: 63 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/spark/router_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
index 0734d71..620e5d2 100644
--- a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
@@ -1388,7 +1388,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: 12 Data size: 127 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1508,7 +1508,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: 6 Data size: 63 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/spark/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/skewjoin.q.out b/ql/src/test/results/clientpositive/spark/skewjoin.q.out
index ec5d4cd..b246046 100644
--- a/ql/src/test/results/clientpositive/spark/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/skewjoin.q.out
@@ -823,7 +823,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and UDFToDouble(substring(value, 5)) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -840,16 +840,16 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and (UDFToDouble(substring(value, 5)) + 1.0) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: string)
         Reducer 2 
@@ -860,7 +860,7 @@ STAGE PLANS:
                 handleSkewJoin: true
                 keys:
                   0 _col0 (type: string), UDFToDouble(substring(_col1, 5)) (type: double)
-                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                 outputColumnNames: _col2, _col3
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
@@ -1026,7 +1026,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -1043,7 +1043,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out
index 1994d2f..457fb05 100644
--- a/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out
+++ b/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out
@@ -91,7 +91,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), val (type: string)
@@ -109,7 +109,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
index 06c34b9..5f41ac7 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string), key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_in.q.out b/ql/src/test/results/clientpositive/spark/subquery_in.q.out
index ec18be8..1d813f8 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_in.q.out
@@ -149,7 +149,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -166,7 +166,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -282,15 +282,12 @@ STAGE PLANS:
                       expressions: p_name (type: string), p_size (type: int), UDFToDouble(p_size) (type: double)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col2 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col2 (type: double)
+                        sort order: +
+                        Map-reduce partition columns: _col2 (type: double)
                         Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col2 (type: double)
-                          sort order: +
-                          Map-reduce partition columns: _col2 (type: double)
-                          Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col0 (type: string), _col1 (type: int)
+                        value expressions: _col0 (type: string), _col1 (type: int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -632,7 +629,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -649,7 +646,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/table_access_keys_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/table_access_keys_stats.q.out b/ql/src/test/results/clientpositive/spark/table_access_keys_stats.q.out
index 7be8eca..f2c7b08 100644
--- a/ql/src/test/results/clientpositive/spark/table_access_keys_stats.q.out
+++ b/ql/src/test/results/clientpositive/spark/table_access_keys_stats.q.out
@@ -277,7 +277,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -296,7 +296,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key,val
 Table:default@t2
@@ -330,7 +330,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -351,7 +351,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -369,7 +369,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -390,7 +390,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -411,7 +411,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -435,7 +435,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -472,7 +472,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -503,13 +503,13 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
 Keys:key
 
-Operator:GBY_18
+Operator:GBY_16
 Table:default@t3
 Keys:val
 
@@ -541,7 +541,7 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_exists.q.out b/ql/src/test/results/clientpositive/subquery_exists.q.out
index 9683e08..f3a2705 100644
--- a/ql/src/test/results/clientpositive/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/subquery_exists.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+              predicate: ((value > 'val_9') and key is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -51,7 +51,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+              predicate: ((value > 'val_9') and key is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: value (type: string), key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_in.q.out b/ql/src/test/results/clientpositive/subquery_in.q.out
index cb30789..a374dc0 100644
--- a/ql/src/test/results/clientpositive/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/subquery_in.q.out
@@ -136,7 +136,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -151,7 +151,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -347,15 +347,12 @@ STAGE PLANS:
                 expressions: p_name (type: string), p_size (type: int), UDFToDouble(p_size) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col2 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col2 (type: double)
+                  sort order: +
+                  Map-reduce partition columns: _col2 (type: double)
                   Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col2 (type: double)
-                    sort order: +
-                    Map-reduce partition columns: _col2 (type: double)
-                    Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string), _col1 (type: int)
+                  value expressions: _col0 (type: string), _col1 (type: int)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: double)
@@ -635,7 +632,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)
@@ -672,7 +669,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 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/subquery_in_having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_in_having.q.out b/ql/src/test/results/clientpositive/subquery_in_having.q.out
index 73250bd..87c5a62 100644
--- a/ql/src/test/results/clientpositive/subquery_in_having.q.out
+++ b/ql/src/test/results/clientpositive/subquery_in_having.q.out
@@ -375,13 +375,13 @@ STAGE PLANS:
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col2 (type: bigint)
-            outputColumnNames: _col1, _col2
+            outputColumnNames: _col0, _col2
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: _col2 is not null (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col2 (type: bigint), _col1 (type: string)
+                expressions: _col2 (type: bigint), _col0 (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out
index 7b7ccda..d6c6edc 100644
--- a/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out
+++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out
@@ -354,7 +354,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: ((_col0 is null or _col1 is null) and ((_col2 - _col1) > 600.0)) (type: boolean)
+            predicate: (((_col2 - _col1) > 600.0) and (_col0 is null or _col1 is null)) (type: boolean)
             Statistics: Num rows: 2 Data size: 242 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               Statistics: Num rows: 2 Data size: 242 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
index 3241787..ad5f72b 100644
--- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
+++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
@@ -52,7 +52,7 @@ STAGE PLANS:
             alias: src11
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
-              predicate: (((key1 > '9') and value1 is not null) and key1 is not null) (type: boolean)
+              predicate: ((key1 > '9') and value1 is not null) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
                 expressions: key1 (type: string), value1 (type: string)
@@ -67,7 +67,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -122,7 +122,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -137,7 +137,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -549,7 +549,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)
@@ -586,7 +586,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+              predicate: ((key > '9') and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -748,13 +748,13 @@ STAGE PLANS:
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col2 (type: bigint)
-            outputColumnNames: _col1, _col2
+            outputColumnNames: _col0, _col2
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: _col2 is not null (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col2 (type: bigint), _col1 (type: string)
+                expressions: _col2 (type: bigint), _col0 (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_views.q.out b/ql/src/test/results/clientpositive/subquery_views.q.out
index 00c9bd8..76e53d3 100644
--- a/ql/src/test/results/clientpositive/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/subquery_views.q.out
@@ -220,7 +220,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((value > 'val_11') and key is not null) (type: boolean)
+              predicate: (value > 'val_11') (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), key (type: string)
@@ -375,7 +375,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((value > 'val_11') and (key < '11')) and key is not null) (type: boolean)
+              predicate: ((value > 'val_11') and (key < '11')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), key (type: string)


[03/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/explainuser_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_2.q.out b/ql/src/test/results/clientpositive/tez/explainuser_2.q.out
index 61a9580..eb7d564 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_2.q.out
@@ -189,20 +189,20 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3
-         File Output Operator [FS_20]
+         File Output Operator [FS_16]
             compressed:false
             Statistics:Num rows: 605 Data size: 6427 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"}
-            Select Operator [SEL_19]
+            Select Operator [SEL_15]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-               Merge Join Operator [MERGEJOIN_30]
+               Merge Join Operator [MERGEJOIN_26]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"_col3 (type: string)","1":"_col0 (type: string)"}
                |  outputColumnNames:["_col0","_col3","_col6"]
                |  Statistics:Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
                |<-Map 5 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_17]
+               |  Reduce Output Operator [RS_13]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -211,26 +211,26 @@ Stage-0
                |     Select Operator [SEL_8]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |        Filter Operator [FIL_28]
+               |        Filter Operator [FIL_24]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |           TableScan [TS_6]
                |              alias:y
                |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 2 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_15]
+                  Reduce Output Operator [RS_12]
                      key expressions:_col3 (type: string)
                      Map-reduce partition columns:_col3 (type: string)
                      sort order:+
                      Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col0 (type: string)
-                     Merge Join Operator [MERGEJOIN_29]
+                     Merge Join Operator [MERGEJOIN_25]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: string)","1":"_col1 (type: string)"}
                      |  outputColumnNames:["_col0","_col3"]
                      |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 1 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_10]
+                     |  Reduce Output Operator [RS_9]
                      |     key expressions:_col0 (type: string)
                      |     Map-reduce partition columns:_col0 (type: string)
                      |     sort order:+
@@ -238,14 +238,14 @@ Stage-0
                      |     Select Operator [SEL_2]
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_26]
+                     |        Filter Operator [FIL_22]
                      |           predicate:value is not null (type: boolean)
                      |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                      |           TableScan [TS_0]
                      |              alias:z
                      |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_12]
+                        Reduce Output Operator [RS_10]
                            key expressions:_col1 (type: string)
                            Map-reduce partition columns:_col1 (type: string)
                            sort order:+
@@ -254,7 +254,7 @@ Stage-0
                            Select Operator [SEL_5]
                               outputColumnNames:["_col0","_col1"]
                               Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_27]
+                              Filter Operator [FIL_23]
                                  predicate:(key is not null and value is not null) (type: boolean)
                                  Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                                  TableScan [TS_3]
@@ -335,79 +335,79 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_69]
+         File Output Operator [FS_55]
             compressed:false
             Statistics:Num rows: 100 Data size: 1000 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_68]
+            Limit [LIM_54]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_67]
+               Select Operator [SEL_53]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 805 Data size: 8553 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_66]
+                  Reduce Output Operator [RS_52]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                      sort order:+++
                      Statistics:Num rows: 805 Data size: 8553 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col3 (type: bigint), _col4 (type: bigint), _col5 (type: bigint)
-                     Select Operator [SEL_65]
+                     Select Operator [SEL_51]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Statistics:Num rows: 805 Data size: 8553 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_64]
+                        Group By Operator [GBY_50]
                         |  aggregations:["count(VALUE._col0)","count(VALUE._col1)","count(VALUE._col2)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |  Statistics:Num rows: 805 Data size: 8553 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 3 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_63]
+                           Reduce Output Operator [RS_49]
                               key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                               sort order:+++
                               Statistics:Num rows: 1610 Data size: 17107 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col3 (type: bigint), _col4 (type: bigint), _col5 (type: bigint)
-                              Group By Operator [GBY_62]
+                              Group By Operator [GBY_48]
                                  aggregations:["count(_col13)","count(_col21)","count(_col3)"]
                                  keys:_col2 (type: string), _col12 (type: string), _col20 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  Statistics:Num rows: 1610 Data size: 17107 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_61]
+                                 Select Operator [SEL_47]
                                     outputColumnNames:["_col2","_col12","_col20","_col13","_col21","_col3"]
                                     Statistics:Num rows: 1610 Data size: 17107 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_111]
+                                    Merge Join Operator [MERGEJOIN_97]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col1 (type: string), _col3 (type: string)","1":"_col15 (type: string), _col17 (type: string)"}
                                     |  outputColumnNames:["_col2","_col3","_col12","_col13","_col20","_col21"]
                                     |  Statistics:Num rows: 1610 Data size: 17107 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 11 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_59]
+                                    |  Reduce Output Operator [RS_45]
                                     |     key expressions:_col15 (type: string), _col17 (type: string)
                                     |     Map-reduce partition columns:_col15 (type: string), _col17 (type: string)
                                     |     sort order:++
                                     |     Statistics:Num rows: 1464 Data size: 15552 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col6 (type: string), _col7 (type: string), _col14 (type: string)
-                                    |     Select Operator [SEL_50]
+                                    |     Select Operator [SEL_40]
                                     |        outputColumnNames:["_col14","_col15","_col17","_col6","_col7"]
                                     |        Statistics:Num rows: 1464 Data size: 15552 Basic stats: COMPLETE Column stats: NONE
-                                    |        Merge Join Operator [MERGEJOIN_110]
+                                    |        Merge Join Operator [MERGEJOIN_96]
                                     |        |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |        |  keys:{"0":"_col4 (type: string), _col6 (type: string)","1":"_col2 (type: string), _col4 (type: string)"}
                                     |        |  outputColumnNames:["_col2","_col3","_col14","_col15","_col17"]
                                     |        |  Statistics:Num rows: 1464 Data size: 15552 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 10 [SIMPLE_EDGE]
-                                    |        |  Reduce Output Operator [RS_46]
+                                    |        |  Reduce Output Operator [RS_37]
                                     |        |     key expressions:_col4 (type: string), _col6 (type: string)
                                     |        |     Map-reduce partition columns:_col4 (type: string), _col6 (type: string)
                                     |        |     sort order:++
                                     |        |     Statistics:Num rows: 1331 Data size: 14139 Basic stats: COMPLETE Column stats: NONE
                                     |        |     value expressions:_col2 (type: string), _col3 (type: string)
-                                    |        |     Merge Join Operator [MERGEJOIN_108]
+                                    |        |     Merge Join Operator [MERGEJOIN_94]
                                     |        |     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |        |     |  keys:{"0":"_col3 (type: string)","1":"_col1 (type: string)"}
                                     |        |     |  outputColumnNames:["_col2","_col3","_col4","_col6"]
                                     |        |     |  Statistics:Num rows: 1331 Data size: 14139 Basic stats: COMPLETE Column stats: NONE
                                     |        |     |<-Map 14 [SIMPLE_EDGE]
-                                    |        |     |  Reduce Output Operator [RS_43]
+                                    |        |     |  Reduce Output Operator [RS_35]
                                     |        |     |     key expressions:_col1 (type: string)
                                     |        |     |     Map-reduce partition columns:_col1 (type: string)
                                     |        |     |     sort order:+
@@ -415,26 +415,26 @@ Stage-0
                                     |        |     |     Select Operator [SEL_17]
                                     |        |     |        outputColumnNames:["_col1"]
                                     |        |     |        Statistics:Num rows: 12 Data size: 91 Basic stats: COMPLETE Column stats: NONE
-                                    |        |     |        Filter Operator [FIL_102]
+                                    |        |     |        Filter Operator [FIL_88]
                                     |        |     |           predicate:((key = 'src1key') and value is not null) (type: boolean)
                                     |        |     |           Statistics:Num rows: 12 Data size: 91 Basic stats: COMPLETE Column stats: NONE
                                     |        |     |           TableScan [TS_15]
                                     |        |     |              alias:src1
                                     |        |     |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                                     |        |     |<-Reducer 9 [SIMPLE_EDGE]
-                                    |        |        Reduce Output Operator [RS_41]
+                                    |        |        Reduce Output Operator [RS_34]
                                     |        |           key expressions:_col3 (type: string)
                                     |        |           Map-reduce partition columns:_col3 (type: string)
                                     |        |           sort order:+
                                     |        |           Statistics:Num rows: 1210 Data size: 12854 Basic stats: COMPLETE Column stats: NONE
                                     |        |           value expressions:_col2 (type: string), _col4 (type: string), _col6 (type: string)
-                                    |        |           Merge Join Operator [MERGEJOIN_107]
+                                    |        |           Merge Join Operator [MERGEJOIN_93]
                                     |        |           |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |        |           |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                                     |        |           |  outputColumnNames:["_col2","_col3","_col4","_col6"]
                                     |        |           |  Statistics:Num rows: 1210 Data size: 12854 Basic stats: COMPLETE Column stats: NONE
                                     |        |           |<-Map 13 [SIMPLE_EDGE]
-                                    |        |           |  Reduce Output Operator [RS_38]
+                                    |        |           |  Reduce Output Operator [RS_32]
                                     |        |           |     key expressions:_col0 (type: string)
                                     |        |           |     Map-reduce partition columns:_col0 (type: string)
                                     |        |           |     sort order:+
@@ -442,26 +442,26 @@ Stage-0
                                     |        |           |     Select Operator [SEL_14]
                                     |        |           |        outputColumnNames:["_col0"]
                                     |        |           |        Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                                    |        |           |        Filter Operator [FIL_101]
+                                    |        |           |        Filter Operator [FIL_87]
                                     |        |           |           predicate:((value = 'd1value') and key is not null) (type: boolean)
                                     |        |           |           Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                                     |        |           |           TableScan [TS_12]
                                     |        |           |              alias:d1
                                     |        |           |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                                     |        |           |<-Reducer 8 [SIMPLE_EDGE]
-                                    |        |              Reduce Output Operator [RS_36]
+                                    |        |              Reduce Output Operator [RS_31]
                                     |        |                 key expressions:_col2 (type: string)
                                     |        |                 Map-reduce partition columns:_col2 (type: string)
                                     |        |                 sort order:+
                                     |        |                 Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
                                     |        |                 value expressions:_col3 (type: string), _col4 (type: string), _col6 (type: string)
-                                    |        |                 Merge Join Operator [MERGEJOIN_106]
+                                    |        |                 Merge Join Operator [MERGEJOIN_92]
                                     |        |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |        |                 |  keys:{"0":"_col1 (type: string)","1":"_col3 (type: string)"}
                                     |        |                 |  outputColumnNames:["_col2","_col3","_col4","_col6"]
                                     |        |                 |  Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
                                     |        |                 |<-Map 12 [SIMPLE_EDGE]
-                                    |        |                 |  Reduce Output Operator [RS_33]
+                                    |        |                 |  Reduce Output Operator [RS_29]
                                     |        |                 |     key expressions:_col3 (type: string)
                                     |        |                 |     Map-reduce partition columns:_col3 (type: string)
                                     |        |                 |     sort order:+
@@ -470,14 +470,14 @@ Stage-0
                                     |        |                 |     Select Operator [SEL_11]
                                     |        |                 |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                     |        |                 |        Statistics:Num rows: 42 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
-                                    |        |                 |        Filter Operator [FIL_100]
+                                    |        |                 |        Filter Operator [FIL_86]
                                     |        |                 |           predicate:(((((k3 is not null and (v3 = 'ssv3')) and k2 is not null) and k1 is not null) and v1 is not null) and v2 is not null) (type: boolean)
                                     |        |                 |           Statistics:Num rows: 42 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
                                     |        |                 |           TableScan [TS_9]
                                     |        |                 |              alias:ss
                                     |        |                 |              Statistics:Num rows: 85 Data size: 2945 Basic stats: COMPLETE Column stats: NONE
                                     |        |                 |<-Map 7 [SIMPLE_EDGE]
-                                    |        |                    Reduce Output Operator [RS_31]
+                                    |        |                    Reduce Output Operator [RS_28]
                                     |        |                       key expressions:_col1 (type: string)
                                     |        |                       Map-reduce partition columns:_col1 (type: string)
                                     |        |                       sort order:+
@@ -485,26 +485,26 @@ Stage-0
                                     |        |                       Select Operator [SEL_8]
                                     |        |                          outputColumnNames:["_col1"]
                                     |        |                          Statistics:Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
-                                    |        |                          Filter Operator [FIL_99]
+                                    |        |                          Filter Operator [FIL_85]
                                     |        |                             predicate:((key = 'srcpartkey') and value is not null) (type: boolean)
                                     |        |                             Statistics:Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                                     |        |                             TableScan [TS_6]
                                     |        |                                alias:srcpart
                                     |        |                                Statistics:Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 16 [SIMPLE_EDGE]
-                                    |           Reduce Output Operator [RS_48]
+                                    |           Reduce Output Operator [RS_38]
                                     |              key expressions:_col2 (type: string), _col4 (type: string)
                                     |              Map-reduce partition columns:_col2 (type: string), _col4 (type: string)
                                     |              sort order:++
                                     |              Statistics:Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                                     |              value expressions:_col3 (type: string), _col5 (type: string)
-                                    |              Merge Join Operator [MERGEJOIN_109]
+                                    |              Merge Join Operator [MERGEJOIN_95]
                                     |              |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |              |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                     |              |  outputColumnNames:["_col2","_col3","_col4","_col5"]
                                     |              |  Statistics:Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                                     |              |<-Map 15 [SIMPLE_EDGE]
-                                    |              |  Reduce Output Operator [RS_25]
+                                    |              |  Reduce Output Operator [RS_24]
                                     |              |     key expressions:_col0 (type: string)
                                     |              |     Map-reduce partition columns:_col0 (type: string)
                                     |              |     sort order:+
@@ -513,14 +513,14 @@ Stage-0
                                     |              |     Select Operator [SEL_20]
                                     |              |        outputColumnNames:["_col0","_col2","_col3","_col4","_col5"]
                                     |              |        Statistics:Num rows: 42 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
-                                    |              |        Filter Operator [FIL_103]
+                                    |              |        Filter Operator [FIL_89]
                                     |              |           predicate:((((((v1 = 'srv1') and k3 is not null) and k2 is not null) and v3 is not null) and v2 is not null) and k1 is not null) (type: boolean)
                                     |              |           Statistics:Num rows: 42 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
                                     |              |           TableScan [TS_18]
                                     |              |              alias:sr
                                     |              |              Statistics:Num rows: 85 Data size: 2945 Basic stats: COMPLETE Column stats: NONE
                                     |              |<-Map 17 [SIMPLE_EDGE]
-                                    |                 Reduce Output Operator [RS_27]
+                                    |                 Reduce Output Operator [RS_25]
                                     |                    key expressions:_col0 (type: string)
                                     |                    Map-reduce partition columns:_col0 (type: string)
                                     |                    sort order:+
@@ -528,26 +528,26 @@ Stage-0
                                     |                    Select Operator [SEL_23]
                                     |                       outputColumnNames:["_col0"]
                                     |                       Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                                    |                       Filter Operator [FIL_104]
+                                    |                       Filter Operator [FIL_90]
                                     |                          predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null) (type: boolean)
                                     |                          Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                                     |                          TableScan [TS_21]
                                     |                             alias:d1
                                     |                             Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 2 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_57]
+                                       Reduce Output Operator [RS_44]
                                           key expressions:_col1 (type: string), _col3 (type: string)
                                           Map-reduce partition columns:_col1 (type: string), _col3 (type: string)
                                           sort order:++
                                           Statistics:Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col2 (type: string)
-                                          Merge Join Operator [MERGEJOIN_105]
+                                          Merge Join Operator [MERGEJOIN_91]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                           |  outputColumnNames:["_col1","_col2","_col3"]
                                           |  Statistics:Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 1 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_52]
+                                          |  Reduce Output Operator [RS_41]
                                           |     key expressions:_col0 (type: string)
                                           |     Map-reduce partition columns:_col0 (type: string)
                                           |     sort order:+
@@ -556,14 +556,14 @@ Stage-0
                                           |     Select Operator [SEL_2]
                                           |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                           |        Statistics:Num rows: 170 Data size: 5890 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_97]
+                                          |        Filter Operator [FIL_83]
                                           |           predicate:((v3 is not null and v2 is not null) and k1 is not null) (type: boolean)
                                           |           Statistics:Num rows: 170 Data size: 5890 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_0]
                                           |              alias:cs
                                           |              Statistics:Num rows: 170 Data size: 5890 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 6 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_54]
+                                             Reduce Output Operator [RS_42]
                                                 key expressions:_col0 (type: string)
                                                 Map-reduce partition columns:_col0 (type: string)
                                                 sort order:+
@@ -571,7 +571,7 @@ Stage-0
                                                 Select Operator [SEL_5]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_98]
+                                                   Filter Operator [FIL_84]
                                                       predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null) (type: boolean)
                                                       Statistics:Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                                                       TableScan [TS_3]
@@ -616,148 +616,148 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_67]
+         File Output Operator [FS_59]
             compressed:false
             Statistics:Num rows: 550 Data size: 5843 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_65]
+            Group By Operator [GBY_57]
             |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
             |  outputColumnNames:["_col0","_col1"]
             |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             |<-Union 6 [SIMPLE_EDGE]
                |<-Reducer 15 [CONTAINS]
-               |  Reduce Output Operator [RS_64]
+               |  Reduce Output Operator [RS_56]
                |     key expressions:_col0 (type: string), _col1 (type: string)
                |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |     sort order:++
                |     Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-               |     Group By Operator [GBY_63]
+               |     Group By Operator [GBY_55]
                |        keys:_col0 (type: string), _col1 (type: string)
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-               |        Select Operator [SEL_59]
+               |        Select Operator [SEL_51]
                |           outputColumnNames:["_col0","_col1"]
                |           Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-               |           Merge Join Operator [MERGEJOIN_93]
+               |           Merge Join Operator [MERGEJOIN_85]
                |           |  condition map:[{"":"Inner Join 0 to 1"}]
                |           |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                |           |  outputColumnNames:["_col1","_col2"]
                |           |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                |           |<-Map 18 [SIMPLE_EDGE]
-               |           |  Reduce Output Operator [RS_57]
+               |           |  Reduce Output Operator [RS_49]
                |           |     key expressions:_col0 (type: string)
                |           |     Map-reduce partition columns:_col0 (type: string)
                |           |     sort order:+
                |           |     Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |           |     Select Operator [SEL_48]
+               |           |     Select Operator [SEL_44]
                |           |        outputColumnNames:["_col0"]
                |           |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |           |        Filter Operator [FIL_89]
+               |           |        Filter Operator [FIL_81]
                |           |           predicate:key is not null (type: boolean)
                |           |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |           |           TableScan [TS_46]
+               |           |           TableScan [TS_42]
                |           |              alias:y
                |           |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |           |<-Reducer 14 [SIMPLE_EDGE]
-               |              Reduce Output Operator [RS_55]
+               |              Reduce Output Operator [RS_48]
                |                 key expressions:_col2 (type: string)
                |                 Map-reduce partition columns:_col2 (type: string)
                |                 sort order:+
                |                 Statistics:Num rows: 288 Data size: 3020 Basic stats: COMPLETE Column stats: NONE
                |                 value expressions:_col1 (type: string)
-               |                 Merge Join Operator [MERGEJOIN_92]
+               |                 Merge Join Operator [MERGEJOIN_84]
                |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                |                 |  keys:{"0":"_col1 (type: string)","1":"_col1 (type: string)"}
                |                 |  outputColumnNames:["_col1","_col2"]
                |                 |  Statistics:Num rows: 288 Data size: 3020 Basic stats: COMPLETE Column stats: NONE
                |                 |<-Map 17 [SIMPLE_EDGE]
-               |                 |  Reduce Output Operator [RS_52]
+               |                 |  Reduce Output Operator [RS_46]
                |                 |     key expressions:_col1 (type: string)
                |                 |     Map-reduce partition columns:_col1 (type: string)
                |                 |     sort order:+
                |                 |     Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                 |     value expressions:_col0 (type: string)
-               |                 |     Select Operator [SEL_45]
+               |                 |     Select Operator [SEL_41]
                |                 |        outputColumnNames:["_col0","_col1"]
                |                 |        Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                 |        Filter Operator [FIL_88]
+               |                 |        Filter Operator [FIL_80]
                |                 |           predicate:(key is not null and value is not null) (type: boolean)
                |                 |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                 |           TableScan [TS_43]
+               |                 |           TableScan [TS_39]
                |                 |              alias:x
                |                 |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                 |<-Reducer 13 [SIMPLE_EDGE]
-               |                    Reduce Output Operator [RS_50]
+               |                    Reduce Output Operator [RS_45]
                |                       key expressions:_col1 (type: string)
                |                       Map-reduce partition columns:_col1 (type: string)
                |                       sort order:+
                |                       Statistics:Num rows: 262 Data size: 2746 Basic stats: COMPLETE Column stats: NONE
-               |                       Select Operator [SEL_42]
+               |                       Select Operator [SEL_38]
                |                          outputColumnNames:["_col1"]
                |                          Statistics:Num rows: 262 Data size: 2746 Basic stats: COMPLETE Column stats: NONE
-               |                          Group By Operator [GBY_41]
+               |                          Group By Operator [GBY_37]
                |                          |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                |                          |  outputColumnNames:["_col0","_col1"]
                |                          |  Statistics:Num rows: 262 Data size: 2746 Basic stats: COMPLETE Column stats: NONE
                |                          |<-Union 12 [SIMPLE_EDGE]
                |                             |<-Map 11 [CONTAINS]
-               |                             |  Reduce Output Operator [RS_40]
+               |                             |  Reduce Output Operator [RS_36]
                |                             |     key expressions:_col0 (type: string), _col1 (type: string)
                |                             |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                             |     sort order:++
                |                             |     Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                             |     Group By Operator [GBY_39]
+               |                             |     Group By Operator [GBY_35]
                |                             |        keys:_col0 (type: string), _col1 (type: string)
                |                             |        outputColumnNames:["_col0","_col1"]
                |                             |        Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                             |        Select Operator [SEL_32]
+               |                             |        Select Operator [SEL_28]
                |                             |           outputColumnNames:["_col0","_col1"]
                |                             |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                             |           Filter Operator [FIL_86]
+               |                             |           Filter Operator [FIL_78]
                |                             |              predicate:value is not null (type: boolean)
                |                             |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                             |              TableScan [TS_30]
+               |                             |              TableScan [TS_26]
                |                             |                 alias:x
                |                             |                 Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                             |<-Map 16 [CONTAINS]
-               |                                Reduce Output Operator [RS_40]
+               |                                Reduce Output Operator [RS_36]
                |                                   key expressions:_col0 (type: string), _col1 (type: string)
                |                                   Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                   sort order:++
                |                                   Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                   Group By Operator [GBY_39]
+               |                                   Group By Operator [GBY_35]
                |                                      keys:_col0 (type: string), _col1 (type: string)
                |                                      outputColumnNames:["_col0","_col1"]
                |                                      Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                      Select Operator [SEL_35]
+               |                                      Select Operator [SEL_31]
                |                                         outputColumnNames:["_col0","_col1"]
                |                                         Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                         Filter Operator [FIL_87]
+               |                                         Filter Operator [FIL_79]
                |                                            predicate:value is not null (type: boolean)
                |                                            Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                            TableScan [TS_33]
+               |                                            TableScan [TS_29]
                |                                               alias:y
                |                                               Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [CONTAINS]
-                  Reduce Output Operator [RS_64]
+                  Reduce Output Operator [RS_56]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_63]
+                     Group By Operator [GBY_55]
                         keys:_col0 (type: string), _col1 (type: string)
                         outputColumnNames:["_col0","_col1"]
                         Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                        Select Operator [SEL_29]
+                        Select Operator [SEL_25]
                            outputColumnNames:["_col0","_col1"]
                            Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_91]
+                           Merge Join Operator [MERGEJOIN_83]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                            |  outputColumnNames:["_col1","_col2"]
                            |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 10 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_27]
+                           |  Reduce Output Operator [RS_23]
                            |     key expressions:_col0 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string)
                            |     sort order:+
@@ -765,26 +765,26 @@ Stage-0
                            |     Select Operator [SEL_18]
                            |        outputColumnNames:["_col0"]
                            |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_85]
+                           |        Filter Operator [FIL_77]
                            |           predicate:key is not null (type: boolean)
                            |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                            |           TableScan [TS_16]
                            |              alias:y
                            |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 4 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_25]
+                              Reduce Output Operator [RS_22]
                                  key expressions:_col2 (type: string)
                                  Map-reduce partition columns:_col2 (type: string)
                                  sort order:+
                                  Statistics:Num rows: 288 Data size: 3020 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col1 (type: string)
-                                 Merge Join Operator [MERGEJOIN_90]
+                                 Merge Join Operator [MERGEJOIN_82]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col1 (type: string)","1":"_col1 (type: string)"}
                                  |  outputColumnNames:["_col1","_col2"]
                                  |  Statistics:Num rows: 288 Data size: 3020 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 9 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_22]
+                                 |  Reduce Output Operator [RS_20]
                                  |     key expressions:_col1 (type: string)
                                  |     Map-reduce partition columns:_col1 (type: string)
                                  |     sort order:+
@@ -793,14 +793,14 @@ Stage-0
                                  |     Select Operator [SEL_15]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_84]
+                                 |        Filter Operator [FIL_76]
                                  |           predicate:(key is not null and value is not null) (type: boolean)
                                  |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_13]
                                  |              alias:x
                                  |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 3 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_20]
+                                    Reduce Output Operator [RS_19]
                                        key expressions:_col1 (type: string)
                                        Map-reduce partition columns:_col1 (type: string)
                                        sort order:+
@@ -826,7 +826,7 @@ Stage-0
                                              |        Select Operator [SEL_2]
                                              |           outputColumnNames:["_col0","_col1"]
                                              |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                                             |           Filter Operator [FIL_82]
+                                             |           Filter Operator [FIL_74]
                                              |              predicate:value is not null (type: boolean)
                                              |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                                              |              TableScan [TS_0]
@@ -845,7 +845,7 @@ Stage-0
                                                       Select Operator [SEL_5]
                                                          outputColumnNames:["_col0","_col1"]
                                                          Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                                                         Filter Operator [FIL_83]
+                                                         Filter Operator [FIL_75]
                                                             predicate:value is not null (type: boolean)
                                                             Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                                                             TableScan [TS_3]
@@ -910,378 +910,378 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 9
-         File Output Operator [FS_134]
+         File Output Operator [FS_122]
             compressed:false
             Statistics:Num rows: 550 Data size: 5843 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_132]
+            Group By Operator [GBY_120]
             |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
             |  outputColumnNames:["_col0","_col1"]
             |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             |<-Union 8 [SIMPLE_EDGE]
                |<-Reducer 32 [CONTAINS]
-               |  Reduce Output Operator [RS_131]
+               |  Reduce Output Operator [RS_119]
                |     key expressions:_col0 (type: string), _col1 (type: string)
                |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |     sort order:++
                |     Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-               |     Group By Operator [GBY_130]
+               |     Group By Operator [GBY_118]
                |        keys:_col0 (type: string), _col1 (type: string)
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-               |        Select Operator [SEL_126]
+               |        Select Operator [SEL_114]
                |           outputColumnNames:["_col0","_col1"]
                |           Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-               |           Merge Join Operator [MERGEJOIN_182]
+               |           Merge Join Operator [MERGEJOIN_170]
                |           |  condition map:[{"":"Inner Join 0 to 1"}]
                |           |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                |           |  outputColumnNames:["_col2","_col5"]
                |           |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                |           |<-Map 37 [SIMPLE_EDGE]
-               |           |  Reduce Output Operator [RS_124]
+               |           |  Reduce Output Operator [RS_112]
                |           |     key expressions:_col0 (type: string)
                |           |     Map-reduce partition columns:_col0 (type: string)
                |           |     sort order:+
                |           |     Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |           |     value expressions:_col1 (type: string)
-               |           |     Select Operator [SEL_115]
+               |           |     Select Operator [SEL_107]
                |           |        outputColumnNames:["_col0","_col1"]
                |           |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |           |        Filter Operator [FIL_176]
+               |           |        Filter Operator [FIL_164]
                |           |           predicate:key is not null (type: boolean)
                |           |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |           |           TableScan [TS_113]
+               |           |           TableScan [TS_105]
                |           |              alias:y
                |           |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |           |<-Reducer 31 [SIMPLE_EDGE]
-               |              Reduce Output Operator [RS_122]
+               |              Reduce Output Operator [RS_111]
                |                 key expressions:_col2 (type: string)
                |                 Map-reduce partition columns:_col2 (type: string)
                |                 sort order:+
                |                 Statistics:Num rows: 484 Data size: 5131 Basic stats: COMPLETE Column stats: NONE
-               |                 Merge Join Operator [MERGEJOIN_181]
+               |                 Merge Join Operator [MERGEJOIN_169]
                |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                |                 |  keys:{"0":"_col1 (type: string)","1":"_col1 (type: string)"}
                |                 |  outputColumnNames:["_col2"]
                |                 |  Statistics:Num rows: 484 Data size: 5131 Basic stats: COMPLETE Column stats: NONE
                |                 |<-Map 36 [SIMPLE_EDGE]
-               |                 |  Reduce Output Operator [RS_119]
+               |                 |  Reduce Output Operator [RS_109]
                |                 |     key expressions:_col1 (type: string)
                |                 |     Map-reduce partition columns:_col1 (type: string)
                |                 |     sort order:+
                |                 |     Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                 |     value expressions:_col0 (type: string)
-               |                 |     Select Operator [SEL_112]
+               |                 |     Select Operator [SEL_104]
                |                 |        outputColumnNames:["_col0","_col1"]
                |                 |        Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                 |        Filter Operator [FIL_175]
+               |                 |        Filter Operator [FIL_163]
                |                 |           predicate:(key is not null and value is not null) (type: boolean)
                |                 |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                 |           TableScan [TS_110]
+               |                 |           TableScan [TS_102]
                |                 |              alias:x
                |                 |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                 |<-Reducer 30 [SIMPLE_EDGE]
-               |                    Reduce Output Operator [RS_117]
+               |                    Reduce Output Operator [RS_108]
                |                       key expressions:_col1 (type: string)
                |                       Map-reduce partition columns:_col1 (type: string)
                |                       sort order:+
                |                       Statistics:Num rows: 440 Data size: 4665 Basic stats: COMPLETE Column stats: NONE
-               |                       Select Operator [SEL_109]
+               |                       Select Operator [SEL_101]
                |                          outputColumnNames:["_col1"]
                |                          Statistics:Num rows: 440 Data size: 4665 Basic stats: COMPLETE Column stats: NONE
-               |                          Group By Operator [GBY_108]
+               |                          Group By Operator [GBY_100]
                |                          |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                |                          |  outputColumnNames:["_col0","_col1"]
                |                          |  Statistics:Num rows: 440 Data size: 4665 Basic stats: COMPLETE Column stats: NONE
                |                          |<-Union 29 [SIMPLE_EDGE]
                |                             |<-Map 35 [CONTAINS]
-               |                             |  Reduce Output Operator [RS_107]
+               |                             |  Reduce Output Operator [RS_99]
                |                             |     key expressions:_col0 (type: string), _col1 (type: string)
                |                             |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                             |     sort order:++
                |                             |     Statistics:Num rows: 881 Data size: 9341 Basic stats: COMPLETE Column stats: NONE
-               |                             |     Group By Operator [GBY_106]
+               |                             |     Group By Operator [GBY_98]
                |                             |        keys:_col0 (type: string), _col1 (type: string)
                |                             |        outputColumnNames:["_col0","_col1"]
                |                             |        Statistics:Num rows: 881 Data size: 9341 Basic stats: COMPLETE Column stats: NONE
-               |                             |        Select Operator [SEL_102]
+               |                             |        Select Operator [SEL_94]
                |                             |           outputColumnNames:["_col0","_col1"]
                |                             |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                             |           Filter Operator [FIL_174]
+               |                             |           Filter Operator [FIL_162]
                |                             |              predicate:value is not null (type: boolean)
                |                             |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                             |              TableScan [TS_100]
+               |                             |              TableScan [TS_92]
                |                             |                 alias:y
                |                             |                 Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |                             |<-Reducer 28 [CONTAINS]
-               |                                Reduce Output Operator [RS_107]
+               |                                Reduce Output Operator [RS_99]
                |                                   key expressions:_col0 (type: string), _col1 (type: string)
                |                                   Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                   sort order:++
                |                                   Statistics:Num rows: 881 Data size: 9341 Basic stats: COMPLETE Column stats: NONE
-               |                                   Group By Operator [GBY_106]
+               |                                   Group By Operator [GBY_98]
                |                                      keys:_col0 (type: string), _col1 (type: string)
                |                                      outputColumnNames:["_col0","_col1"]
                |                                      Statistics:Num rows: 881 Data size: 9341 Basic stats: COMPLETE Column stats: NONE
-               |                                      Group By Operator [GBY_98]
+               |                                      Group By Operator [GBY_90]
                |                                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                |                                      |  outputColumnNames:["_col0","_col1"]
                |                                      |  Statistics:Num rows: 381 Data size: 4029 Basic stats: COMPLETE Column stats: NONE
                |                                      |<-Union 27 [SIMPLE_EDGE]
                |                                         |<-Map 34 [CONTAINS]
-               |                                         |  Reduce Output Operator [RS_97]
+               |                                         |  Reduce Output Operator [RS_89]
                |                                         |     key expressions:_col0 (type: string), _col1 (type: string)
                |                                         |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                         |     sort order:++
                |                                         |     Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-               |                                         |     Group By Operator [GBY_96]
+               |                                         |     Group By Operator [GBY_88]
                |                                         |        keys:_col0 (type: string), _col1 (type: string)
                |                                         |        outputColumnNames:["_col0","_col1"]
                |                                         |        Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-               |                                         |        Select Operator [SEL_92]
+               |                                         |        Select Operator [SEL_84]
                |                                         |           outputColumnNames:["_col0","_col1"]
                |                                         |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                         |           Filter Operator [FIL_173]
+               |                                         |           Filter Operator [FIL_161]
                |                                         |              predicate:value is not null (type: boolean)
                |                                         |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                         |              TableScan [TS_90]
+               |                                         |              TableScan [TS_82]
                |                                         |                 alias:y
                |                                         |                 Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |                                         |<-Reducer 26 [CONTAINS]
-               |                                            Reduce Output Operator [RS_97]
+               |                                            Reduce Output Operator [RS_89]
                |                                               key expressions:_col0 (type: string), _col1 (type: string)
                |                                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                               sort order:++
                |                                               Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-               |                                               Group By Operator [GBY_96]
+               |                                               Group By Operator [GBY_88]
                |                                                  keys:_col0 (type: string), _col1 (type: string)
                |                                                  outputColumnNames:["_col0","_col1"]
                |                                                  Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-               |                                                  Group By Operator [GBY_88]
+               |                                                  Group By Operator [GBY_80]
                |                                                  |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                |                                                  |  outputColumnNames:["_col0","_col1"]
                |                                                  |  Statistics:Num rows: 262 Data size: 2746 Basic stats: COMPLETE Column stats: NONE
                |                                                  |<-Union 25 [SIMPLE_EDGE]
                |                                                     |<-Map 24 [CONTAINS]
-               |                                                     |  Reduce Output Operator [RS_87]
+               |                                                     |  Reduce Output Operator [RS_79]
                |                                                     |     key expressions:_col0 (type: string), _col1 (type: string)
                |                                                     |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                                     |     sort order:++
                |                                                     |     Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                                     |     Group By Operator [GBY_86]
+               |                                                     |     Group By Operator [GBY_78]
                |                                                     |        keys:_col0 (type: string), _col1 (type: string)
                |                                                     |        outputColumnNames:["_col0","_col1"]
                |                                                     |        Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                                     |        Select Operator [SEL_79]
+               |                                                     |        Select Operator [SEL_71]
                |                                                     |           outputColumnNames:["_col0","_col1"]
                |                                                     |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                                                     |           Filter Operator [FIL_171]
+               |                                                     |           Filter Operator [FIL_159]
                |                                                     |              predicate:value is not null (type: boolean)
                |                                                     |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-               |                                                     |              TableScan [TS_77]
+               |                                                     |              TableScan [TS_69]
                |                                                     |                 alias:x
                |                                                     |                 Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                |                                                     |<-Map 33 [CONTAINS]
-               |                                                        Reduce Output Operator [RS_87]
+               |                                                        Reduce Output Operator [RS_79]
                |                                                           key expressions:_col0 (type: string), _col1 (type: string)
                |                                                           Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                |                                                           sort order:++
                |                                                           Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                                           Group By Operator [GBY_86]
+               |                                                           Group By Operator [GBY_78]
                |                                                              keys:_col0 (type: string), _col1 (type: string)
                |                                                              outputColumnNames:["_col0","_col1"]
                |                                                              Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-               |                                                              Select Operator [SEL_82]
+               |                                                              Select Operator [SEL_74]
                |                                                                 outputColumnNames:["_col0","_col1"]
                |                                                                 Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                                                 Filter Operator [FIL_172]
+               |                                                                 Filter Operator [FIL_160]
                |                                                                    predicate:value is not null (type: boolean)
                |                                                                    Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-               |                                                                    TableScan [TS_80]
+               |                                                                    TableScan [TS_72]
                |                                                                       alias:y
                |                                                                       Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 7 [CONTAINS]
-                  Reduce Output Operator [RS_131]
+                  Reduce Output Operator [RS_119]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_130]
+                     Group By Operator [GBY_118]
                         keys:_col0 (type: string), _col1 (type: string)
                         outputColumnNames:["_col0","_col1"]
                         Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_75]
+                        Group By Operator [GBY_67]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                         |  outputColumnNames:["_col0","_col1"]
                         |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                         |<-Union 6 [SIMPLE_EDGE]
                            |<-Reducer 19 [CONTAINS]
-                           |  Reduce Output Operator [RS_74]
+                           |  Reduce Output Operator [RS_66]
                            |     key expressions:_col0 (type: string), _col1 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            |     sort order:++
                            |     Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                           |     Group By Operator [GBY_73]
+                           |     Group By Operator [GBY_65]
                            |        keys:_col0 (type: string), _col1 (type: string)
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                           |        Select Operator [SEL_69]
+                           |        Select Operator [SEL_61]
                            |           outputColumnNames:["_col0","_col1"]
                            |           Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                           |           Merge Join Operator [MERGEJOIN_180]
+                           |           Merge Join Operator [MERGEJOIN_168]
                            |           |  condition map:[{"":"Inner Join 0 to 1"}]
                            |           |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                            |           |  outputColumnNames:["_col2","_col5"]
                            |           |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                            |           |<-Map 23 [SIMPLE_EDGE]
-                           |           |  Reduce Output Operator [RS_67]
+                           |           |  Reduce Output Operator [RS_59]
                            |           |     key expressions:_col0 (type: string)
                            |           |     Map-reduce partition columns:_col0 (type: string)
                            |           |     sort order:+
                            |           |     Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                            |           |     value expressions:_col1 (type: string)
-                           |           |     Select Operator [SEL_58]
+                           |           |     Select Operator [SEL_54]
                            |           |        outputColumnNames:["_col0","_col1"]
                            |           |        Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                           |           |        Filter Operator [FIL_170]
+                           |           |        Filter Operator [FIL_158]
                            |           |           predicate:key is not null (type: boolean)
                            |           |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                           |           |           TableScan [TS_56]
+                           |           |           TableScan [TS_52]
                            |           |              alias:y
                            |           |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                            |           |<-Reducer 18 [SIMPLE_EDGE]
-                           |              Reduce Output Operator [RS_65]
+                           |              Reduce Output Operator [RS_58]
                            |                 key expressions:_col2 (type: string)
                            |                 Map-reduce partition columns:_col2 (type: string)
                            |                 sort order:+
                            |                 Statistics:Num rows: 419 Data size: 4431 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_179]
+                           |                 Merge Join Operator [MERGEJOIN_167]
                            |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |  keys:{"0":"_col1 (type: string)","1":"_col1 (type: string)"}
                            |                 |  outputColumnNames:["_col2"]
                            |                 |  Statistics:Num rows: 419 Data size: 4431 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Map 22 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_62]
+                           |                 |  Reduce Output Operator [RS_56]
                            |                 |     key expressions:_col1 (type: string)
                            |                 |     Map-reduce partition columns:_col1 (type: string)
                            |                 |     sort order:+
                            |                 |     Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                            |                 |     value expressions:_col0 (type: string)
-                           |                 |     Select Operator [SEL_55]
+                           |                 |     Select Operator [SEL_51]
                            |                 |        outputColumnNames:["_col0","_col1"]
                            |                 |        Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                           |                 |        Filter Operator [FIL_169]
+                           |                 |        Filter Operator [FIL_157]
                            |                 |           predicate:(key is not null and value is not null) (type: boolean)
                            |                 |           Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                           |                 |           TableScan [TS_53]
+                           |                 |           TableScan [TS_49]
                            |                 |              alias:x
                            |                 |              Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Reducer 17 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_60]
+                           |                    Reduce Output Operator [RS_55]
                            |                       key expressions:_col1 (type: string)
                            |                       Map-reduce partition columns:_col1 (type: string)
                            |                       sort order:+
                            |                       Statistics:Num rows: 381 Data size: 4029 Basic stats: COMPLETE Column stats: NONE
-                           |                       Select Operator [SEL_52]
+                           |                       Select Operator [SEL_48]
                            |                          outputColumnNames:["_col1"]
                            |                          Statistics:Num rows: 381 Data size: 4029 Basic stats: COMPLETE Column stats: NONE
-                           |                          Group By Operator [GBY_51]
+                           |                          Group By Operator [GBY_47]
                            |                          |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                            |                          |  outputColumnNames:["_col0","_col1"]
                            |                          |  Statistics:Num rows: 381 Data size: 4029 Basic stats: COMPLETE Column stats: NONE
                            |                          |<-Union 16 [SIMPLE_EDGE]
                            |                             |<-Map 21 [CONTAINS]
-                           |                             |  Reduce Output Operator [RS_50]
+                           |                             |  Reduce Output Operator [RS_46]
                            |                             |     key expressions:_col0 (type: string), _col1 (type: string)
                            |                             |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            |                             |     sort order:++
                            |                             |     Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-                           |                             |     Group By Operator [GBY_49]
+                           |                             |     Group By Operator [GBY_45]
                            |                             |        keys:_col0 (type: string), _col1 (type: string)
                            |                             |        outputColumnNames:["_col0","_col1"]
                            |                             |        Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-                           |                             |        Select Operator [SEL_45]
+                           |                             |        Select Operator [SEL_41]
                            |                             |           outputColumnNames:["_col0","_col1"]
                            |                             |           Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                           |                             |           Filter Operator [FIL_168]
+                           |                             |           Filter Operator [FIL_156]
                            |                             |              predicate:value is not null (type: boolean)
                            |                             |              Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                           |                             |              TableScan [TS_43]
+                           |                             |              TableScan [TS_39]
                            |                             |                 alias:y
                            |                             |                 Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                            |                             |<-Reducer 15 [CONTAINS]
-                           |                                Reduce Output Operator [RS_50]
+                           |                                Reduce Output Operator [RS_46]
                            |                                   key expressions:_col0 (type: string), _col1 (type: string)
                            |                                   Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            |                                   sort order:++
                            |                                   Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-                           |                                   Group By Operator [GBY_49]
+                           |                                   Group By Operator [GBY_45]
                            |                                      keys:_col0 (type: string), _col1 (type: string)
                            |                                      outputColumnNames:["_col0","_col1"]
                            |                                      Statistics:Num rows: 762 Data size: 8058 Basic stats: COMPLETE Column stats: NONE
-                           |                                      Group By Operator [GBY_41]
+                           |                                      Group By Operator [GBY_37]
                            |                                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                            |                                      |  outputColumnNames:["_col0","_col1"]
                            |                                      |  Statistics:Num rows: 262 Data size: 2746 Basic stats: COMPLETE Column stats: NONE
                            |                                      |<-Union 14 [SIMPLE_EDGE]
                            |                                         |<-Map 13 [CONTAINS]
-                           |                                         |  Reduce Output Operator [RS_40]
+                           |                                         |  Reduce Output Operator [RS_36]
                            |                                         |     key expressions:_col0 (type: string), _col1 (type: string)
                            |                                         |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            |                                         |     sort order:++
                            |                                         |     Statistics:Num rows: 525 Data size: 5503 Basic stats: COMPLETE Column stats: NONE
-                           |                                         |     Group By Operator [GBY_39]
+                           |                                       

<TRUNCATED>

[22/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query51.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query51.q.out b/ql/src/test/results/clientpositive/perf/query51.q.out
index a5b5f5e..efd95f2 100644
--- a/ql/src/test/results/clientpositive/perf/query51.q.out
+++ b/ql/src/test/results/clientpositive/perf/query51.q.out
@@ -100,156 +100,156 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_55]
+         File Output Operator [FS_51]
             compressed:false
             Statistics:Num rows: 100 Data size: 111900 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_54]
+            Limit [LIM_50]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 111900 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_53]
+               Select Operator [SEL_49]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 7365 Data size: 8241815 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_52]
+                  Reduce Output Operator [RS_48]
                      key expressions:_col0 (type: int), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 7365 Data size: 8241815 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(27,2)), _col3 (type: decimal(27,2)), _col4 (type: decimal(27,2)), _col5 (type: decimal(27,2))
-                     Select Operator [SEL_48]
+                     Select Operator [SEL_44]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Statistics:Num rows: 7365 Data size: 8241815 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_60]
+                        Filter Operator [FIL_56]
                            predicate:(max_window_0 > max_window_1) (type: boolean)
                            Statistics:Num rows: 7365 Data size: 8241815 Basic stats: COMPLETE Column stats: NONE
-                           PTF Operator [PTF_47]
+                           PTF Operator [PTF_43]
                               Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"CASE WHEN (_col1 is not null) THEN (_col1) ELSE (_col4) END","partition by:":"CASE WHEN (_col0 is not null) THEN (_col0) ELSE (_col3) END"}]
                               Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_46]
+                              Select Operator [SEL_42]
                               |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                               |  Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 4 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_45]
+                                 Reduce Output Operator [RS_41]
                                     key expressions:CASE WHEN (_col0 is not null) THEN (_col0) ELSE (_col3) END (type: int), CASE WHEN (_col1 is not null) THEN (_col1) ELSE (_col4) END (type: string)
                                     Map-reduce partition columns:CASE WHEN (_col0 is not null) THEN (_col0) ELSE (_col3) END (type: int)
                                     sort order:++
                                     Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col0 (type: int), _col1 (type: string), _col2 (type: decimal(27,2)), _col3 (type: int), _col4 (type: string), _col5 (type: decimal(27,2))
-                                    Merge Join Operator [MERGEJOIN_69]
+                                    Merge Join Operator [MERGEJOIN_65]
                                     |  condition map:[{"":"Outer Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: int), _col1 (type: string)","1":"_col0 (type: int), _col1 (type: string)"}
                                     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 10 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_43]
+                                    |  Reduce Output Operator [RS_39]
                                     |     key expressions:_col0 (type: int), _col1 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: int), _col1 (type: string)
                                     |     sort order:++
                                     |     Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col2 (type: decimal(27,2))
-                                    |     Select Operator [SEL_39]
+                                    |     Select Operator [SEL_35]
                                     |        outputColumnNames:["_col0","_col1","_col2"]
                                     |        Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                    |        PTF Operator [PTF_38]
+                                    |        PTF Operator [PTF_34]
                                     |           Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col1","partition by:":"_col0"}]
                                     |           Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                    |           Group By Operator [GBY_35]
+                                    |           Group By Operator [GBY_31]
                                     |           |  aggregations:["sum(VALUE._col0)"]
                                     |           |  keys:KEY._col0 (type: int), KEY._col1 (type: string)
                                     |           |  outputColumnNames:["_col0","_col1","_col2"]
                                     |           |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |           |<-Reducer 9 [SIMPLE_EDGE]
-                                    |              Reduce Output Operator [RS_34]
+                                    |              Reduce Output Operator [RS_30]
                                     |                 key expressions:_col0 (type: int), _col1 (type: string)
                                     |                 Map-reduce partition columns:_col0 (type: int)
                                     |                 sort order:++
                                     |                 Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                     |                 value expressions:_col2 (type: decimal(17,2))
-                                    |                 Group By Operator [GBY_33]
+                                    |                 Group By Operator [GBY_29]
                                     |                    aggregations:["sum(_col2)"]
                                     |                    keys:_col1 (type: int), _col4 (type: string)
                                     |                    outputColumnNames:["_col0","_col1","_col2"]
                                     |                    Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                    |                    Select Operator [SEL_32]
+                                    |                    Select Operator [SEL_28]
                                     |                       outputColumnNames:["_col1","_col4","_col2"]
                                     |                       Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                    |                       Merge Join Operator [MERGEJOIN_68]
+                                    |                       Merge Join Operator [MERGEJOIN_64]
                                     |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                       |  outputColumnNames:["_col1","_col2","_col4"]
                                     |                       |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 11 [SIMPLE_EDGE]
-                                    |                       |  Reduce Output Operator [RS_30]
+                                    |                       |  Reduce Output Operator [RS_26]
                                     |                       |     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
                                     |                       |     value expressions:_col1 (type: string)
-                                    |                       |     Select Operator [SEL_26]
+                                    |                       |     Select Operator [SEL_24]
                                     |                       |        outputColumnNames:["_col0","_col1"]
                                     |                       |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                       |        Filter Operator [FIL_64]
+                                    |                       |        Filter Operator [FIL_60]
                                     |                       |           predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                     |                       |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                       |           TableScan [TS_24]
+                                    |                       |           TableScan [TS_22]
                                     |                       |              alias:date_dim
                                     |                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 8 [SIMPLE_EDGE]
-                                    |                          Reduce Output Operator [RS_28]
+                                    |                          Reduce Output Operator [RS_25]
                                     |                             key expressions:_col0 (type: int)
                                     |                             Map-reduce partition columns:_col0 (type: int)
                                     |                             sort order:+
                                     |                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                             value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                    |                             Select Operator [SEL_23]
+                                    |                             Select Operator [SEL_21]
                                     |                                outputColumnNames:["_col0","_col1","_col2"]
                                     |                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                                Filter Operator [FIL_63]
+                                    |                                Filter Operator [FIL_59]
                                     |                                   predicate:(ss_item_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_21]
+                                    |                                   TableScan [TS_19]
                                     |                                      alias:store_sales
                                     |                                      Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |<-Reducer 3 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_42]
+                                       Reduce Output Operator [RS_38]
                                           key expressions:_col0 (type: int), _col1 (type: string)
                                           Map-reduce partition columns:_col0 (type: int), _col1 (type: string)
                                           sort order:++
                                           Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col2 (type: decimal(27,2))
-                                          Select Operator [SEL_18]
+                                          Select Operator [SEL_16]
                                              outputColumnNames:["_col0","_col1","_col2"]
                                              Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                             PTF Operator [PTF_17]
+                                             PTF Operator [PTF_15]
                                                 Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col1","partition by:":"_col0"}]
                                                 Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                                Group By Operator [GBY_14]
+                                                Group By Operator [GBY_12]
                                                 |  aggregations:["sum(VALUE._col0)"]
                                                 |  keys:KEY._col0 (type: int), KEY._col1 (type: string)
                                                 |  outputColumnNames:["_col0","_col1","_col2"]
                                                 |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_13]
+                                                   Reduce Output Operator [RS_11]
                                                       key expressions:_col0 (type: int), _col1 (type: string)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:++
                                                       Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col2 (type: decimal(17,2))
-                                                      Group By Operator [GBY_12]
+                                                      Group By Operator [GBY_10]
                                                          aggregations:["sum(_col2)"]
                                                          keys:_col1 (type: int), _col4 (type: string)
                                                          outputColumnNames:["_col0","_col1","_col2"]
                                                          Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                                         Select Operator [SEL_11]
+                                                         Select Operator [SEL_9]
                                                             outputColumnNames:["_col1","_col4","_col2"]
                                                             Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                                            Merge Join Operator [MERGEJOIN_67]
+                                                            Merge Join Operator [MERGEJOIN_63]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col1","_col2","_col4"]
                                                             |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 1 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_7]
+                                                            |  Reduce Output Operator [RS_6]
                                                             |     key expressions:_col0 (type: int)
                                                             |     Map-reduce partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -258,14 +258,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_61]
+                                                            |        Filter Operator [FIL_57]
                                                             |           predicate:(ws_item_sk is not null and ws_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:web_sales
                                                             |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                             |<-Map 7 [SIMPLE_EDGE]
-                                                               Reduce Output Operator [RS_9]
+                                                               Reduce Output Operator [RS_7]
                                                                   key expressions:_col0 (type: int)
                                                                   Map-reduce partition columns:_col0 (type: int)
                                                                   sort order:+
@@ -274,7 +274,7 @@ Stage-0
                                                                   Select Operator [SEL_5]
                                                                      outputColumnNames:["_col0","_col1"]
                                                                      Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                                     Filter Operator [FIL_62]
+                                                                     Filter Operator [FIL_58]
                                                                         predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                                         Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                         TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query52.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query52.q.out b/ql/src/test/results/clientpositive/perf/query52.q.out
index ac0c1e6..63f0bf6 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.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:["_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_manager_id = 1) 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: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_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:["_col4","_col5"]
                                        |  Statistics:Num rows: 20088 Data size: 22478696 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:+
@@ -93,14 +93,14 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_34]
+                                       |        Filter Operator [FIL_30]
                                        |           predicate:(((d_year = 1998) and (d_moy = 12)) and d_date_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 18262 Data size: 20435178 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:+
@@ -109,7 +109,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]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query54.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query54.q.out b/ql/src/test/results/clientpositive/perf/query54.q.out
index 8ccb868..56c70b7 100644
--- a/ql/src/test/results/clientpositive/perf/query54.q.out
+++ b/ql/src/test/results/clientpositive/perf/query54.q.out
@@ -24,193 +24,193 @@ Stage-0
       limit:100
       Stage-1
          Reducer 13
-         File Output Operator [FS_82]
+         File Output Operator [FS_68]
             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_81]
+            Limit [LIM_67]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_80]
+               Select Operator [SEL_66]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 16105101 Data size: 13850712636 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 12 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_79]
+                  Reduce Output Operator [RS_65]
                      key expressions:_col0 (type: int), _col1 (type: bigint)
                      sort order:++
                      Statistics:Num rows: 16105101 Data size: 13850712636 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: int)
-                     Select Operator [SEL_78]
+                     Select Operator [SEL_64]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 16105101 Data size: 13850712636 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_77]
+                        Group By Operator [GBY_63]
                         |  aggregations:["count(VALUE._col0)"]
                         |  keys:KEY._col0 (type: int)
                         |  outputColumnNames:["_col0","_col1"]
                         |  Statistics:Num rows: 16105101 Data size: 13850712636 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 11 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_76]
+                           Reduce Output Operator [RS_62]
                               key expressions:_col0 (type: int)
                               Map-reduce partition columns:_col0 (type: int)
                               sort order:+
                               Statistics:Num rows: 32210202 Data size: 27701425272 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col1 (type: bigint)
-                              Group By Operator [GBY_75]
+                              Group By Operator [GBY_61]
                                  aggregations:["count()"]
                                  keys:_col0 (type: int)
                                  outputColumnNames:["_col0","_col1"]
                                  Statistics:Num rows: 32210202 Data size: 27701425272 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_73]
+                                 Select Operator [SEL_59]
                                     outputColumnNames:["_col0"]
                                     Statistics:Num rows: 32210202 Data size: 27701425272 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_72]
+                                    Group By Operator [GBY_58]
                                     |  aggregations:["sum(VALUE._col0)"]
                                     |  keys:KEY._col0 (type: int)
                                     |  outputColumnNames:["_col0","_col1"]
                                     |  Statistics:Num rows: 32210202 Data size: 27701425272 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 10 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_71]
+                                       Reduce Output Operator [RS_57]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 64420404 Data size: 55402850544 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col1 (type: decimal(17,2))
-                                          Group By Operator [GBY_70]
+                                          Group By Operator [GBY_56]
                                              aggregations:["sum(_col4)"]
                                              keys:_col0 (type: int)
                                              outputColumnNames:["_col0","_col1"]
                                              Statistics:Num rows: 64420404 Data size: 55402850544 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_140]
+                                             Merge Join Operator [MERGEJOIN_126]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col0","_col4"]
                                              |  Statistics:Num rows: 64420404 Data size: 55402850544 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 21 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_67]
+                                             |  Reduce Output Operator [RS_53]
                                              |     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_48]
+                                             |     Select Operator [SEL_42]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_133]
+                                             |        Filter Operator [FIL_119]
                                              |           predicate:(d_month_seq BETWEEN 1203 AND 1205 and d_date_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |           TableScan [TS_46]
+                                             |           TableScan [TS_40]
                                              |              alias:date_dim
                                              |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 9 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_65]
+                                                Reduce Output Operator [RS_52]
                                                    key expressions:_col2 (type: int)
                                                    Map-reduce partition columns:_col2 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 58564003 Data size: 50366226676 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col0 (type: int), _col4 (type: decimal(7,2))
-                                                   Merge Join Operator [MERGEJOIN_139]
+                                                   Merge Join Operator [MERGEJOIN_125]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col6 (type: string), _col7 (type: string)","1":"_col0 (type: string), _col1 (type: string)"}
                                                    |  outputColumnNames:["_col0","_col2","_col4"]
                                                    |  Statistics:Num rows: 58564003 Data size: 50366226676 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 20 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_62]
+                                                   |  Reduce Output Operator [RS_50]
                                                    |     key expressions:_col0 (type: string), _col1 (type: string)
                                                    |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                                                    |     sort order:++
                                                    |     Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                   |     Select Operator [SEL_45]
+                                                   |     Select Operator [SEL_39]
                                                    |        outputColumnNames:["_col0","_col1"]
                                                    |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator [FIL_132]
+                                                   |        Filter Operator [FIL_118]
                                                    |           predicate:(s_county is not null and s_state is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                   |           TableScan [TS_43]
+                                                   |           TableScan [TS_37]
                                                    |              alias:store
                                                    |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Reducer 8 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_60]
+                                                      Reduce Output Operator [RS_49]
                                                          key expressions:_col6 (type: string), _col7 (type: string)
                                                          Map-reduce partition columns:_col6 (type: string), _col7 (type: string)
                                                          sort order:++
                                                          Statistics:Num rows: 53240002 Data size: 45787477804 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col0 (type: int), _col2 (type: int), _col4 (type: decimal(7,2))
-                                                         Merge Join Operator [MERGEJOIN_138]
+                                                         Merge Join Operator [MERGEJOIN_124]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col0","_col2","_col4","_col6","_col7"]
                                                          |  Statistics:Num rows: 53240002 Data size: 45787477804 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 19 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_57]
+                                                         |  Reduce Output Operator [RS_47]
                                                          |     key expressions:_col0 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int)
                                                          |     sort order:+
                                                          |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                          |     value expressions:_col1 (type: string), _col2 (type: string)
-                                                         |     Select Operator [SEL_42]
+                                                         |     Select Operator [SEL_36]
                                                          |        outputColumnNames:["_col0","_col1","_col2"]
                                                          |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_131]
+                                                         |        Filter Operator [FIL_117]
                                                          |           predicate:((ca_address_sk is not null and ca_state is not null) and ca_county is not null) (type: boolean)
                                                          |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                                         |           TableScan [TS_40]
+                                                         |           TableScan [TS_34]
                                                          |              alias:customer_address
                                                          |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 7 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_55]
+                                                            Reduce Output Operator [RS_46]
                                                                key expressions:_col1 (type: int)
                                                                Map-reduce partition columns:_col1 (type: int)
                                                                sort order:+
                                                                Statistics:Num rows: 48400001 Data size: 41624978920 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col0 (type: int), _col2 (type: int), _col4 (type: decimal(7,2))
-                                                               Merge Join Operator [MERGEJOIN_137]
+                                                               Merge Join Operator [MERGEJOIN_123]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col1 (type: int)"}
                                                                |  outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                                |  Statistics:Num rows: 48400001 Data size: 41624978920 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 18 [SIMPLE_EDGE]
-                                                               |  Reduce Output Operator [RS_52]
+                                                               |  Reduce Output Operator [RS_44]
                                                                |     key expressions:_col1 (type: int)
                                                                |     Map-reduce partition columns:_col1 (type: int)
                                                                |     sort order:+
                                                                |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                |     value expressions:_col0 (type: int), _col2 (type: decimal(7,2))
-                                                               |     Select Operator [SEL_39]
+                                                               |     Select Operator [SEL_33]
                                                                |        outputColumnNames:["_col0","_col1","_col2"]
                                                                |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               |        Filter Operator [FIL_130]
+                                                               |        Filter Operator [FIL_116]
                                                                |           predicate:(ss_customer_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_37]
+                                                               |           TableScan [TS_31]
                                                                |              alias:store_sales
                                                                |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                |<-Reducer 6 [SIMPLE_EDGE]
-                                                                  Reduce Output Operator [RS_50]
+                                                                  Reduce Output Operator [RS_43]
                                                                      key expressions:_col0 (type: int)
                                                                      Map-reduce partition columns:_col0 (type: int)
                                                                      sort order:+
                                                                      Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
                                                                      value expressions:_col1 (type: int)
-                                                                     Group By Operator [GBY_35]
+                                                                     Group By Operator [GBY_29]
                                                                      |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                                                                      |  outputColumnNames:["_col0","_col1"]
                                                                      |  Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Reducer 5 [SIMPLE_EDGE]
-                                                                        Reduce Output Operator [RS_34]
+                                                                        Reduce Output Operator [RS_28]
                                                                            key expressions:_col0 (type: int), _col1 (type: int)
                                                                            Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                                                            sort order:++
                                                                            Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                                                           Group By Operator [GBY_33]
+                                                                           Group By Operator [GBY_27]
                                                                               keys:_col9 (type: int), _col10 (type: int)
                                                                               outputColumnNames:["_col0","_col1"]
                                                                               Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                                                              Merge Join Operator [MERGEJOIN_136]
+                                                                              Merge Join Operator [MERGEJOIN_122]
                                                                               |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                               |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                                               |  outputColumnNames:["_col9","_col10"]
                                                                               |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                                               |<-Map 17 [SIMPLE_EDGE]
-                                                                              |  Reduce Output Operator [RS_30]
+                                                                              |  Reduce Output Operator [RS_24]
                                                                               |     key expressions:_col0 (type: int)
                                                                               |     Map-reduce partition columns:_col0 (type: int)
                                                                               |     sort order:+
@@ -219,25 +219,25 @@ Stage-0
                                                                               |     Select Operator [SEL_16]
                                                                               |        outputColumnNames:["_col0","_col1"]
                                                                               |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                                                              |        Filter Operator [FIL_129]
+                                                                              |        Filter Operator [FIL_115]
                                                                               |           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_14]
                                                                               |              alias:customer
                                                                               |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                                               |<-Reducer 4 [SIMPLE_EDGE]
-                                                                                 Reduce Output Operator [RS_28]
+                                                                                 Reduce Output Operator [RS_23]
                                                                                     key expressions:_col1 (type: int)
                                                                                     Map-reduce partition columns:_col1 (type: int)
                                                                                     sort order:+
                                                                                     Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
-                                                                                    Merge Join Operator [MERGEJOIN_135]
+                                                                                    Merge Join Operator [MERGEJOIN_121]
                                                                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                                     |  outputColumnNames:["_col1"]
                                                                                     |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                                                                                     |<-Map 16 [SIMPLE_EDGE]
-                                                                                    |  Reduce Output Operator [RS_25]
+                                                                                    |  Reduce Output Operator [RS_21]
                                                                                     |     key expressions:_col0 (type: int)
                                                                                     |     Map-reduce partition columns:_col0 (type: int)
                                                                                     |     sort order:+
@@ -245,26 +245,26 @@ Stage-0
                                                                                     |     Select Operator [SEL_13]
                                                                                     |        outputColumnNames:["_col0"]
                                                                                     |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                                                    |        Filter Operator [FIL_128]
+                                                                                    |        Filter Operator [FIL_114]
                                                                                     |           predicate:(((d_year = 2000) and (d_moy = 3)) and d_date_sk is not null) (type: boolean)
                                                                                     |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                                     |           TableScan [TS_11]
                                                                                     |              alias:date_dim
                                                                                     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                                                     |<-Reducer 3 [SIMPLE_EDGE]
-                                                                                       Reduce Output Operator [RS_23]
+                                                                                       Reduce Output Operator [RS_20]
                                                                                           key expressions:_col0 (type: int)
                                                                                           Map-reduce partition columns:_col0 (type: int)
                                                                                           sort order:+
                                                                                           Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                                                                                           value expressions:_col1 (type: int)
-                                                                                          Merge Join Operator [MERGEJOIN_134]
+                                                                                          Merge Join Operator [MERGEJOIN_120]
                                                                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                           |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                                                           |  outputColumnNames:["_col0","_col1"]
                                                                                           |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                                                                                           |<-Map 15 [SIMPLE_EDGE]
-                                                                                          |  Reduce Output Operator [RS_20]
+                                                                                          |  Reduce Output Operator [RS_18]
                                                                                           |     key expressions:_col0 (type: int)
                                                                                           |     Map-reduce partition columns:_col0 (type: int)
                                                                                           |     sort order:+
@@ -272,7 +272,7 @@ Stage-0
                                                                                           |     Select Operator [SEL_10]
                                                                                           |        outputColumnNames:["_col0"]
                                                                                           |        Statistics:Num rows: 115500 Data size: 165890114 Basic stats: COMPLETE Column stats: NONE
-                                                                                          |        Filter Operator [FIL_127]
+                                                                                          |        Filter Operator [FIL_113]
                                                                                           |           predicate:(((i_category = 'Jewelry') and (i_class = 'football')) and i_item_sk is not null) (type: boolean)
                                                                                           |           Statistics:Num rows: 115500 Data size: 165890114 Basic stats: COMPLETE Column stats: NONE
                                                                                           |           TableScan [TS_8]
@@ -280,7 +280,7 @@ Stage-0
                                                                                           |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                                                           |<-Union 2 [SIMPLE_EDGE]
                                                                                              |<-Map 1 [CONTAINS]
-                                                                                             |  Reduce Output Operator [RS_18]
+                                                                                             |  Reduce Output Operator [RS_17]
                                                                                              |     key expressions:_col2 (type: int)
                                                                                              |     Map-reduce partition columns:_col2 (type: int)
                                                                                              |     sort order:+
@@ -289,14 +289,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_125]
+                                                                                             |        Filter Operator [FIL_111]
                                                                                              |           predicate:((cs_item_sk is not null and cs_sold_date_sk is not null) and cs_bill_customer_sk is not null) (type: boolean)
                                                                                              |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                              |           TableScan [TS_0]
                                                                                              |              alias:catalog_sales
                                                                                              |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                              |<-Map 14 [CONTAINS]
-                                                                                                Reduce Output Operator [RS_18]
+                                                                                                Reduce Output Operator [RS_17]
                                                                                                    key expressions:_col2 (type: int)
                                                                                                    Map-reduce partition columns:_col2 (type: int)
                                                                                                    sort order:+
@@ -305,7 +305,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_126]
+                                                                                                      Filter Operator [FIL_112]
                                                                                                          predicate:((ws_item_sk is not null and ws_sold_date_sk is not null) and ws_bill_customer_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/query55.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query55.q.out b/ql/src/test/results/clientpositive/perf/query55.q.out
index 6b849c6..d36f378 100644
--- a/ql/src/test/results/clientpositive/perf/query55.q.out
+++ b/ql/src/test/results/clientpositive/perf/query55.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"]
                |  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:_col2 (type: decimal(17,2)), _col0 (type: int)
                      sort order:-+
                      Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: string)
-                     Group By Operator [GBY_22]
+                     Group By Operator [GBY_18]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int), KEY._col1 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2"]
                      |  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: string)
                            Map-reduce partition columns:_col0 (type: int), _col1 (type: string)
                            sort order:++
                            Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col2 (type: decimal(17,2))
-                           Group By Operator [GBY_20]
+                           Group By Operator [GBY_16]
                               aggregations:["sum(_col5)"]
                               keys:_col7 (type: int), _col8 (type: string)
                               outputColumnNames:["_col0","_col1","_col2"]
                               Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_19]
+                              Select Operator [SEL_15]
                                  outputColumnNames:["_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:["_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_manager_id = 36) 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: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_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:["_col4","_col5"]
                                        |  Statistics:Num rows: 20088 Data size: 22478696 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:+
@@ -93,14 +93,14 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_34]
+                                       |        Filter Operator [FIL_30]
                                        |           predicate:(((d_moy = 12) and d_date_sk is not null) and (d_year = 2001)) (type: boolean)
                                        |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:date_dim
                                        |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 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:+
@@ -109,7 +109,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]


[04/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_1.q.out b/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
index c081309..78c68c3 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
@@ -512,128 +512,128 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_50]
+         File Output Operator [FS_42]
             compressed:false
             Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_49]
+            Select Operator [SEL_41]
             |  outputColumnNames:["_col0","_col1","_col2"]
             |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_48]
+               Reduce Output Operator [RS_40]
                   key expressions:(UDFToLong(_col0) + _col1) (type: bigint), _col1 (type: bigint)
                   sort order:-+
                   Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                   value expressions:_col0 (type: int), _col2 (type: bigint)
-                  Select Operator [SEL_46]
+                  Select Operator [SEL_38]
                      outputColumnNames:["_col0","_col1","_col2"]
                      Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                     Group By Operator [GBY_45]
+                     Group By Operator [GBY_37]
                      |  aggregations:["count(VALUE._col0)"]
                      |  keys:KEY._col0 (type: bigint), KEY._col1 (type: int)
                      |  outputColumnNames:["_col0","_col1","_col2"]
                      |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_44]
+                        Reduce Output Operator [RS_36]
                            key expressions:_col0 (type: bigint), _col1 (type: int)
                            Map-reduce partition columns:_col0 (type: bigint), _col1 (type: int)
                            sort order:++
                            Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                            value expressions:_col2 (type: bigint)
-                           Group By Operator [GBY_43]
+                           Group By Operator [GBY_35]
                               aggregations:["count()"]
                               keys:_col2 (type: bigint), _col6 (type: int)
                               outputColumnNames:["_col0","_col1","_col2"]
                               Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                              Select Operator [SEL_42]
+                              Select Operator [SEL_34]
                                  outputColumnNames:["_col2","_col6"]
                                  Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                                 Filter Operator [FIL_56]
+                                 Filter Operator [FIL_33]
                                     predicate:((_col1 > 0) or (_col6 >= 0)) (type: boolean)
                                     Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                                    Merge Join Operator [MERGEJOIN_62]
+                                    Merge Join Operator [MERGEJOIN_52]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                     |  outputColumnNames:["_col1","_col2","_col6"]
                                     |  Statistics:Num rows: 3 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE
                                     |<-Map 11 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_39]
+                                    |  Reduce Output Operator [RS_31]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                                     |     value expressions:_col1 (type: int)
-                                    |     Select Operator [SEL_35]
+                                    |     Select Operator [SEL_29]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |        Filter Operator [FIL_60]
+                                    |        Filter Operator [FIL_50]
                                     |           predicate:key is not null (type: boolean)
                                     |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |           TableScan [TS_33]
+                                    |           TableScan [TS_27]
                                     |              alias:cbo_t3
                                     |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_37]
+                                       Reduce Output Operator [RS_30]
                                           key expressions:_col0 (type: string)
                                           Map-reduce partition columns:_col0 (type: string)
                                           sort order:+
                                           Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                           value expressions:_col1 (type: int), _col2 (type: bigint)
-                                          Select Operator [SEL_32]
+                                          Select Operator [SEL_26]
                                              outputColumnNames:["_col0","_col1","_col2"]
                                              Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                             Filter Operator [FIL_57]
+                                             Filter Operator [FIL_25]
                                                 predicate:((_col1 + _col4) >= 0) (type: boolean)
                                                 Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                Merge Join Operator [MERGEJOIN_61]
+                                                Merge Join Operator [MERGEJOIN_51]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                                 |  outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                 |  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |<-Reducer 10 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_29]
+                                                |  Reduce Output Operator [RS_23]
                                                 |     key expressions:_col0 (type: string)
                                                 |     Map-reduce partition columns:_col0 (type: string)
                                                 |     sort order:+
                                                 |     Statistics:Num rows: 1 Data size: 89 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |     value expressions:_col1 (type: int)
-                                                |     Select Operator [SEL_22]
+                                                |     Select Operator [SEL_20]
                                                 |     |  outputColumnNames:["_col0","_col1"]
                                                 |     |  Statistics:Num rows: 1 Data size: 89 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |     |<-Reducer 9 [SIMPLE_EDGE]
-                                                |        Reduce Output Operator [RS_21]
+                                                |        Reduce Output Operator [RS_19]
                                                 |           key expressions:_col3 (type: double), _col2 (type: bigint)
                                                 |           sort order:-+
                                                 |           Statistics:Num rows: 1 Data size: 105 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |           value expressions:_col0 (type: string), _col1 (type: int)
-                                                |           Select Operator [SEL_19]
+                                                |           Select Operator [SEL_17]
                                                 |              outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |              Statistics:Num rows: 1 Data size: 105 Basic stats: COMPLETE Column stats: COMPLETE
-                                                |              Group By Operator [GBY_18]
+                                                |              Group By Operator [GBY_16]
                                                 |              |  aggregations:["sum(VALUE._col0)"]
                                                 |              |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: float)
                                                 |              |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |              |  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |              |<-Map 8 [SIMPLE_EDGE]
-                                                |                 Reduce Output Operator [RS_17]
+                                                |                 Reduce Output Operator [RS_15]
                                                 |                    key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: float)
                                                 |                    Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: float)
                                                 |                    sort order:+++
                                                 |                    Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |                    value expressions:_col3 (type: bigint)
-                                                |                    Group By Operator [GBY_16]
+                                                |                    Group By Operator [GBY_14]
                                                 |                       aggregations:["sum(c_int)"]
                                                 |                       keys:key (type: string), c_int (type: int), c_float (type: float)
                                                 |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |                       Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                |                       Filter Operator [FIL_59]
+                                                |                       Filter Operator [FIL_49]
                                                 |                          predicate:((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
                                                 |                          Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE
-                                                |                          TableScan [TS_13]
+                                                |                          TableScan [TS_11]
                                                 |                             alias:cbo_t2
                                                 |                             Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_27]
+                                                   Reduce Output Operator [RS_22]
                                                       key expressions:_col0 (type: string)
                                                       Map-reduce partition columns:_col0 (type: string)
                                                       sort order:+
@@ -668,7 +668,7 @@ Stage-0
                                                                         keys:key (type: string), c_int (type: int), c_float (type: float)
                                                                         outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                         Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                                        Filter Operator [FIL_58]
+                                                                        Filter Operator [FIL_48]
                                                                            predicate:((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
                                                                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE
                                                                            TableScan [TS_0]
@@ -695,86 +695,86 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_43]
+         File Output Operator [FS_39]
             compressed:false
             Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_42]
+            Select Operator [SEL_38]
             |  outputColumnNames:["_col0","_col1","_col2"]
             |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_41]
+               Reduce Output Operator [RS_37]
                   key expressions:(UDFToLong(_col0) % _col1) (type: bigint), _col0 (type: int)
                   sort order:+-
                   Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                   value expressions:_col1 (type: bigint), _col2 (type: bigint)
-                  Select Operator [SEL_39]
+                  Select Operator [SEL_35]
                      outputColumnNames:["_col0","_col1","_col2"]
                      Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                     Group By Operator [GBY_38]
+                     Group By Operator [GBY_34]
                      |  aggregations:["count(VALUE._col0)"]
                      |  keys:KEY._col0 (type: bigint), KEY._col1 (type: int)
                      |  outputColumnNames:["_col0","_col1","_col2"]
                      |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_37]
+                        Reduce Output Operator [RS_33]
                            key expressions:_col0 (type: bigint), _col1 (type: int)
                            Map-reduce partition columns:_col0 (type: bigint), _col1 (type: int)
                            sort order:++
                            Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                            value expressions:_col2 (type: bigint)
-                           Group By Operator [GBY_36]
+                           Group By Operator [GBY_32]
                               aggregations:["count()"]
                               keys:_col2 (type: bigint), _col6 (type: int)
                               outputColumnNames:["_col0","_col1","_col2"]
                               Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                              Select Operator [SEL_35]
+                              Select Operator [SEL_31]
                                  outputColumnNames:["_col2","_col6"]
                                  Statistics:Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE
-                                 Filter Operator [FIL_48]
-                                    predicate:((((UDFToLong(_col6) + _col2) >= 0) and ((_col1 > 0) or (_col6 >= 0))) and ((_col6 >= 1) or (_col2 >= 1))) (type: boolean)
+                                 Filter Operator [FIL_30]
+                                    predicate:(((_col1 > 0) or (_col6 >= 0)) and ((_col6 >= 1) or (_col2 >= 1)) and ((UDFToLong(_col6) + _col2) >= 0)) (type: boolean)
                                     Statistics:Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE
-                                    Merge Join Operator [MERGEJOIN_54]
+                                    Merge Join Operator [MERGEJOIN_48]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                     |  outputColumnNames:["_col1","_col2","_col6"]
                                     |  Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
                                     |<-Map 10 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_32]
+                                    |  Reduce Output Operator [RS_28]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 5 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE
                                     |     value expressions:_col1 (type: int)
-                                    |     Select Operator [SEL_28]
+                                    |     Select Operator [SEL_26]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 5 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |        Filter Operator [FIL_52]
+                                    |        Filter Operator [FIL_46]
                                     |           predicate:((c_int > 0) and key is not null) (type: boolean)
                                     |           Statistics:Num rows: 5 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |           TableScan [TS_26]
+                                    |           TableScan [TS_24]
                                     |              alias:cbo_t3
                                     |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_30]
+                                       Reduce Output Operator [RS_27]
                                           key expressions:_col0 (type: string)
                                           Map-reduce partition columns:_col0 (type: string)
                                           sort order:+
                                           Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                           value expressions:_col1 (type: int), _col2 (type: bigint)
-                                          Select Operator [SEL_25]
+                                          Select Operator [SEL_23]
                                              outputColumnNames:["_col0","_col1","_col2"]
                                              Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                             Filter Operator [FIL_49]
+                                             Filter Operator [FIL_22]
                                                 predicate:((_col1 + _col4) >= 0) (type: boolean)
                                                 Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                Merge Join Operator [MERGEJOIN_53]
+                                                Merge Join Operator [MERGEJOIN_47]
                                                 |  condition map:[{"":"Left Outer Join0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                                 |  outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                 |  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_21]
+                                                |  Reduce Output Operator [RS_19]
                                                 |     key expressions:_col0 (type: string)
                                                 |     Map-reduce partition columns:_col0 (type: string)
                                                 |     sort order:+
@@ -809,40 +809,40 @@ Stage-0
                                                 |                       keys:key (type: string), c_int (type: int), c_float (type: float)
                                                 |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |                       Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                |                       Filter Operator [FIL_50]
+                                                |                       Filter Operator [FIL_44]
                                                 |                          predicate:(((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) and key is not null) (type: boolean)
                                                 |                          Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |                          TableScan [TS_0]
                                                 |                             alias:cbo_t1
                                                 |                             Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                                                 |<-Reducer 9 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_22]
+                                                   Reduce Output Operator [RS_20]
                                                       key expressions:_col0 (type: string)
                                                       Map-reduce partition columns:_col0 (type: string)
                                                       sort order:+
                                                       Statistics:Num rows: 1 Data size: 89 Basic stats: COMPLETE Column stats: COMPLETE
                                                       value expressions:_col1 (type: int)
-                                                      Select Operator [SEL_19]
+                                                      Select Operator [SEL_17]
                                                          outputColumnNames:["_col0","_col1"]
                                                          Statistics:Num rows: 1 Data size: 89 Basic stats: COMPLETE Column stats: COMPLETE
-                                                         Group By Operator [GBY_18]
+                                                         Group By Operator [GBY_16]
                                                          |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: float)
                                                          |  outputColumnNames:["_col0","_col1","_col2"]
                                                          |  Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                                          |<-Map 8 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_17]
+                                                            Reduce Output Operator [RS_15]
                                                                key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: float)
                                                                Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: float)
                                                                sort order:+++
                                                                Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
-                                                               Group By Operator [GBY_16]
+                                                               Group By Operator [GBY_14]
                                                                   keys:key (type: string), c_int (type: int), c_float (type: float)
                                                                   outputColumnNames:["_col0","_col1","_col2"]
                                                                   Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
-                                                                  Filter Operator [FIL_51]
-                                                                     predicate:(((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) and key is not null) (type: boolean)
+                                                                  Filter Operator [FIL_45]
+                                                                     predicate:((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) (type: boolean)
                                                                      Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
-                                                                     TableScan [TS_13]
+                                                                     TableScan [TS_11]
                                                                         alias:cbo_t2
                                                                         Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
 
@@ -891,10 +891,10 @@ Stage-0
                         Select Operator [SEL_26]
                            outputColumnNames:["_col2","_col6"]
                            Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                           Filter Operator [FIL_34]
+                           Filter Operator [FIL_25]
                               predicate:(((_col1 + _col4) >= 2) and ((_col1 > 0) or (_col6 >= 0))) (type: boolean)
                               Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                              Merge Join Operator [MERGEJOIN_37]
+                              Merge Join Operator [MERGEJOIN_36]
                               |  condition map:[{"":"Right Outer Join0 to 1"},{"":"Right Outer Join0 to 2"}]
                               |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                               |  outputColumnNames:["_col1","_col2","_col4","_col6"]
@@ -948,7 +948,7 @@ Stage-0
                               |                       keys:key (type: string), c_int (type: int), c_float (type: float)
                               |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                               |                       Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                              |                       Filter Operator [FIL_35]
+                              |                       Filter Operator [FIL_34]
                               |                          predicate:((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) (type: boolean)
                               |                          Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                               |                          TableScan [TS_0]
@@ -978,7 +978,7 @@ Stage-0
                                                 keys:key (type: string), c_int (type: int), c_float (type: float)
                                                 outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
-                                                Filter Operator [FIL_36]
+                                                Filter Operator [FIL_35]
                                                    predicate:((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) (type: boolean)
                                                    Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                                    TableScan [TS_11]
@@ -1041,10 +1041,10 @@ Stage-0
                               Select Operator [SEL_30]
                                  outputColumnNames:["_col2","_col6"]
                                  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                                 Filter Operator [FIL_39]
-                                    predicate:(((((_col1 + _col4) >= 0) and ((UDFToLong(_col6) + _col2) >= 0)) and ((_col1 > 0) or (_col6 >= 0))) and ((_col6 >= 1) or (_col2 >= 1))) (type: boolean)
+                                 Filter Operator [FIL_29]
+                                    predicate:(((_col1 + _col4) >= 0) and ((_col1 > 0) or (_col6 >= 0)) and ((_col6 >= 1) or (_col2 >= 1)) and ((UDFToLong(_col6) + _col2) >= 0)) (type: boolean)
                                     Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                                    Merge Join Operator [MERGEJOIN_43]
+                                    Merge Join Operator [MERGEJOIN_42]
                                     |  condition map:[{"":"Outer Join 0 to 1"},{"":"Right Outer Join0 to 2"}]
                                     |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                                     |  outputColumnNames:["_col1","_col2","_col4","_col6"]
@@ -1059,7 +1059,7 @@ Stage-0
                                     |     Select Operator [SEL_24]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 6 Data size: 445 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |        Filter Operator [FIL_42]
+                                    |        Filter Operator [FIL_41]
                                     |           predicate:(c_int > 0) (type: boolean)
                                     |           Statistics:Num rows: 6 Data size: 445 Basic stats: COMPLETE Column stats: COMPLETE
                                     |           TableScan [TS_22]
@@ -1101,7 +1101,7 @@ Stage-0
                                     |                       keys:key (type: string), c_int (type: int), c_float (type: float)
                                     |                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |                       Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                    |                       Filter Operator [FIL_40]
+                                    |                       Filter Operator [FIL_39]
                                     |                          predicate:((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) (type: boolean)
                                     |                          Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                     |                          TableScan [TS_0]
@@ -1143,7 +1143,7 @@ Stage-0
                                                             keys:key (type: string), c_int (type: int), c_float (type: float)
                                                             outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                             Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                            Filter Operator [FIL_41]
+                                                            Filter Operator [FIL_40]
                                                                predicate:((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) (type: boolean)
                                                                Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                                                TableScan [TS_11]
@@ -1168,77 +1168,77 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 5
-         File Output Operator [FS_37]
+         File Output Operator [FS_33]
             compressed:false
             Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_36]
+            Select Operator [SEL_32]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-               Group By Operator [GBY_35]
+               Group By Operator [GBY_31]
                |  aggregations:["count(VALUE._col0)"]
                |  keys:KEY._col0 (type: bigint), KEY._col1 (type: int)
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_34]
+                  Reduce Output Operator [RS_30]
                      key expressions:_col0 (type: bigint), _col1 (type: int)
                      Map-reduce partition columns:_col0 (type: bigint), _col1 (type: int)
                      sort order:++
                      Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                      value expressions:_col2 (type: bigint)
-                     Group By Operator [GBY_33]
+                     Group By Operator [GBY_29]
                         aggregations:["count()"]
                         keys:_col2 (type: bigint), _col6 (type: int)
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                        Select Operator [SEL_32]
+                        Select Operator [SEL_28]
                            outputColumnNames:["_col2","_col6"]
                            Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                           Filter Operator [FIL_43]
+                           Filter Operator [FIL_27]
                               predicate:((_col1 > 0) or (_col6 >= 0)) (type: boolean)
                               Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                              Merge Join Operator [MERGEJOIN_49]
+                              Merge Join Operator [MERGEJOIN_43]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                               |  outputColumnNames:["_col1","_col2","_col6"]
                               |  Statistics:Num rows: 3 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE
                               |<-Map 8 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_29]
+                              |  Reduce Output Operator [RS_25]
                               |     key expressions:_col0 (type: string)
                               |     Map-reduce partition columns:_col0 (type: string)
                               |     sort order:+
                               |     Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                               |     value expressions:_col1 (type: int)
-                              |     Select Operator [SEL_25]
+                              |     Select Operator [SEL_23]
                               |        outputColumnNames:["_col0","_col1"]
                               |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                              |        Filter Operator [FIL_47]
+                              |        Filter Operator [FIL_41]
                               |           predicate:key is not null (type: boolean)
                               |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                              |           TableScan [TS_23]
+                              |           TableScan [TS_21]
                               |              alias:cbo_t3
                               |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                               |<-Reducer 3 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_27]
+                                 Reduce Output Operator [RS_24]
                                     key expressions:_col0 (type: string)
                                     Map-reduce partition columns:_col0 (type: string)
                                     sort order:+
                                     Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                     value expressions:_col1 (type: int), _col2 (type: bigint)
-                                    Select Operator [SEL_22]
+                                    Select Operator [SEL_20]
                                        outputColumnNames:["_col0","_col1","_col2"]
                                        Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                       Filter Operator [FIL_44]
+                                       Filter Operator [FIL_19]
                                           predicate:((_col1 + _col4) >= 0) (type: boolean)
                                           Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                          Merge Join Operator [MERGEJOIN_48]
+                                          Merge Join Operator [MERGEJOIN_42]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                           |  outputColumnNames:["_col0","_col1","_col2","_col4"]
                                           |  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                           |<-Reducer 2 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_17]
+                                          |  Reduce Output Operator [RS_16]
                                           |     key expressions:_col0 (type: string)
                                           |     Map-reduce partition columns:_col0 (type: string)
                                           |     sort order:+
@@ -1264,14 +1264,14 @@ Stage-0
                                           |                 keys:key (type: string), c_int (type: int), c_float (type: float)
                                           |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                           |                 Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                          |                 Filter Operator [FIL_45]
+                                          |                 Filter Operator [FIL_39]
                                           |                    predicate:(((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) and key is not null) (type: boolean)
                                           |                    Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                           |                    TableScan [TS_0]
                                           |                       alias:cbo_t1
                                           |                       Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                                           |<-Reducer 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_19]
+                                             Reduce Output Operator [RS_17]
                                                 key expressions:_col0 (type: string)
                                                 Map-reduce partition columns:_col0 (type: string)
                                                 sort order:+
@@ -1294,7 +1294,7 @@ Stage-0
                                                             keys:key (type: string), c_int (type: int), c_float (type: float)
                                                             outputColumnNames:["_col0","_col1","_col2"]
                                                             Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
-                                                            Filter Operator [FIL_46]
+                                                            Filter Operator [FIL_40]
                                                                predicate:(((((((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) and (c_float > 0.0)) and ((c_int >= 1) or (c_float >= 1.0))) and ((UDFToFloat(c_int) + c_float) >= 0.0)) and key is not null) (type: boolean)
                                                                Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE
                                                                TableScan [TS_8]
@@ -1619,17 +1619,17 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_12]
+         File Output Operator [FS_10]
             compressed:false
             Statistics:Num rows: 18 Data size: 1530 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Merge Join Operator [MERGEJOIN_17]
+            Merge Join Operator [MERGEJOIN_15]
             |  condition map:[{"":"Inner Join 0 to 1"}]
             |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 18 Data size: 1530 Basic stats: COMPLETE Column stats: COMPLETE
             |<-Map 1 [SIMPLE_EDGE]
-            |  Reduce Output Operator [RS_7]
+            |  Reduce Output Operator [RS_6]
             |     key expressions:_col0 (type: string)
             |     Map-reduce partition columns:_col0 (type: string)
             |     sort order:+
@@ -1637,14 +1637,14 @@ Stage-0
             |     Select Operator [SEL_2]
             |        outputColumnNames:["_col0"]
             |        Statistics:Num rows: 6 Data size: 425 Basic stats: COMPLETE Column stats: COMPLETE
-            |        Filter Operator [FIL_15]
+            |        Filter Operator [FIL_13]
             |           predicate:(UDFToDouble(key) >= 1.0) (type: boolean)
             |           Statistics:Num rows: 6 Data size: 425 Basic stats: COMPLETE Column stats: COMPLETE
             |           TableScan [TS_0]
             |              alias:cbo_t1
             |              Statistics:Num rows: 20 Data size: 1530 Basic stats: COMPLETE Column stats: COMPLETE
             |<-Map 3 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_9]
+               Reduce Output Operator [RS_7]
                   key expressions:_col0 (type: string)
                   Map-reduce partition columns:_col0 (type: string)
                   sort order:+
@@ -1652,7 +1652,7 @@ Stage-0
                   Select Operator [SEL_5]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 6 Data size: 425 Basic stats: COMPLETE Column stats: COMPLETE
-                     Filter Operator [FIL_16]
+                     Filter Operator [FIL_14]
                         predicate:(UDFToDouble(key) >= 1.0) (type: boolean)
                         Statistics:Num rows: 6 Data size: 425 Basic stats: COMPLETE Column stats: COMPLETE
                         TableScan [TS_3]
@@ -1779,20 +1779,20 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_17]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 291 Data size: 29391 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_16]
+            Select Operator [SEL_13]
                outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                Statistics:Num rows: 291 Data size: 29391 Basic stats: COMPLETE Column stats: COMPLETE
-               Merge Join Operator [MERGEJOIN_27]
+               Merge Join Operator [MERGEJOIN_24]
                |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                |  outputColumnNames:["_col1","_col2","_col4","_col5","_col6"]
                |  Statistics:Num rows: 291 Data size: 29391 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 1 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_10]
+               |  Reduce Output Operator [RS_9]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -1801,14 +1801,14 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1","_col2"]
                |        Statistics:Num rows: 18 Data size: 1488 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_24]
+               |        Filter Operator [FIL_21]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 18 Data size: 1488 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_0]
                |              alias:cbo_t1
                |              Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 3 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_12]
+               |  Reduce Output Operator [RS_10]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -1817,14 +1817,14 @@ Stage-0
                |     Select Operator [SEL_5]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_25]
+               |        Filter Operator [FIL_22]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_3]
                |              alias:cbo_t3
                |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_14]
+                  Reduce Output Operator [RS_11]
                      key expressions:_col0 (type: string)
                      Map-reduce partition columns:_col0 (type: string)
                      sort order:+
@@ -1833,7 +1833,7 @@ Stage-0
                      Select Operator [SEL_8]
                         outputColumnNames:["_col0","_col1"]
                         Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                        Filter Operator [FIL_26]
+                        Filter Operator [FIL_23]
                            predicate:key is not null (type: boolean)
                            Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                            TableScan [TS_6]
@@ -1854,20 +1854,20 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_17]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 291 Data size: 51798 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_16]
+            Select Operator [SEL_13]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
                Statistics:Num rows: 291 Data size: 51798 Basic stats: COMPLETE Column stats: COMPLETE
-               Merge Join Operator [MERGEJOIN_27]
+               Merge Join Operator [MERGEJOIN_24]
                |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                |  outputColumnNames:["_col0","_col1","_col3","_col4"]
                |  Statistics:Num rows: 291 Data size: 51798 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 1 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_10]
+               |  Reduce Output Operator [RS_9]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -1876,14 +1876,14 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_24]
+               |        Filter Operator [FIL_21]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_0]
                |              alias:cbo_t1
                |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 3 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_12]
+               |  Reduce Output Operator [RS_10]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -1891,14 +1891,14 @@ Stage-0
                |     Select Operator [SEL_5]
                |        outputColumnNames:["_col0"]
                |        Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_25]
+               |        Filter Operator [FIL_22]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_3]
                |              alias:cbo_t3
                |              Statistics:Num rows: 20 Data size: 1530 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_14]
+                  Reduce Output Operator [RS_11]
                      key expressions:_col0 (type: string)
                      Map-reduce partition columns:_col0 (type: string)
                      sort order:+
@@ -1907,7 +1907,7 @@ Stage-0
                      Select Operator [SEL_8]
                         outputColumnNames:["_col0","_col1"]
                         Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                        Filter Operator [FIL_26]
+                        Filter Operator [FIL_23]
                            predicate:key is not null (type: boolean)
                            Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                            TableScan [TS_6]
@@ -1929,23 +1929,23 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3
-         File Output Operator [FS_21]
+         File Output Operator [FS_19]
             compressed:false
-            Statistics:Num rows: 14 Data size: 1414 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics:Num rows: 6 Data size: 606 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_20]
+            Select Operator [SEL_18]
                outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
-               Statistics:Num rows: 14 Data size: 1414 Basic stats: COMPLETE Column stats: COMPLETE
-               Filter Operator [FIL_26]
+               Statistics:Num rows: 6 Data size: 606 Basic stats: COMPLETE Column stats: COMPLETE
+               Filter Operator [FIL_17]
                   predicate:((_col1 > 0) or (_col6 >= 0)) (type: boolean)
-                  Statistics:Num rows: 14 Data size: 1414 Basic stats: COMPLETE Column stats: COMPLETE
-                  Merge Join Operator [MERGEJOIN_33]
+                  Statistics:Num rows: 6 Data size: 606 Basic stats: COMPLETE Column stats: COMPLETE
+                  Merge Join Operator [MERGEJOIN_28]
                   |  condition map:[{"":"Inner Join 0 to 1"}]
                   |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                   |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6"]
-                  |  Statistics:Num rows: 21 Data size: 2121 Basic stats: COMPLETE Column stats: COMPLETE
+                  |  Statistics:Num rows: 10 Data size: 1010 Basic stats: COMPLETE Column stats: COMPLETE
                   |<-Map 5 [SIMPLE_EDGE]
-                  |  Reduce Output Operator [RS_17]
+                  |  Reduce Output Operator [RS_15]
                   |     key expressions:_col0 (type: string)
                   |     Map-reduce partition columns:_col0 (type: string)
                   |     sort order:+
@@ -1954,27 +1954,27 @@ Stage-0
                   |     Select Operator [SEL_13]
                   |        outputColumnNames:["_col0","_col1"]
                   |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                  |        Filter Operator [FIL_31]
+                  |        Filter Operator [FIL_26]
                   |           predicate:key is not null (type: boolean)
                   |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                   |           TableScan [TS_11]
                   |              alias:cbo_t3
                   |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                   |<-Reducer 2 [SIMPLE_EDGE]
-                     Reduce Output Operator [RS_15]
+                     Reduce Output Operator [RS_14]
                         key expressions:_col0 (type: string)
                         Map-reduce partition columns:_col0 (type: string)
                         sort order:+
-                        Statistics:Num rows: 6 Data size: 1092 Basic stats: COMPLETE Column stats: COMPLETE
+                        Statistics:Num rows: 3 Data size: 546 Basic stats: COMPLETE Column stats: COMPLETE
                         value expressions:_col1 (type: int), _col2 (type: float), _col3 (type: string), _col4 (type: int)
-                        Filter Operator [FIL_28]
+                        Filter Operator [FIL_9]
                            predicate:(((_col1 + _col4) = 2) and ((_col4 + 1) = 2)) (type: boolean)
-                           Statistics:Num rows: 6 Data size: 1092 Basic stats: COMPLETE Column stats: COMPLETE
-                           Merge Join Operator [MERGEJOIN_32]
+                           Statistics:Num rows: 3 Data size: 546 Basic stats: COMPLETE Column stats: COMPLETE
+                           Merge Join Operator [MERGEJOIN_27]
                            |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                            |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
-                           |  Statistics:Num rows: 25 Data size: 4550 Basic stats: COMPLETE Column stats: COMPLETE
+                           |  Statistics:Num rows: 15 Data size: 2730 Basic stats: COMPLETE Column stats: COMPLETE
                            |<-Map 1 [SIMPLE_EDGE]
                            |  Reduce Output Operator [RS_6]
                            |     key expressions:_col0 (type: string)
@@ -1985,7 +1985,7 @@ Stage-0
                            |     Select Operator [SEL_2]
                            |        outputColumnNames:["_col0","_col1","_col2"]
                            |        Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
-                           |        Filter Operator [FIL_29]
+                           |        Filter Operator [FIL_24]
                            |           predicate:((((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
                            |           Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
                            |           TableScan [TS_0]
@@ -1996,14 +1996,14 @@ Stage-0
                                  key expressions:_col0 (type: string)
                                  Map-reduce partition columns:_col0 (type: string)
                                  sort order:+
-                                 Statistics:Num rows: 5 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE
+                                 Statistics:Num rows: 6 Data size: 445 Basic stats: COMPLETE Column stats: COMPLETE
                                  value expressions:_col1 (type: int)
                                  Select Operator [SEL_5]
                                     outputColumnNames:["_col0","_col1"]
-                                    Statistics:Num rows: 5 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE
-                                    Filter Operator [FIL_30]
-                                       predicate:((((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
-                                       Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
+                                    Statistics:Num rows: 6 Data size: 445 Basic stats: COMPLETE Column stats: COMPLETE
+                                    Filter Operator [FIL_25]
+                                       predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
+                                       Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
                                        TableScan [TS_3]
                                           alias:cbo_t2
                                           Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
@@ -2024,15 +2024,15 @@ Stage-0
          Reducer 2
          File Output Operator [FS_14]
             compressed:false
-            Statistics:Num rows: 12 Data size: 1212 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics:Num rows: 8 Data size: 808 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
             Select Operator [SEL_13]
                outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
-               Statistics:Num rows: 12 Data size: 1212 Basic stats: COMPLETE Column stats: COMPLETE
-               Filter Operator [FIL_18]
-                  predicate:((((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0))) and ((_col4 + 1) = 2)) (type: boolean)
-                  Statistics:Num rows: 12 Data size: 1212 Basic stats: COMPLETE Column stats: COMPLETE
-                  Merge Join Operator [MERGEJOIN_21]
+               Statistics:Num rows: 8 Data size: 808 Basic stats: COMPLETE Column stats: COMPLETE
+               Filter Operator [FIL_12]
+                  predicate:(((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0)) and ((_col4 + 1) = 2) and ((_col1 > 0) or (_col6 >= 0))) (type: boolean)
+                  Statistics:Num rows: 8 Data size: 808 Basic stats: COMPLETE Column stats: COMPLETE
+                  Merge Join Operator [MERGEJOIN_19]
                   |  condition map:[{"":"Right Outer Join0 to 1"},{"":"Right Outer Join0 to 2"}]
                   |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                   |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6"]
@@ -2047,7 +2047,7 @@ Stage-0
                   |     Select Operator [SEL_2]
                   |        outputColumnNames:["_col0","_col1","_col2"]
                   |        Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
-                  |        Filter Operator [FIL_19]
+                  |        Filter Operator [FIL_17]
                   |           predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
                   |           Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
                   |           TableScan [TS_0]
@@ -2063,7 +2063,7 @@ Stage-0
                   |     Select Operator [SEL_5]
                   |        outputColumnNames:["_col0","_col1"]
                   |        Statistics:Num rows: 6 Data size: 445 Basic stats: COMPLETE Column stats: COMPLETE
-                  |        Filter Operator [FIL_20]
+                  |        Filter Operator [FIL_18]
                   |           predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
                   |           Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
                   |           TableScan [TS_3]
@@ -2361,95 +2361,95 @@ Stage-0
       limit:5
       Stage-1
          Reducer 7
-         File Output Operator [FS_53]
+         File Output Operator [FS_49]
             compressed:false
             Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_52]
+            Limit [LIM_48]
                Number of rows:5
                Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-               Select Operator [SEL_51]
+               Select Operator [SEL_47]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_50]
+                  Reduce Output Operator [RS_46]
                      key expressions:(UDFToLong(_col0) + _col1) (type: bigint), _col1 (type: bigint)
                      sort order:-+
                      Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                      value expressions:_col0 (type: int), _col2 (type: bigint)
-                     Select Operator [SEL_48]
+                     Select Operator [SEL_44]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                        Group By Operator [GBY_47]
+                        Group By Operator [GBY_43]
                         |  aggregations:["count(VALUE._col0)"]
                         |  keys:KEY._col0 (type: bigint), KEY._col1 (type: int)
                         |  outputColumnNames:["_col0","_col1","_col2"]
                         |  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_46]
+                           Reduce Output Operator [RS_42]
                               key expressions:_col0 (type: bigint), _col1 (type: int)
                               Map-reduce partition columns:_col0 (type: bigint), _col1 (type: int)
                               sort order:++
                               Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
                               value expressions:_col2 (type: bigint)
-                              Group By Operator [GBY_45]
+                              Group By Operator [GBY_41]
                                  aggregations:["count()"]
                                  keys:_col2 (type: bigint), _col6 (type: int)
                                  outputColumnNames:["_col0","_col1","_col2"]
                                  Statistics:Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE
-                                 Select Operator [SEL_44]
+                                 Select Operator [SEL_40]
                                     outputColumnNames:["_col2","_col6"]
                                     Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                                    Filter Operator [FIL_59]
+                                    Filter Operator [FIL_39]
                                        predicate:((_col1 > 0) or (_col6 >= 0)) (type: boolean)
                                        Statistics:Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE
-                                       Merge Join Operator [MERGEJOIN_67]
+                                       Merge Join Operator [MERGEJOIN_61]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                        |  outputColumnNames:["_col1","_col2","_col6"]
                                        |  Statistics:Num rows: 3 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE
                                        |<-Map 11 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_41]
+                                       |  Reduce Output Operator [RS_37]
                                        |     key expressions:_col0 (type: string)
                                        |     Map-reduce partition columns:_col0 (type: string)
                                        |     sort order:+
                                        |     Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
                                        |     value expressions:_col1 (type: int)
-                                       |     Select Operator [SEL_37]
+                                       |     Select Operator [SEL_35]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                                       |        Filter Operator [FIL_65]
+                                       |        Filter Operator [FIL_59]
                                        |           predicate:key is not null (type: boolean)
                                        |           Statistics:Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                                       |           TableScan [TS_35]
+                                       |           TableScan [TS_33]
                                        |              alias:cbo_t3
                                        |              Statistics:Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
                                        |<-Reducer 4 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_39]
+                                          Reduce Output Operator [RS_36]
                                              key expressions:_col0 (type: string)
                                              Map-reduce partition columns:_col0 (type: string)
                                              sort order:+
                                              Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                              value expressions:_col1 (type: int), _col2 (type: bigint)
-                                             Select Operator [SEL_34]
+                                             Select Operator [SEL_32]
                                                 outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                Filter Operator [FIL_60]
+                                                Filter Operator [FIL_31]
                                                    predicate:((_col1 + _col4) >= 0) (type: boolean)
                                                    Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                   Merge Join Operator [MERGEJOIN_66]
+                                                   Merge Join Operator [MERGEJOIN_60]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                                                    |  outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                    |  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
                                                    |<-Reducer 10 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_31]
+                                                   |  Reduce Output Operator [RS_29]
                                                    |     key expressions:_col0 (type: string)
                                                    |     Map-reduce partition columns:_col0 (type: string)
                                                    |     sort order:+
                                                    |     Statistics:Num rows: 1 Data size: 105 Basic stats: COMPLETE Column stats: COMPLETE
                                                    |     value expressions:_col1 (type: int)
-                                                   |     Filter Operator [FIL_63]
+                                                   |     Filter Operator [FIL_26]
                                                    |        predicate:_col0 is not null (type: boolean)
                                                    |        Statistics:Num rows: 1 Data size: 105 Basic stats: COMPLETE Column stats: COMPLETE
                                                    |        Limit [LIM_24]
@@ -2484,20 +2484,20 @@ Stage-0
                                                    |                             keys:key (type: string), c_int (type: int), c_float (type: float)
                                                    |                             outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                    |                             Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                   |                             Filter Operator [FIL_64]
+                                                   |                             Filter Operator [FIL_58]
                                                    |                                predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
                                                    |                                Statistics:Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
                                                    |                                TableScan [TS_14]
                                                    |                                   alias:cbo_t2
                                                    |                                   Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                                                    |<-Reducer 3 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_29]
+                                                      Reduce Output Operator [RS_28]
                                                          key expressions:_col0 (type: string)
                                                          Map-reduce partition columns:_col0 (type: string)
                                                          sort order:+
                                                          Statistics:Num rows: 1 Data size: 97 Basic stats: COMPLETE Column stats: COMPLETE
                                                          value expressions:_col1 (type: int), _col2 (type: bigint)
-                                                         Filter Operator [FIL_61]
+                                                         Filter Operator [FIL_12]
                                                             predicate:_col0 is not null (type: boolean)
                                                             Statistics:Num rows: 1 Data size: 97 Basic stats: COMPLETE Column stats: COMPLETE
                                                             Limit [LIM_10]
@@ -2532,7 +2532,7 @@ Stage-0
                                                                                  keys:key (type: string), c_int (type: int), c_float (type: float)
                                                                                  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                                  Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
-                                                                                 Filter Operator [FIL_62]
+                                                                                 Filter Operator [FIL_56]
                                                                                     predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
                                                                                     Statistics:Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
                                                                                     TableScan [TS_0]
@@ -2553,20 +2553,20 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_14]
+         File Output Operator [FS_12]
             compressed:false
             Statistics:Num rows: 7 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_13]
+            Select Operator [SEL_11]
                outputColumnNames:["_col0"]
                Statistics:Num rows: 7 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE
-               Merge Join Operator [MERGEJOIN_19]
+               Merge Join Operator [MERGEJOIN_17]
                |  condition map:[{"":"Left Semi Join 0 to 1"}]
                |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)"}
                |  outputColumnNames:["_col1"]
                |  Statistics:Num rows: 7 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 1 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_9]
+               |  Reduce Output Operator [RS_8]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -2575,14 +2575,14 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_17]
+               |        Filter Operator [FIL_15]
                |           predicate:((((c_int + 1) = 2) and key is not null) and ((c_int > 0) or (c_float >= 0.0))) (type: boolean)
                |           Statistics:Num rows: 6 Data size: 465 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_0]
                |              alias:cbo_t1
                |              Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 3 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_11]
+                  Reduce Output Operator [RS_9]
                      key expressions:_col0 (type: string)
                      Map-reduce partition columns:_col0 (type: string)
                      sort order:+
@@ -2594,7 +2594,7 @@ Stage-0
                         Select Operator [SEL_5]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
-                           Filter Operator [FIL_18]
+                           Filter Operator [FIL_16]
                               predicate:key is not null (type: boolean)
                               Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
                               TableScan [TS_3]
@@ -2615,20 +2615,20 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_21]
+         File Output Operator [FS_18]
             compressed:false
             Statistics:Num rows: 12 Data size: 1116 Basic stats: COMPLETE Column stats: COMPLETE
             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"}
-            Select Operator [SEL_20]
+            Select Operator [SEL_17]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 12 Data size: 1116 Basic stats: COMPLETE Column stats: COMPLETE
-               Merge Join Operator [MERGEJOIN_31]
+               Merge Join Operator [MERGEJOIN_28]
                |  condition map:[{"":"Left Semi Join 0 to 1"},{"":"Left Semi Join 0 to 2"}]
                |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)"}
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 12 Data size: 1116 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 1 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_14]
+               |  Reduce Output Operator [RS_13]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -2637,14 +2637,14 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1","_col2"]
                |        Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
-               |        Filter Operator [FIL_28]
+               |        Filter Operator [FIL_25]
                |           predicate:((((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
                |           Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
                |           TableScan [TS_0]
                |              alias:cbo_t1
                |              Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 3 [SIMPLE_EDGE]
-               |  Reduce Output Operator [RS_16]
+               |  Reduce Output Operator [RS_14]
                |     key expressions:_col0 (type: string)
                |     Map-reduce partition columns:_col0 (type: string)
                |     sort order:+
@@ -2656,14 +2656,14 @@ Stage-0
                |        Select Operator [SEL_5]
                |           outputColumnNames:["_col0"]
                |           Statistics:Num rows: 5 Data size: 340 Basic stats: COMPLETE Column stats: COMPLETE
-               |           Filter Operator [FIL_29]
+               |           Filter Operator [FIL_26]
                |              predicate:((((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0))) and key is not null) (type: boolean)
                |              Statistics:Num rows: 5 Data size: 372 Basic stats: COMPLETE Column stats: COMPLETE
                |              TableScan [TS_3]
                |                 alias:cbo_t2
                |                 Statistics:Num rows: 20 Data size: 1674 Basic stats: COMPLETE Column stats: COMPLETE
                |<-Map 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_18]
+                  Reduce Output Operator [RS_15]
                      key expressions:_col0 (type: string)
                      Map-reduce partition columns:_col0 (type: string)
                      sort order:+
@@ -2675,7 +2675,7 @@ Stage-0
                         Select Operator [SEL_8]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
-                           Filter Operator [FIL_30]
+                           Filter Operator [FIL_27]
                               predicate:key is not null (type: boolean)
                               Statistics:Num rows: 18 Data size: 1360 Basic stats: COMPLETE Column stats: COMPLETE
                               TableScan [TS_6]
@@ -2702,153 +2702,150 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 6
-         File Output Operator [FS_47]
+         File Output Operator [FS_41]
             compressed:false
             Statistics:Num rows: 1 Data size: 101 Basic stats: COMPLETE Column stats: COMPLETE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hi

<TRUNCATED>

[29/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
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]


[23/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query43.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query43.q.out b/ql/src/test/results/clientpositive/perf/query43.q.out
index 4e738e6..7fa4f53 100644
--- a/ql/src/test/results/clientpositive/perf/query43.q.out
+++ b/ql/src/test/results/clientpositive/perf/query43.q.out
@@ -15,48 +15,48 @@ 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: 111900 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: 111900 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_26]
+               Select Operator [SEL_22]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                |  Statistics:Num rows: 22096 Data size: 24726006 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_25]
+                  Reduce Output Operator [RS_21]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: decimal(17,2)), _col8 (type: decimal(17,2))
                      sort order:+++++++++
                      Statistics:Num rows: 22096 Data size: 24726006 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_23]
+                     Group By Operator [GBY_19]
                      |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                      |  Statistics:Num rows: 22096 Data size: 24726006 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 3 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_22]
+                        Reduce Output Operator [RS_18]
                            key expressions:_col0 (type: string), _col1 (type: string)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            sort order:++
                            Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: decimal(17,2)), _col8 (type: decimal(17,2))
-                           Group By Operator [GBY_21]
+                           Group By Operator [GBY_17]
                               aggregations:["sum(_col2)","sum(_col3)","sum(_col4)","sum(_col5)","sum(_col6)","sum(_col7)","sum(_col8)"]
                               keys:_col0 (type: string), _col1 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                               Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_19]
+                              Select Operator [SEL_15]
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                  Statistics:Num rows: 44193 Data size: 49453132 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:["_col2","_col5","_col7","_col8"]
                                  |  Statistics:Num rows: 44193 Data size: 49453132 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:+
@@ -65,26 +65,26 @@ Stage-0
                                  |     Select Operator [SEL_8]
                                  |        outputColumnNames:["_col0","_col1","_col2"]
                                  |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_36]
+                                 |        Filter Operator [FIL_32]
                                  |           predicate:((s_gmt_offset = -6) and s_store_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_6]
                                  |              alias:store
                                  |              Statistics:Num rows: 1704 Data size: 3256276 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:_col2 (type: string), _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:["_col2","_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:+
@@ -93,14 +93,14 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0","_col2"]
                                        |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_34]
+                                       |        Filter Operator [FIL_30]
                                        |           predicate:((d_year = 1998) 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:date_dim
                                        |              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:+
@@ -109,7 +109,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_store_sk is not null) (type: boolean)
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query45.q.out b/ql/src/test/results/clientpositive/perf/query45.q.out
index dd14ac4..f55f20c 100644
--- a/ql/src/test/results/clientpositive/perf/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/query45.q.out
@@ -18,63 +18,63 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_54]
+         File Output Operator [FS_44]
             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_53]
+            Limit [LIM_43]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_52]
+               Select Operator [SEL_42]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_51]
+                  Reduce Output Operator [RS_41]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(17,2))
-                     Select Operator [SEL_50]
+                     Select Operator [SEL_40]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_49]
+                        Group By Operator [GBY_39]
                         |  aggregations:["sum(VALUE._col0)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2"]
                         |  Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_48]
+                           Reduce Output Operator [RS_38]
                               key expressions:_col0 (type: string), _col1 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                               sort order:++
                               Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col2 (type: decimal(17,2))
-                              Group By Operator [GBY_47]
+                              Group By Operator [GBY_37]
                                  aggregations:["sum(_col3)"]
                                  keys:_col7 (type: string), _col8 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2"]
                                  Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_46]
+                                 Select Operator [SEL_36]
                                     outputColumnNames:["_col7","_col8","_col3"]
                                     Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_82]
+                                    Merge Join Operator [MERGEJOIN_72]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col3","_col7","_col8"]
                                     |  Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 12 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_44]
+                                    |  Reduce Output Operator [RS_34]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
                                     |     Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
-                                    |     Merge Join Operator [MERGEJOIN_81]
+                                    |     Merge Join Operator [MERGEJOIN_71]
                                     |     |  condition map:[{"":"Left Semi Join 0 to 1"}]
                                     |     |  keys:{"0":"_col1 (type: string)","1":"_col0 (type: string)"}
                                     |     |  outputColumnNames:["_col0"]
                                     |     |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                     |     |<-Map 11 [SIMPLE_EDGE]
-                                    |     |  Reduce Output Operator [RS_21]
+                                    |     |  Reduce Output Operator [RS_20]
                                     |     |     key expressions:_col1 (type: string)
                                     |     |     Map-reduce partition columns:_col1 (type: string)
                                     |     |     sort order:+
@@ -83,14 +83,14 @@ Stage-0
                                     |     |     Select Operator [SEL_14]
                                     |     |        outputColumnNames:["_col0","_col1"]
                                     |     |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                    |     |        Filter Operator [FIL_76]
+                                    |     |        Filter Operator [FIL_66]
                                     |     |           predicate:(i_item_sk is not null and i_item_id is not null) (type: boolean)
                                     |     |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |     |           TableScan [TS_12]
                                     |     |              alias:item
                                     |     |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |     |<-Map 13 [SIMPLE_EDGE]
-                                    |        Reduce Output Operator [RS_23]
+                                    |        Reduce Output Operator [RS_21]
                                     |           key expressions:_col0 (type: string)
                                     |           Map-reduce partition columns:_col0 (type: string)
                                     |           sort order:+
@@ -102,26 +102,26 @@ Stage-0
                                     |              Select Operator [SEL_17]
                                     |                 outputColumnNames:["_col0"]
                                     |                 Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Filter Operator [FIL_77]
+                                    |                 Filter Operator [FIL_67]
                                     |                    predicate:((i_item_sk) IN (2, 3, 5, 7, 11, 13, 17, 19, 23, 29) and i_item_id is not null) (type: boolean)
                                     |                    Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                     |                    TableScan [TS_15]
                                     |                       alias:item
                                     |                       Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_42]
+                                       Reduce Output Operator [RS_33]
                                           key expressions:_col1 (type: int)
                                           Map-reduce partition columns:_col1 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: decimal(7,2)), _col7 (type: string), _col8 (type: string)
-                                          Merge Join Operator [MERGEJOIN_80]
+                                          Merge Join Operator [MERGEJOIN_70]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col1","_col3","_col7","_col8"]
                                           |  Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 10 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_39]
+                                          |  Reduce Output Operator [RS_31]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
@@ -129,26 +129,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_75]
+                                          |        Filter Operator [FIL_65]
                                           |           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_9]
                                           |              alias:date_dim
                                           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 3 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_37]
+                                             Reduce Output Operator [RS_30]
                                                 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:_col1 (type: int), _col3 (type: decimal(7,2)), _col7 (type: string), _col8 (type: string)
-                                                Merge Join Operator [MERGEJOIN_79]
+                                                Merge Join Operator [MERGEJOIN_69]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col0","_col1","_col3","_col7","_col8"]
                                                 |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 9 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_34]
+                                                |  Reduce Output Operator [RS_28]
                                                 |     key expressions:_col0 (type: int)
                                                 |     Map-reduce partition columns:_col0 (type: int)
                                                 |     sort order:+
@@ -157,26 +157,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_74]
+                                                |        Filter Operator [FIL_64]
                                                 |           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_32]
+                                                   Reduce Output Operator [RS_27]
                                                       key expressions:_col5 (type: int)
                                                       Map-reduce partition columns:_col5 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col0 (type: int), _col1 (type: int), _col3 (type: decimal(7,2))
-                                                      Merge Join Operator [MERGEJOIN_78]
+                                                      Merge Join Operator [MERGEJOIN_68]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col1","_col3","_col5"]
                                                       |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_27]
+                                                      |  Reduce Output Operator [RS_24]
                                                       |     key expressions:_col2 (type: int)
                                                       |     Map-reduce partition columns:_col2 (type: int)
                                                       |     sort order:+
@@ -185,14 +185,14 @@ Stage-0
                                                       |     Select Operator [SEL_2]
                                                       |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_72]
+                                                      |        Filter Operator [FIL_62]
                                                       |           predicate:((ws_bill_customer_sk is not null and ws_sold_date_sk is not null) and ws_item_sk is not null) (type: boolean)
                                                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan [TS_0]
                                                       |              alias:web_sales
                                                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 8 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_29]
+                                                         Reduce Output Operator [RS_25]
                                                             key expressions:_col0 (type: int)
                                                             Map-reduce partition columns:_col0 (type: int)
                                                             sort order:+
@@ -201,7 +201,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_73]
+                                                               Filter Operator [FIL_63]
                                                                   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]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query46.q.out b/ql/src/test/results/clientpositive/perf/query46.q.out
index 5d11fd7..0ded912 100644
--- a/ql/src/test/results/clientpositive/perf/query46.q.out
+++ b/ql/src/test/results/clientpositive/perf/query46.q.out
@@ -19,114 +19,114 @@ Stage-0
       limit:100
       Stage-1
          Reducer 9
-         File Output Operator [FS_62]
+         File Output Operator [FS_50]
             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_61]
+            Limit [LIM_49]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_60]
+               Select Operator [SEL_48]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 8 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_59]
+                  Reduce Output Operator [RS_47]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int)
                      sort order:+++++
                      Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col5 (type: decimal(17,2)), _col6 (type: decimal(17,2))
-                     Select Operator [SEL_58]
+                     Select Operator [SEL_46]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_90]
+                        Filter Operator [FIL_45]
                            predicate:(_col10 <> _col2) (type: boolean)
                            Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_103]
+                           Merge Join Operator [MERGEJOIN_90]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col6 (type: int)","1":"_col0 (type: int)"}
                            |  outputColumnNames:["_col0","_col2","_col3","_col4","_col7","_col8","_col10"]
                            |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 15 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_55]
+                           |  Reduce Output Operator [RS_43]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col1 (type: string)
-                           |     Select Operator [SEL_46]
+                           |     Select Operator [SEL_38]
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_97]
+                           |        Filter Operator [FIL_84]
                            |           predicate:ca_address_sk is not null (type: boolean)
                            |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                           |           TableScan [TS_44]
+                           |           TableScan [TS_36]
                            |              alias:customer_address
                            |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 7 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_53]
+                              Reduce Output Operator [RS_42]
                                  key expressions:_col6 (type: int)
                                  Map-reduce partition columns:_col6 (type: int)
                                  sort order:+
                                  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: int), _col2 (type: string), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col7 (type: string), _col8 (type: string)
-                                 Merge Join Operator [MERGEJOIN_102]
+                                 Merge Join Operator [MERGEJOIN_89]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0","_col2","_col3","_col4","_col6","_col7","_col8"]
                                  |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 14 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_50]
+                                 |  Reduce Output Operator [RS_40]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                  |     value expressions:_col1 (type: int), _col2 (type: string), _col3 (type: string)
-                                 |     Select Operator [SEL_43]
+                                 |     Select Operator [SEL_35]
                                  |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_96]
+                                 |        Filter Operator [FIL_83]
                                  |           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_41]
+                                 |           TableScan [TS_33]
                                  |              alias:customer
                                  |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 6 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_48]
+                                    Reduce Output Operator [RS_39]
                                        key expressions:_col1 (type: int)
                                        Map-reduce partition columns:_col1 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), _col2 (type: string), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2))
-                                       Select Operator [SEL_39]
+                                       Select Operator [SEL_31]
                                           outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                           Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                          Group By Operator [GBY_38]
+                                          Group By Operator [GBY_30]
                                           |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                                           |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: string)
                                           |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                           |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 5 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_37]
+                                             Reduce Output Operator [RS_29]
                                                 key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                                 Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                                 sort order:++++
                                                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col4 (type: decimal(17,2)), _col5 (type: decimal(17,2))
-                                                Group By Operator [GBY_36]
+                                                Group By Operator [GBY_28]
                                                    aggregations:["sum(_col6)","sum(_col7)"]
                                                    keys:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col17 (type: string)
                                                    outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                   Select Operator [SEL_35]
+                                                   Select Operator [SEL_27]
                                                       outputColumnNames:["_col1","_col3","_col5","_col17","_col6","_col7"]
                                                       Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_101]
+                                                      Merge Join Operator [MERGEJOIN_88]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col3","_col5","_col6","_col7","_col17"]
                                                       |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 13 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_33]
+                                                      |  Reduce Output Operator [RS_25]
                                                       |     key expressions:_col0 (type: int)
                                                       |     Map-reduce partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -135,26 +135,26 @@ Stage-0
                                                       |     Select Operator [SEL_14]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_95]
+                                                      |        Filter Operator [FIL_82]
                                                       |           predicate:ca_address_sk is not null (type: boolean)
                                                       |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_12]
                                                       |              alias:customer_address
                                                       |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 4 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_31]
+                                                         Reduce Output Operator [RS_24]
                                                             key expressions:_col3 (type: int)
                                                             Map-reduce partition columns:_col3 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col1 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                            Merge Join Operator [MERGEJOIN_100]
+                                                            Merge Join Operator [MERGEJOIN_87]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col1","_col3","_col5","_col6","_col7"]
                                                             |  Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 12 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_28]
+                                                            |  Reduce Output Operator [RS_22]
                                                             |     key expressions:_col0 (type: int)
                                                             |     Map-reduce partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -162,26 +162,26 @@ Stage-0
                                                             |     Select Operator [SEL_11]
                                                             |        outputColumnNames:["_col0"]
                                                             |        Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                                                            |        Filter Operator [FIL_94]
+                                                            |        Filter Operator [FIL_81]
                                                             |           predicate:(((hd_dep_count = 4) or (hd_vehicle_count = 2)) 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_26]
+                                                               Reduce Output Operator [RS_21]
                                                                   key expressions:_col2 (type: int)
                                                                   Map-reduce partition columns:_col2 (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), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                                  Merge Join Operator [MERGEJOIN_99]
+                                                                  Merge Join Operator [MERGEJOIN_86]
                                                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                   |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                                   |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col7"]
                                                                   |  Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Map 11 [SIMPLE_EDGE]
-                                                                  |  Reduce Output Operator [RS_23]
+                                                                  |  Reduce Output Operator [RS_19]
                                                                   |     key expressions:_col0 (type: int)
                                                                   |     Map-reduce partition columns:_col0 (type: int)
                                                                   |     sort order:+
@@ -189,26 +189,26 @@ Stage-0
                                                                   |     Select Operator [SEL_8]
                                                                   |        outputColumnNames:["_col0"]
                                                                   |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                                                  |        Filter Operator [FIL_93]
+                                                                  |        Filter Operator [FIL_80]
                                                                   |           predicate:((s_city) IN ('Rosedale', 'Bethlehem', 'Clinton', 'Clifton', 'Springfield') and s_store_sk is not null) (type: boolean)
                                                                   |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                                                   |           TableScan [TS_6]
                                                                   |              alias:store
                                                                   |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Reducer 2 [SIMPLE_EDGE]
-                                                                     Reduce Output Operator [RS_21]
+                                                                     Reduce Output Operator [RS_18]
                                                                         key expressions:_col4 (type: int)
                                                                         Map-reduce partition columns:_col4 (type: int)
                                                                         sort order:+
                                                                         Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                         value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                                        Merge Join Operator [MERGEJOIN_98]
+                                                                        Merge Join Operator [MERGEJOIN_85]
                                                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                         |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                         |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                                         |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                         |<-Map 1 [SIMPLE_EDGE]
-                                                                        |  Reduce Output Operator [RS_16]
+                                                                        |  Reduce Output Operator [RS_15]
                                                                         |     key expressions:_col0 (type: int)
                                                                         |     Map-reduce partition columns:_col0 (type: int)
                                                                         |     sort order:+
@@ -217,14 +217,14 @@ Stage-0
                                                                         |     Select Operator [SEL_2]
                                                                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                                         |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                        |        Filter Operator [FIL_91]
+                                                                        |        Filter Operator [FIL_78]
                                                                         |           predicate:((((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_hdemo_sk is not null) and ss_addr_sk is not null) and ss_customer_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 10 [SIMPLE_EDGE]
-                                                                           Reduce Output Operator [RS_18]
+                                                                           Reduce Output Operator [RS_16]
                                                                               key expressions:_col0 (type: int)
                                                                               Map-reduce partition columns:_col0 (type: int)
                                                                               sort order:+
@@ -232,7 +232,7 @@ Stage-0
                                                                               Select Operator [SEL_5]
                                                                                  outputColumnNames:["_col0"]
                                                                                  Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                                                 Filter Operator [FIL_92]
+                                                                                 Filter Operator [FIL_79]
                                                                                     predicate:(((d_year) IN (1998, 1999, 2000) and (d_dow) IN (6, 0)) and d_date_sk is not null) (type: boolean)
                                                                                     Statistics:Num rows: 18262 Data size: 20435178 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/query48.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query48.q.out b/ql/src/test/results/clientpositive/perf/query48.q.out
index d15d578..40b76f0 100644
--- a/ql/src/test/results/clientpositive/perf/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/query48.q.out
@@ -16,63 +16,63 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 6
-         File Output Operator [FS_42]
+         File Output Operator [FS_34]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [GBY_40]
+            Group By Operator [GBY_32]
             |  aggregations:["sum(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 5 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_39]
+               Reduce Output Operator [RS_31]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_38]
+                  Group By Operator [GBY_30]
                      aggregations:["sum(_col4)"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_66]
+                     Merge Join Operator [MERGEJOIN_57]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col4"]
                      |  Statistics:Num rows: 18150000 Data size: 18420070657 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 10 [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: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |     Select Operator [SEL_31]
+                     |     Select Operator [SEL_25]
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_62]
+                     |        Filter Operator [FIL_53]
                      |           predicate:((d_year = 1998) and d_date_sk is not null) (type: boolean)
                      |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_29]
+                     |           TableScan [TS_23]
                      |              alias:date_dim
                      |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_33]
+                        Reduce Output Operator [RS_26]
                            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:_col4 (type: int)
-                           Select Operator [SEL_28]
+                           Select Operator [SEL_22]
                               outputColumnNames:["_col0","_col4"]
                               Statistics:Num rows: 16500000 Data size: 16745518417 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_57]
+                              Filter Operator [FIL_21]
                                  predicate:(((_col12) IN ('KY', 'GA', 'NM') and _col6 BETWEEN 0 AND 2000) or ((_col12) IN ('MT', 'OR', 'IN') and _col6 BETWEEN 150 AND 3000) or ((_col12) IN ('WI', 'MO', 'WV') and _col6 BETWEEN 50 AND 25000)) (type: boolean)
                                  Statistics:Num rows: 16500000 Data size: 16745518417 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_65]
+                                 Merge Join Operator [MERGEJOIN_56]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0","_col4","_col6","_col12"]
                                  |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 9 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_25]
+                                 |  Reduce Output Operator [RS_19]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -81,26 +81,26 @@ Stage-0
                                  |     Select Operator [SEL_11]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_61]
+                                 |        Filter Operator [FIL_52]
                                  |           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_9]
                                  |              alias:customer_address
                                  |              Statistics:Num rows: 40000000 Data size: 40595195284 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: 5445 Data size: 1972040 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), _col4 (type: int), _col6 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_64]
+                                       Merge Join Operator [MERGEJOIN_55]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col0","_col2","_col4","_col6"]
                                        |  Statistics:Num rows: 5445 Data size: 1972040 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 8 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_20]
+                                       |  Reduce Output Operator [RS_16]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -108,26 +108,26 @@ Stage-0
                                        |     Select Operator [SEL_8]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_60]
+                                       |        Filter Operator [FIL_51]
                                        |           predicate:(((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M')) and cd_demo_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_6]
                                        |              alias: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), _col4 (type: int), _col6 (type: decimal(7,2))
-                                             Merge Join Operator [MERGEJOIN_63]
+                                             Merge Join Operator [MERGEJOIN_54]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col0","_col1","_col2","_col4","_col6"]
                                              |  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:_col3 (type: int)
                                              |     Map-reduce partition columns:_col3 (type: int)
                                              |     sort order:+
@@ -136,14 +136,14 @@ Stage-0
                                              |     Select Operator [SEL_2]
                                              |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6"]
                                              |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                             |        Filter Operator [FIL_58]
+                                             |        Filter Operator [FIL_49]
                                              |           predicate:((((((ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 25000) 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_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 7 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_15]
+                                                Reduce Output Operator [RS_13]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
@@ -151,7 +151,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_59]
+                                                      Filter Operator [FIL_50]
                                                          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/query50.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query50.q.out b/ql/src/test/results/clientpositive/perf/query50.q.out
index fcc8338..8b41d05 100644
--- a/ql/src/test/results/clientpositive/perf/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/query50.q.out
@@ -129,49 +129,49 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_44]
+         File Output Operator [FS_36]
             compressed:false
             Statistics:Num rows: 100 Data size: 111900 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_43]
+            Limit [LIM_35]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 111900 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_42]
+               Select Operator [SEL_34]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                |  Statistics:Num rows: 44194 Data size: 49453809 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_41]
+                  Reduce Output Operator [RS_33]
                      key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string)
                      sort order:++++++++++
                      Statistics:Num rows: 44194 Data size: 49453809 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col10 (type: bigint), _col11 (type: bigint), _col12 (type: bigint), _col13 (type: bigint), _col14 (type: bigint)
-                     Group By Operator [GBY_39]
+                     Group By Operator [GBY_31]
                      |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string), KEY._col5 (type: string), KEY._col6 (type: string), KEY._col7 (type: string), KEY._col8 (type: string), KEY._col9 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                      |  Statistics:Num rows: 44194 Data size: 49453809 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_38]
+                        Reduce Output Operator [RS_30]
                            key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string)
                            sort order:++++++++++
                            Statistics:Num rows: 88388 Data size: 98907619 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col10 (type: bigint), _col11 (type: bigint), _col12 (type: bigint), _col13 (type: bigint), _col14 (type: bigint)
-                           Group By Operator [GBY_37]
+                           Group By Operator [GBY_29]
                               aggregations:["sum(_col10)","sum(_col11)","sum(_col12)","sum(_col13)","sum(_col14)"]
                               keys:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                               Statistics:Num rows: 88388 Data size: 98907619 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_35]
+                              Select Operator [SEL_27]
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                                  Statistics:Num rows: 88388 Data size: 98907619 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_67]
+                                 Merge Join Operator [MERGEJOIN_59]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0","_col5","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19"]
                                  |  Statistics:Num rows: 88388 Data size: 98907619 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_33]
+                                 |  Reduce Output Operator [RS_25]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -179,26 +179,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_63]
+                                 |        Filter Operator [FIL_55]
                                  |           predicate:(((d_year = 2000) and d_date_sk is not null) and (d_moy = 9)) (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_31]
+                                    Reduce Output Operator [RS_24]
                                        key expressions:_col5 (type: int)
                                        Map-reduce partition columns:_col5 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), _col10 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: string), _col18 (type: string), _col19 (type: string)
-                                       Merge Join Operator [MERGEJOIN_66]
+                                       Merge Join Operator [MERGEJOIN_58]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col0","_col5","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19"]
                                        |  Statistics:Num rows: 80353 Data size: 89916016 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_28]
+                                       |  Reduce Output Operator [RS_22]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -206,26 +206,26 @@ Stage-0
                                        |     Select Operator [SEL_11]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_62]
+                                       |        Filter Operator [FIL_54]
                                        |           predicate:d_date_sk is not null (type: boolean)
                                        |           Statistics:Num rows: 73049 Data size: 81741831 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_26]
+                                          Reduce Output Operator [RS_21]
                                              key expressions:_col0 (type: int)
                                              Map-reduce partition columns:_col0 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col5 (type: int), _col10 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: string), _col18 (type: string), _col19 (type: string)
-                                             Merge Join Operator [MERGEJOIN_65]
+                                             Merge Join Operator [MERGEJOIN_57]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col0","_col5","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19"]
                                              |  Statistics:Num rows: 1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 9 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_23]
+                                             |  Reduce Output Operator [RS_19]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -234,26 +234,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                                              |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_61]
+                                             |        Filter Operator [FIL_53]
                                              |           predicate:s_store_sk is not null (type: boolean)
                                              |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              alias:store
                                              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_21]
+                                                Reduce Output Operator [RS_18]
                                                    key expressions:_col3 (type: int)
                                                    Map-reduce partition columns:_col3 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    value expressions:_col0 (type: int), _col5 (type: int)
-                                                   Merge Join Operator [MERGEJOIN_64]
+                                                   Merge Join Operator [MERGEJOIN_56]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col4 (type: int), _col1 (type: int), _col2 (type: int)","1":"_col3 (type: int), _col1 (type: int), _col2 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col3","_col5"]
                                                    |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_16]
+                                                   |  Reduce Output Operator [RS_15]
                                                    |     key expressions:_col4 (type: int), _col1 (type: int), _col2 (type: int)
                                                    |     Map-reduce partition columns:_col4 (type: int), _col1 (type: int), _col2 (type: int)
                                                    |     sort order:+++
@@ -262,14 +262,14 @@ Stage-0
                                                    |     Select Operator [SEL_2]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_59]
+                                                   |        Filter Operator [FIL_51]
                                                    |           predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) and ss_item_sk is not null) and ss_store_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_18]
+                                                      Reduce Output Operator [RS_16]
                                                          key expressions:_col3 (type: int), _col1 (type: int), _col2 (type: int)
                                                          Map-reduce partition columns:_col3 (type: int), _col1 (type: int), _col2 (type: int)
                                                          sort order:+++
@@ -278,7 +278,7 @@ Stage-0
                                                          Select Operator [SEL_5]
                                                             outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            Filter Operator [FIL_60]
+                                                            Filter Operator [FIL_52]
                                                                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]


[31/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
index c63016d..d40b165 100644
--- a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
@@ -704,7 +704,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and value is not null) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0) and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -889,7 +889,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and value is not null) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0) and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -937,7 +937,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and value is not null) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0) and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 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/auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
index 096f5d4..75940c6 100644
--- a/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
@@ -581,7 +581,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -701,7 +701,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -904,14 +904,11 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: int)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
@@ -922,14 +919,11 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: int)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1217,7 +1211,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
index 30853c4..69ae0bf 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
@@ -138,7 +138,7 @@ POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3out
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@bucket_medium@ds=2008-04-08
-Warning: Map Join MAPJOIN[36][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[32][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
@@ -697,7 +697,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[36][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[32][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket_big

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
index 3e8dbcf..cb87f76 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
@@ -430,7 +430,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -451,7 +451,7 @@ STAGE PLANS:
             alias: c
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -821,7 +821,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -842,7 +842,7 @@ STAGE PLANS:
             alias: c
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
index e6c2832..1123d34 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
@@ -757,7 +757,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -877,7 +877,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -1085,13 +1085,10 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
-                  Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                  HashTable Sink Operator
-                    keys:
-                      0 _col0 (type: int)
-                      1 _col0 (type: int)
+                HashTable Sink Operator
+                  keys:
+                    0 _col0 (type: int)
+                    1 _col0 (type: int)
 
   Stage: Stage-2
     Map Reduce
@@ -1106,25 +1103,22 @@ STAGE PLANS:
                 expressions: (key + 1) (type: int)
                 outputColumnNames: _col0
                 Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
-                  Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                  Map Join Operator
-                    condition map:
-                         Inner Join 0 to 1
-                    keys:
-                      0 _col0 (type: int)
-                      1 _col0 (type: int)
-                    Statistics: Num rows: 11 Data size: 77 Basic stats: COMPLETE Column stats: NONE
-                    Group By Operator
-                      aggregations: count()
-                      mode: hash
-                      outputColumnNames: _col0
+                Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  keys:
+                    0 _col0 (type: int)
+                    1 _col0 (type: int)
+                  Statistics: Num rows: 11 Data size: 77 Basic stats: COMPLETE Column stats: NONE
+                  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)
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -1468,7 +1462,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3112,7 +3106,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3130,7 +3124,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3175,7 +3169,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3193,7 +3187,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3233,7 +3227,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3366,7 +3360,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3384,7 +3378,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3429,7 +3423,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3447,7 +3441,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -3487,7 +3481,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -4635,7 +4629,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -4653,7 +4647,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -4698,7 +4692,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -4716,7 +4710,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
@@ -4756,7 +4750,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
index 326e4d6..fa73acf 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
@@ -359,7 +359,7 @@ STAGE PLANS:
             alias: test_table1
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 8) and ((key = 0) or (key = 5))) and key is not null) (type: boolean)
+              predicate: ((key < 8) and ((key = 0) or (key = 5))) (type: boolean)
               Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
index 62b611b..13d8a50 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
@@ -327,8 +327,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
index 3c6bb73..64bc50d 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
@@ -714,19 +714,16 @@ STAGE PLANS:
           TableScan
             alias: cbo_t4:cbo_t1
             Statistics: Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
-            Filter Operator
-              predicate: key is not null (type: boolean)
-              Statistics: Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-              Select Operator
-                expressions: key (type: string), c_int (type: int)
-                outputColumnNames: key, c_int
-                Statistics: Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                Reduce Output Operator
-                  key expressions: key (type: string)
-                  sort order: +
-                  Map-reduce partition columns: key (type: string)
-                  Statistics: Num rows: 18 Data size: 1424 Basic stats: COMPLETE Column stats: COMPLETE
-                  value expressions: c_int (type: int)
+            Select Operator
+              expressions: key (type: string), c_int (type: int)
+              outputColumnNames: key, c_int
+              Statistics: Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 20 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE
+                value expressions: c_int (type: int)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -739,14 +736,14 @@ STAGE PLANS:
             2 key (type: string)
             3 key (type: string)
           outputColumnNames: key, c_int, key0, c_int0, key1, c_int2
-          Statistics: Num rows: 1458 Data size: 389286 Basic stats: COMPLETE Column stats: COMPLETE
+          Statistics: Num rows: 1620 Data size: 432540 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
             expressions: key (type: string), c_int (type: int), key0 (type: string), c_int0 (type: int), key1 (type: string), c_int2 (type: int)
             outputColumnNames: key, c_int, p, q, x, b
-            Statistics: Num rows: 1458 Data size: 389286 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1620 Data size: 432540 Basic stats: COMPLETE Column stats: COMPLETE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1458 Data size: 389286 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 1620 Data size: 432540 Basic stats: COMPLETE Column stats: COMPLETE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
index e770028..da286e9 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
@@ -31,12 +31,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 40) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (_col0 = 40) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 
@@ -45,12 +45,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 40) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (_col0 = 40) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 
@@ -136,12 +136,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: ((key = 40) and (value = 40)) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), 40 (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: ((_col1 = 40) and (_col0 = 40)) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 
@@ -150,12 +150,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 40) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (_col0 = 40) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 
@@ -240,12 +240,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 40) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (_col0 = 40) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
@@ -256,12 +256,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 40) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 40 (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (_col0 = 40) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
@@ -348,12 +348,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (((key > 40) and (value > 50)) and (key = value)) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: key (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (((_col0 = _col1) and (_col1 > 50)) and (_col0 > 40)) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 
@@ -362,12 +362,12 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (((key > 40) and (value > 50)) and (key = value)) (type: boolean)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: key (type: int), value (type: int)
-                outputColumnNames: _col0, _col1
+            Select Operator
+              expressions: key (type: int), value (type: int)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE
+              Filter Operator
+                predicate: (((_col0 = _col1) and (_col1 > 50)) and (_col0 > 40)) (type: boolean)
                 Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   sort order: 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cbo_rp_lineage2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_lineage2.q.out b/ql/src/test/results/clientpositive/cbo_rp_lineage2.q.out
index b14caa8..79f76bf 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_lineage2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_lineage2.q.out
@@ -10,7 +10,7 @@ PREHOOK: query: select * from src1 where key is not null and value is not null l
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"mr","database":"default","hash":"b5b224847b2333e790a2c229434a04c8","queryText":"select * from src1 where key is not null and value is not null limit 3","edges":[],"vertices":[]}
+{"version":"1.0","engine":"mr","database":"default","hash":"b5b224847b2333e790a2c229434a04c8","queryText":"select * from src1 where key is not null and value is not null limit 3","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"(src1.key is not null and src1.value is not null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
 238	val_238
 	
 311	val_311
@@ -485,7 +485,7 @@ PREHOOK: query: select * from src1 where length(key) > 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"mr","database":"default","hash":"4028c94d222d5dd221f651d414386972","queryText":"select * from src1 where length(key) > 2","edges":[],"vertices":[]}
+{"version":"1.0","engine":"mr","database":"default","hash":"4028c94d222d5dd221f651d414386972","queryText":"select * from src1 where length(key) > 2","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(length(src1.key) > 2)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
 238	val_238
 311	val_311
 255	val_255
@@ -503,7 +503,7 @@ PREHOOK: query: select * from src1 where length(key) > 2 and value > 'a'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"mr","database":"default","hash":"5727531f7743cfcd60d634d8c835515f","queryText":"select * from src1 where length(key) > 2 and value > 'a'","edges":[],"vertices":[]}
+{"version":"1.0","engine":"mr","database":"default","hash":"5727531f7743cfcd60d634d8c835515f","queryText":"select * from src1 where length(key) > 2 and value > 'a'","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"((length(src1.key) > 2) and (src1.value > 'a'))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
 238	val_238
 311	val_311
 255	val_255
@@ -593,7 +593,7 @@ PREHOOK: Input: default@dept
 PREHOOK: Input: default@emp
 PREHOOK: Input: default@project
 PREHOOK: Output: default@tgt
-{"version":"1.0","engine":"mr","database":"default","hash":"f59797e0422d2e51515063374dfac361","queryText":"INSERT INTO TABLE tgt\nSELECT emd.dept_name, emd.name, emd.emp_id, emd.mgr_id, p.project_id, p.project_name\nFROM (\n  SELECT d.dept_name, em.name, em.emp_id, em.mgr_id, em.dept_id\n  FROM (\n    SELECT e.name, e.dept_id, e.emp_id emp_id, m.emp_id mgr_id\n    FROM emp e JOIN emp m ON e.emp_id = m.emp_id\n    ) em\n  JOIN dept d ON d.dept_id = em.dept_id\n  ) emd JOIN project p ON emd.dept_id = p.project_id","edges":[{"sources":[6],"targets":[0],"edgeType":"PROJECTION"},{"sources":[7],"targets":[1],"edgeType":"PROJECTION"},{"sources":[8],"targets":[2,3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"sources":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[8,11],"targets":[0,1,2,3,4,5],"expression":"(emd:em:e.emp_id is not null and emd:em:e.dept_id is not null)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3,4,5],"expression":"
 (emd:em:e.emp_id = emd:em:m.emp_id)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3,4,5],"expression":"emd:em:m.emp_id is not null","edgeType":"PREDICATE"},{"sources":[11,12,9],"targets":[0,1,2,3,4,5],"expression":"(emd:em:e.dept_id = emd:d.dept_id AND emd:em:e.dept_id = p.project_id)","edgeType":"PREDICATE"},{"sources":[12],"targets":[0,1,2,3,4,5],"expression":"emd:d.dept_id is not null","edgeType":"PREDICATE"},{"sources":[9],"targets":[0,1,2,3,4,5],"expression":"p.project_id is not null","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.tgt.dept_name"},{"id":1,"vertexType":"COLUMN","vertexId":"default.tgt.name"},{"id":2,"vertexType":"COLUMN","vertexId":"default.tgt.emp_id"},{"id":3,"vertexType":"COLUMN","vertexId":"default.tgt.mgr_id"},{"id":4,"vertexType":"COLUMN","vertexId":"default.tgt.proj_id"},{"id":5,"vertexType":"COLUMN","vertexId":"default.tgt.proj_name"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dept.dept_name"},{"id
 ":7,"vertexType":"COLUMN","vertexId":"default.emp.name"},{"id":8,"vertexType":"COLUMN","vertexId":"default.emp.emp_id"},{"id":9,"vertexType":"COLUMN","vertexId":"default.project.project_id"},{"id":10,"vertexType":"COLUMN","vertexId":"default.project.project_name"},{"id":11,"vertexType":"COLUMN","vertexId":"default.emp.dept_id"},{"id":12,"vertexType":"COLUMN","vertexId":"default.dept.dept_id"}]}
+{"version":"1.0","engine":"mr","database":"default","hash":"f59797e0422d2e51515063374dfac361","queryText":"INSERT INTO TABLE tgt\nSELECT emd.dept_name, emd.name, emd.emp_id, emd.mgr_id, p.project_id, p.project_name\nFROM (\n  SELECT d.dept_name, em.name, em.emp_id, em.mgr_id, em.dept_id\n  FROM (\n    SELECT e.name, e.dept_id, e.emp_id emp_id, m.emp_id mgr_id\n    FROM emp e JOIN emp m ON e.emp_id = m.emp_id\n    ) em\n  JOIN dept d ON d.dept_id = em.dept_id\n  ) emd JOIN project p ON emd.dept_id = p.project_id","edges":[{"sources":[6],"targets":[0],"edgeType":"PROJECTION"},{"sources":[7],"targets":[1],"edgeType":"PROJECTION"},{"sources":[8],"targets":[2,3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"sources":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[8,11],"targets":[0,1,2,3,4,5],"expression":"(e.emp_id is not null and e.dept_id is not null)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3,4,5],"expression":"(emd:em:e.emp_
 id = emd:em:m.emp_id)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3,4,5],"expression":"m.emp_id is not null","edgeType":"PREDICATE"},{"sources":[11,12,9],"targets":[0,1,2,3,4,5],"expression":"(emd:em:e.dept_id = emd:d.dept_id AND emd:em:e.dept_id = p.project_id)","edgeType":"PREDICATE"},{"sources":[12],"targets":[0,1,2,3,4,5],"expression":"d.dept_id is not null","edgeType":"PREDICATE"},{"sources":[9],"targets":[0,1,2,3,4,5],"expression":"p.project_id is not null","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.tgt.dept_name"},{"id":1,"vertexType":"COLUMN","vertexId":"default.tgt.name"},{"id":2,"vertexType":"COLUMN","vertexId":"default.tgt.emp_id"},{"id":3,"vertexType":"COLUMN","vertexId":"default.tgt.mgr_id"},{"id":4,"vertexType":"COLUMN","vertexId":"default.tgt.proj_id"},{"id":5,"vertexType":"COLUMN","vertexId":"default.tgt.proj_name"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dept.dept_name"},{"id":7,"vertexType":"COLUMN"
 ,"vertexId":"default.emp.name"},{"id":8,"vertexType":"COLUMN","vertexId":"default.emp.emp_id"},{"id":9,"vertexType":"COLUMN","vertexId":"default.project.project_id"},{"id":10,"vertexType":"COLUMN","vertexId":"default.project.project_name"},{"id":11,"vertexType":"COLUMN","vertexId":"default.emp.dept_id"},{"id":12,"vertexType":"COLUMN","vertexId":"default.dept.dept_id"}]}
 PREHOOK: query: drop table if exists dest_l2
 PREHOOK: type: DROPTABLE
 PREHOOK: query: create table dest_l2 (id int, c1 tinyint, c2 int, c3 bigint) stored as textfile

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
index 2630537..6be2546 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
@@ -398,13 +398,13 @@ STAGE PLANS:
             1 key (type: string)
           outputColumnNames: key, value, key0, value0
           Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            isSamplingPred: false
-            predicate: ((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 20.0)) and (UDFToDouble(key0) > 15.0)) and (UDFToDouble(key0) < 25.0)) (type: boolean)
-            Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string), key0 (type: string), value0 (type: string)
-              outputColumnNames: key, value, key0, value0
+          Select Operator
+            expressions: key (type: string), value (type: string), key0 (type: string), value0 (type: string)
+            outputColumnNames: key, value, key0, value0
+            Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              isSamplingPred: false
+              predicate: ((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 20.0) and (UDFToDouble(key0) > 15.0) and (UDFToDouble(key0) < 25.0)) (type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
@@ -780,13 +780,13 @@ STAGE PLANS:
             1 key (type: string)
           outputColumnNames: key, value, key0, value0
           Statistics: Num rows: 122 Data size: 1296 Basic stats: COMPLETE Column stats: NONE
-          Filter Operator
-            isSamplingPred: false
-            predicate: ((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 20.0)) (type: boolean)
-            Statistics: Num rows: 13 Data size: 138 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string), key0 (type: string), value0 (type: string)
-              outputColumnNames: key, value, key0, value0
+          Select Operator
+            expressions: key (type: string), value (type: string), key0 (type: string), value0 (type: string)
+            outputColumnNames: key, value, key0, value0
+            Statistics: Num rows: 122 Data size: 1296 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              isSamplingPred: false
+              predicate: ((UDFToDouble(key) > 10.0) and (UDFToDouble(key) < 20.0)) (type: boolean)
               Statistics: Num rows: 13 Data size: 138 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/correlationoptimizer10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
index 860452e..6bac698 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
@@ -420,7 +420,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -435,7 +435,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 20.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 20.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -474,7 +474,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -581,7 +581,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -597,7 +597,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 20.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -612,7 +612,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 20.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 20.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -748,7 +748,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -763,7 +763,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -802,7 +802,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -921,7 +921,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -937,7 +937,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -952,7 +952,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) > 180.0) and (UDFToDouble(key) < 200.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
index 82304d8..61b7bcb 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
@@ -61,7 +61,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c1 < 120) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: ((c1 < 120) and c3 is not null) (type: boolean)
               Statistics: Num rows: 342 Data size: 7639 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c3 (type: string), c1 (type: int)
@@ -162,7 +162,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((c2 > 100) and (c1 < 120)) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: (((c2 > 100) and (c1 < 120)) and c3 is not null) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c3 (type: string), c1 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
index d32003d..104a97a 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c1 < 120) and (c1 > 100)) and c1 is not null) (type: boolean)
+              predicate: ((c1 < 120) and (c1 > 100)) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int)
@@ -131,7 +131,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c2 > 100) and (c2 < 120)) and c2 is not null) (type: boolean)
+              predicate: ((c2 > 100) and (c2 < 120)) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c2 (type: int)
@@ -226,7 +226,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c1 < 120) and (c1 > 100)) and c1 is not null) (type: boolean)
+              predicate: ((c1 < 120) and (c1 > 100)) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int)
@@ -248,7 +248,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c2 > 100) and (c2 < 120)) and c2 is not null) (type: boolean)
+              predicate: ((c2 > 100) and (c2 < 120)) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c2 (type: int)
@@ -387,7 +387,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c1 < 120) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: ((c1 < 120) and c3 is not null) (type: boolean)
               Statistics: Num rows: 342 Data size: 7639 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c3 (type: string)
@@ -464,7 +464,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((c2 > 100) and (c1 < 120)) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: (((c2 > 100) and (c1 < 120)) and c3 is not null) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c3 (type: string)
@@ -557,7 +557,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((c1 < 120) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: ((c1 < 120) and c3 is not null) (type: boolean)
               Statistics: Num rows: 342 Data size: 7639 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c3 (type: string)
@@ -579,7 +579,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 1028 Data size: 22964 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((c2 > 100) and (c1 < 120)) and c3 is not null) and c1 is not null) (type: boolean)
+              predicate: (((c2 > 100) and (c1 < 120)) and c3 is not null) (type: boolean)
               Statistics: Num rows: 114 Data size: 2546 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: c1 (type: int), c3 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_join.q.out b/ql/src/test/results/clientpositive/cross_join.q.out
index f36496e..0438336 100644
--- a/ql/src/test/results/clientpositive/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/cross_join.q.out
@@ -179,7 +179,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src join src src2
@@ -242,7 +242,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src cross join src src2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/cross_product_check_1.q.out
index e7d6900..d9143c8 100644
--- a/ql/src/test/results/clientpositive/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/cross_product_check_1.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -190,7 +190,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[21][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key
@@ -446,7 +446,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A  group by key) ss join
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/cross_product_check_2.q.out
index df438c9..4e2b93e 100644
--- a/ql/src/test/results/clientpositive/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cross_product_check_2.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -93,7 +93,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -187,7 +187,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[31][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key 
@@ -323,8 +323,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[29][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[26][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[27][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
@@ -446,9 +446,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[50][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[43][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[47][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[40][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out b/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
index b85d387..3153c7e 100644
--- a/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
@@ -1080,14 +1080,14 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
-            outputColumnNames: _col0, _col1, _col3, _col4, _col5
+            expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
+            outputColumnNames: _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
               predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
-                expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
+                expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
                 outputColumnNames: _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 File Output Operator
@@ -1317,14 +1317,14 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
-            outputColumnNames: _col0, _col1, _col3, _col4, _col5
+            expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
+            outputColumnNames: _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Filter Operator
               predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Select Operator
-                expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
+                expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
                 outputColumnNames: _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index 8903860..36a7503 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -586,7 +586,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -606,7 +606,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/explain_logical.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out b/ql/src/test/results/clientpositive/explain_logical.q.out
index d302918..8124b7a 100644
--- a/ql/src/test/results/clientpositive/explain_logical.q.out
+++ b/ql/src/test/results/clientpositive/explain_logical.q.out
@@ -361,19 +361,19 @@ $hdt$_0:s1
   TableScan (TS_0)
     alias: s1
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_13)
+    Filter Operator (FIL_11)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_2)
         expressions: key (type: string)
         outputColumnNames: _col0
         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_7)
+        Reduce Output Operator (RS_6)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-          Join Operator (JOIN_10)
+          Join Operator (JOIN_8)
             condition map:
                  Inner Join 0 to 1
             keys:
@@ -381,11 +381,11 @@ $hdt$_0:s1
               1 _col0 (type: string)
             outputColumnNames: _col0, _col2
             Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-            Select Operator (SEL_11)
+            Select Operator (SEL_9)
               expressions: _col0 (type: string), _col2 (type: string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator (FS_12)
+              File Output Operator (FS_10)
                 compressed: false
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
                 table:
@@ -396,20 +396,20 @@ $hdt$_1:s2
   TableScan (TS_3)
     alias: s2
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_14)
+    Filter Operator (FIL_12)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_5)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_9)
+        Reduce Output Operator (RS_7)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_10)
+          Join Operator (JOIN_8)
             condition map:
                  Inner Join 0 to 1
             keys:
@@ -507,19 +507,19 @@ $hdt$_0:srcpart
   TableScan (TS_0)
     alias: srcpart
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_13)
+    Filter Operator (FIL_11)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_2)
         expressions: key (type: string)
         outputColumnNames: _col0
         Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_7)
+        Reduce Output Operator (RS_6)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-          Join Operator (JOIN_10)
+          Join Operator (JOIN_8)
             condition map:
                  Inner Join 0 to 1
             keys:
@@ -527,11 +527,11 @@ $hdt$_0:srcpart
               1 _col0 (type: string)
             outputColumnNames: _col0, _col2
             Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-            Select Operator (SEL_11)
+            Select Operator (SEL_9)
               expressions: _col0 (type: string), _col2 (type: string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator (FS_12)
+              File Output Operator (FS_10)
                 compressed: false
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
                 table:
@@ -542,20 +542,20 @@ $hdt$_1:src2
   TableScan (TS_3)
     alias: src2
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_14)
+    Filter Operator (FIL_12)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_5)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_9)
+        Reduce Output Operator (RS_7)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_10)
+          Join Operator (JOIN_8)
             condition map:
                  Inner Join 0 to 1
             keys:
@@ -589,20 +589,20 @@ $hdt$_0:srcpart
   TableScan (TS_0)
     alias: srcpart
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_18)
+    Filter Operator (FIL_15)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_2)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_10)
+        Reduce Output Operator (RS_9)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_15)
+          Join Operator (JOIN_12)
             condition map:
                  Inner Join 0 to 1
                  Inner Join 0 to 2
@@ -612,11 +612,11 @@ $hdt$_0:srcpart
               2 _col0 (type: string)
             outputColumnNames: _col1, _col2, _col4
             Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
-            Select Operator (SEL_16)
+            Select Operator (SEL_13)
               expressions: _col2 (type: string), _col1 (type: string), _col4 (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator (FS_17)
+              File Output Operator (FS_14)
                 compressed: false
                 Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
                 table:
@@ -627,19 +627,19 @@ $hdt$_1:src
   TableScan (TS_3)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_19)
+    Filter Operator (FIL_16)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_5)
         expressions: key (type: string)
         outputColumnNames: _col0
         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_12)
+        Reduce Output Operator (RS_10)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-          Join Operator (JOIN_15)
+          Join Operator (JOIN_12)
             condition map:
                  Inner Join 0 to 1
                  Inner Join 0 to 2
@@ -653,20 +653,20 @@ $hdt$_2:src
   TableScan (TS_6)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_20)
+    Filter Operator (FIL_17)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_8)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_14)
+        Reduce Output Operator (RS_11)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_15)
+          Join Operator (JOIN_12)
             condition map:
                  Inner Join 0 to 1
                  Inner Join 0 to 2
@@ -804,7 +804,7 @@ $hdt$_0:src
   TableScan (TS_0)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_19)
+    Filter Operator (FIL_17)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Group By Operator (GBY_3)
@@ -825,13 +825,13 @@ $hdt$_0:src
             mode: mergepartial
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-            Reduce Output Operator (RS_11)
+            Reduce Output Operator (RS_10)
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col1 (type: bigint)
-              Join Operator (JOIN_14)
+              Join Operator (JOIN_12)
                 condition map:
                      Inner Join 0 to 1
                 keys:
@@ -839,20 +839,20 @@ $hdt$_0:src
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                Select Operator (SEL_15)
+                Select Operator (SEL_13)
                   expressions: _col0 (type: string), _col1 (type: bigint), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator (RS_16)
+                  Reduce Output Operator (RS_14)
                     key expressions: _col0 (type: string)
                     sort order: +
                     Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col1 (type: bigint), _col2 (type: string)
-                    Select Operator (SEL_17)
+                    Select Operator (SEL_15)
                       expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                      File Output Operator (FS_18)
+                      File Output Operator (FS_16)
                         compressed: false
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                         table:
@@ -863,20 +863,20 @@ $hdt$_1:src
   TableScan (TS_7)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-    Filter Operator (FIL_20)
+    Filter Operator (FIL_18)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
       Select Operator (SEL_9)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col0, _col1
         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-        Reduce Output Operator (RS_13)
+        Reduce Output Operator (RS_11)
           key expressions: _col0 (type: string)
           sort order: +
           Map-reduce partition columns: _col0 (type: string)
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           value expressions: _col1 (type: string)
-          Join Operator (JOIN_14)
+          Join Operator (JOIN_12)
             condition map:
                  Inner Join 0 to 1
             keys:

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
index b1cfb25..5e0edbc 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
@@ -283,7 +283,7 @@ STAGE PLANS:
             alias: t2
             Statistics: Num rows: 20 Data size: 262 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 20 Data size: 262 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), c_int (type: int), c_float (type: float)


[16/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query72.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query72.q.out b/ql/src/test/results/clientpositive/perf/query72.q.out
index c56bffd..bb56f0d 100644
--- a/ql/src/test/results/clientpositive/perf/query72.q.out
+++ b/ql/src/test/results/clientpositive/perf/query72.q.out
@@ -23,302 +23,302 @@ Stage-0
       limit:100
       Stage-1
          Reducer 13
-         File Output Operator [FS_90]
+         File Output Operator [FS_74]
             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_89]
+            Limit [LIM_73]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_88]
+               Select Operator [SEL_72]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 165056 Data size: 237066834 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 12 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_87]
+                  Reduce Output Operator [RS_71]
                      key expressions:_col5 (type: bigint), _col0 (type: string), _col1 (type: string), _col2 (type: int)
                      sort order:-+++
                      Statistics:Num rows: 165056 Data size: 237066834 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col3 (type: bigint), _col4 (type: bigint)
-                     Group By Operator [GBY_85]
+                     Group By Operator [GBY_69]
                      |  aggregations:["count(VALUE._col0)","count(VALUE._col1)","count(VALUE._col2)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: int)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |  Statistics:Num rows: 165056 Data size: 237066834 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 11 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_84]
+                        Reduce Output Operator [RS_68]
                            key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: int)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: int)
                            sort order:+++
                            Statistics:Num rows: 330112 Data size: 474133669 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col3 (type: bigint), _col4 (type: bigint), _col5 (type: bigint)
-                           Group By Operator [GBY_83]
+                           Group By Operator [GBY_67]
                               aggregations:["count(_col3)","count(_col4)","count()"]
                               keys:_col0 (type: string), _col1 (type: string), _col2 (type: int)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                               Statistics:Num rows: 330112 Data size: 474133669 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_81]
+                              Select Operator [SEL_65]
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                  Statistics:Num rows: 330112 Data size: 474133669 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_159]
+                                 Merge Join Operator [MERGEJOIN_141]
                                  |  condition map:[{"":"Left Outer Join0 to 1"}]
                                  |  keys:{"0":"_col4 (type: int), _col6 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                                  |  outputColumnNames:["_col13","_col15","_col22","_col28"]
                                  |  Statistics:Num rows: 330112 Data size: 474133669 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 23 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_79]
+                                 |  Reduce Output Operator [RS_63]
                                  |     key expressions:_col0 (type: int), _col1 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                  |     sort order:++
                                  |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                 |     Select Operator [SEL_74]
+                                 |     Select Operator [SEL_58]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                 |        TableScan [TS_73]
+                                 |        TableScan [TS_57]
                                  |           alias:catalog_returns
                                  |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                  |<-Reducer 10 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_78]
+                                    Reduce Output Operator [RS_62]
                                        key expressions:_col4 (type: int), _col6 (type: int)
                                        Map-reduce partition columns:_col4 (type: int), _col6 (type: int)
                                        sort order:++
                                        Statistics:Num rows: 300102 Data size: 431030599 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col13 (type: string), _col15 (type: string), _col22 (type: int), _col28 (type: int)
-                                       Merge Join Operator [MERGEJOIN_158]
+                                       Merge Join Operator [MERGEJOIN_140]
                                        |  condition map:[{"":"Left Outer Join0 to 1"}]
                                        |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col4","_col6","_col13","_col15","_col22","_col28"]
                                        |  Statistics:Num rows: 300102 Data size: 431030599 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 22 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_76]
+                                       |  Reduce Output Operator [RS_60]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                                       |     Select Operator [SEL_72]
+                                       |     Select Operator [SEL_56]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                                       |        TableScan [TS_71]
+                                       |        TableScan [TS_55]
                                        |           alias:promotion
                                        |           Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 9 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_75]
+                                          Reduce Output Operator [RS_59]
                                              key expressions:_col5 (type: int)
                                              Map-reduce partition columns:_col5 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 272820 Data size: 391845991 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col4 (type: int), _col6 (type: int), _col13 (type: string), _col15 (type: string), _col22 (type: int)
-                                             Select Operator [SEL_70]
+                                             Select Operator [SEL_54]
                                                 outputColumnNames:["_col13","_col15","_col22","_col4","_col5","_col6"]
                                                 Statistics:Num rows: 272820 Data size: 391845991 Basic stats: COMPLETE Column stats: NONE
-                                                Filter Operator [FIL_137]
+                                                Filter Operator [FIL_53]
                                                    predicate:(UDFToDouble(_col27) > (UDFToDouble(_col21) + 5.0)) (type: boolean)
                                                    Statistics:Num rows: 272820 Data size: 391845991 Basic stats: COMPLETE Column stats: NONE
-                                                   Merge Join Operator [MERGEJOIN_157]
+                                                   Merge Join Operator [MERGEJOIN_139]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col4","_col5","_col6","_col13","_col15","_col21","_col22","_col27"]
                                                    |  Statistics:Num rows: 818460 Data size: 1175537975 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 21 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_67]
+                                                   |  Reduce Output Operator [RS_51]
                                                    |     key expressions:_col0 (type: int)
                                                    |     Map-reduce partition columns:_col0 (type: int)
                                                    |     sort order:+
                                                    |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                    |     value expressions:_col1 (type: string)
-                                                   |     Select Operator [SEL_33]
+                                                   |     Select Operator [SEL_31]
                                                    |        outputColumnNames:["_col0","_col1"]
                                                    |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator [FIL_147]
+                                                   |        Filter Operator [FIL_129]
                                                    |           predicate:d_date_sk is not null (type: boolean)
                                                    |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                   |           TableScan [TS_31]
+                                                   |           TableScan [TS_29]
                                                    |              alias:d1
                                                    |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Reducer 8 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_65]
+                                                      Reduce Output Operator [RS_50]
                                                          key expressions:_col1 (type: int)
                                                          Map-reduce partition columns:_col1 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 744055 Data size: 1068670864 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col4 (type: int), _col5 (type: int), _col6 (type: int), _col13 (type: string), _col15 (type: string), _col21 (type: string), _col22 (type: int)
-                                                         Merge Join Operator [MERGEJOIN_156]
+                                                         Merge Join Operator [MERGEJOIN_138]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col8 (type: int), _col22 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                                                          |  outputColumnNames:["_col1","_col4","_col5","_col6","_col13","_col15","_col21","_col22"]
                                                          |  Statistics:Num rows: 744055 Data size: 1068670864 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 20 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_62]
+                                                         |  Reduce Output Operator [RS_48]
                                                          |     key expressions:_col0 (type: int), _col1 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                                          |     sort order:++
                                                          |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                         |     Select Operator [SEL_30]
+                                                         |     Select Operator [SEL_28]
                                                          |        outputColumnNames:["_col0","_col1"]
                                                          |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_146]
+                                                         |        Filter Operator [FIL_128]
                                                          |           predicate:(d_week_seq is not null and d_date_sk is not null) (type: boolean)
                                                          |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                                         |           TableScan [TS_28]
+                                                         |           TableScan [TS_26]
                                                          |              alias:d1
                                                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 7 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_60]
+                                                            Reduce Output Operator [RS_47]
                                                                key expressions:_col8 (type: int), _col22 (type: int)
                                                                Map-reduce partition columns:_col8 (type: int), _col22 (type: int)
                                                                sort order:++
                                                                Statistics:Num rows: 676414 Data size: 971518947 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col1 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col13 (type: string), _col15 (type: string), _col21 (type: string)
-                                                               Merge Join Operator [MERGEJOIN_155]
+                                                               Merge Join Operator [MERGEJOIN_137]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col4","_col5","_col6","_col8","_col13","_col15","_col21","_col22"]
                                                                |  Statistics:Num rows: 676414 Data size: 971518947 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 19 [SIMPLE_EDGE]
-                                                               |  Reduce Output Operator [RS_57]
+                                                               |  Reduce Output Operator [RS_45]
                                                                |     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
                                                                |     value expressions:_col1 (type: string), _col2 (type: int)
-                                                               |     Select Operator [SEL_27]
+                                                               |     Select Operator [SEL_25]
                                                                |        outputColumnNames:["_col0","_col1","_col2"]
                                                                |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                               |        Filter Operator [FIL_145]
+                                                               |        Filter Operator [FIL_127]
                                                                |           predicate:((d_date_sk is not null and (d_year = 2001)) and d_week_seq is not null) (type: boolean)
                                                                |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                               |           TableScan [TS_25]
+                                                               |           TableScan [TS_23]
                                                                |              alias:d1
                                                                |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Reducer 6 [SIMPLE_EDGE]
-                                                                  Reduce Output Operator [RS_55]
+                                                                  Reduce Output Operator [RS_44]
                                                                      key expressions:_col0 (type: int)
                                                                      Map-reduce partition columns:_col0 (type: int)
                                                                      sort order:+
                                                                      Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                                                      value expressions:_col1 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col8 (type: int), _col13 (type: string), _col15 (type: string)
-                                                                     Merge Join Operator [MERGEJOIN_154]
+                                                                     Merge Join Operator [MERGEJOIN_136]
                                                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                      |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                                      |  outputColumnNames:["_col0","_col1","_col4","_col5","_col6","_col8","_col13","_col15"]
                                                                      |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Map 18 [SIMPLE_EDGE]
-                                                                     |  Reduce Output Operator [RS_52]
+                                                                     |  Reduce Output Operator [RS_42]
                                                                      |     key expressions:_col0 (type: int)
                                                                      |     Map-reduce partition columns:_col0 (type: int)
                                                                      |     sort order:+
                                                                      |     Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                                     |     Select Operator [SEL_24]
+                                                                     |     Select Operator [SEL_22]
                                                                      |        outputColumnNames:["_col0"]
                                                                      |        Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                                     |        Filter Operator [FIL_144]
+                                                                     |        Filter Operator [FIL_126]
                                                                      |           predicate:((hd_buy_potential = '1001-5000') and hd_demo_sk is not null) (type: boolean)
                                                                      |           Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                                     |           TableScan [TS_22]
+                                                                     |           TableScan [TS_20]
                                                                      |              alias:household_demographics
                                                                      |              Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Reducer 5 [SIMPLE_EDGE]
-                                                                        Reduce Output Operator [RS_50]
+                                                                        Reduce Output Operator [RS_41]
                                                                            key expressions:_col3 (type: int)
                                                                            Map-reduce partition columns:_col3 (type: int)
                                                                            sort order:+
                                                                            Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                                            value expressions:_col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col8 (type: int), _col13 (type: string), _col15 (type: string)
-                                                                           Merge Join Operator [MERGEJOIN_153]
+                                                                           Merge Join Operator [MERGEJOIN_135]
                                                                            |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                            |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                                            |  outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col8","_col13","_col15"]
                                                                            |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                                            |<-Map 17 [SIMPLE_EDGE]
-                                                                           |  Reduce Output Operator [RS_47]
+                                                                           |  Reduce Output Operator [RS_39]
                                                                            |     key expressions:_col0 (type: int)
                                                                            |     Map-reduce partition columns:_col0 (type: int)
                                                                            |     sort order:+
                                                                            |     Statistics:Num rows: 9900 Data size: 3585529 Basic stats: COMPLETE Column stats: NONE
-                                                                           |     Select Operator [SEL_21]
+                                                                           |     Select Operator [SEL_19]
                                                                            |        outputColumnNames:["_col0"]
                                                                            |        Statistics:Num rows: 9900 Data size: 3585529 Basic stats: COMPLETE Column stats: NONE
-                                                                           |        Filter Operator [FIL_143]
+                                                                           |        Filter Operator [FIL_125]
                                                                            |           predicate:((cd_marital_status = 'M') and cd_demo_sk is not null) (type: boolean)
                                                                            |           Statistics:Num rows: 9900 Data size: 3585529 Basic stats: COMPLETE Column stats: NONE
-                                                                           |           TableScan [TS_19]
+                                                                           |           TableScan [TS_17]
                                                                            |              alias:customer_demographics
                                                                            |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                                                            |<-Reducer 4 [SIMPLE_EDGE]
-                                                                              Reduce Output Operator [RS_45]
+                                                                              Reduce Output Operator [RS_38]
                                                                                  key expressions:_col2 (type: int)
                                                                                  Map-reduce partition columns:_col2 (type: int)
                                                                                  sort order:+
                                                                                  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                                                  value expressions:_col0 (type: int), _col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col8 (type: int), _col13 (type: string), _col15 (type: string)
-                                                                                 Merge Join Operator [MERGEJOIN_152]
+                                                                                 Merge Join Operator [MERGEJOIN_134]
                                                                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                  |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col8","_col13","_col15"]
                                                                                  |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                                                  |<-Map 16 [SIMPLE_EDGE]
-                                                                                 |  Reduce Output Operator [RS_42]
+                                                                                 |  Reduce Output Operator [RS_36]
                                                                                  |     key expressions:_col0 (type: int)
                                                                                  |     Map-reduce partition columns:_col0 (type: int)
                                                                                  |     sort order:+
                                                                                  |     Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                                                  |     value expressions:_col1 (type: string)
-                                                                                 |     Select Operator [SEL_18]
+                                                                                 |     Select Operator [SEL_16]
                                                                                  |        outputColumnNames:["_col0","_col1"]
                                                                                  |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                                                 |        Filter Operator [FIL_142]
+                                                                                 |        Filter Operator [FIL_124]
                                                                                  |           predicate:i_item_sk is not null (type: boolean)
                                                                                  |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                                                 |           TableScan [TS_16]
+                                                                                 |           TableScan [TS_14]
                                                                                  |              alias:item
                                                                                  |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                                                  |<-Reducer 3 [SIMPLE_EDGE]
-                                                                                    Reduce Output Operator [RS_40]
+                                                                                    Reduce Output Operator [RS_35]
                                                                                        key expressions:_col4 (type: int)
                                                                                        Map-reduce partition columns:_col4 (type: int)
                                                                                        sort order:+
                                                                                        Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                                                        value expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int), _col6 (type: int), _col8 (type: int), _col13 (type: string)
-                                                                                       Merge Join Operator [MERGEJOIN_151]
+                                                                                       Merge Join Operator [MERGEJOIN_133]
                                                                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                        |  keys:{"0":"_col10 (type: int)","1":"_col0 (type: int)"}
                                                                                        |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col8","_col13"]
                                                                                        |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                                                        |<-Map 15 [SIMPLE_EDGE]
-                                                                                       |  Reduce Output Operator [RS_37]
+                                                                                       |  Reduce Output Operator [RS_33]
                                                                                        |     key expressions:_col0 (type: int)
                                                                                        |     Map-reduce partition columns:_col0 (type: int)
                                                                                        |     sort order:+
                                                                                        |     Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                                                                        |     value expressions:_col1 (type: string)
-                                                                                       |     Select Operator [SEL_15]
+                                                                                       |     Select Operator [SEL_13]
                                                                                        |        outputColumnNames:["_col0","_col1"]
                                                                                        |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                                                                       |        Filter Operator [FIL_141]
+                                                                                       |        Filter Operator [FIL_123]
                                                                                        |           predicate:w_warehouse_sk is not null (type: boolean)
                                                                                        |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                                                                       |           TableScan [TS_13]
+                                                                                       |           TableScan [TS_11]
                                                                                        |              alias:warehouse
                                                                                        |              Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                                                                        |<-Reducer 2 [SIMPLE_EDGE]
-                                                                                          Reduce Output Operator [RS_35]
+                                                                                          Reduce Output Operator [RS_32]
                                                                                              key expressions:_col10 (type: int)
                                                                                              Map-reduce partition columns:_col10 (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), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col8 (type: int)
-                                                                                             Select Operator [SEL_12]
+                                                                                             Select Operator [SEL_10]
                                                                                                 outputColumnNames:["_col0","_col1","_col10","_col2","_col3","_col4","_col5","_col6","_col8"]
                                                                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                                Filter Operator [FIL_138]
+                                                                                                Filter Operator [FIL_9]
                                                                                                    predicate:(_col11 < _col7) (type: boolean)
                                                                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                                   Merge Join Operator [MERGEJOIN_150]
+                                                                                                   Merge Join Operator [MERGEJOIN_132]
                                                                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                                    |  keys:{"0":"_col4 (type: int)","1":"_col1 (type: int)"}
                                                                                                    |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col10","_col11"]
                                                                                                    |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                                                                   |  Reduce Output Operator [RS_7]
+                                                                                                   |  Reduce Output Operator [RS_6]
                                                                                                    |     key expressions:_col4 (type: int)
                                                                                                    |     Map-reduce partition columns:_col4 (type: int)
                                                                                                    |     sort order:+
@@ -327,14 +327,14 @@ Stage-0
                                                                                                    |     Select Operator [SEL_2]
                                                                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                                   |        Filter Operator [FIL_139]
+                                                                                                   |        Filter Operator [FIL_121]
                                                                                                    |           predicate:((((cs_item_sk is not null and cs_bill_cdemo_sk is not null) and cs_bill_hdemo_sk is not null) and cs_sold_date_sk is not null) and cs_ship_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 14 [SIMPLE_EDGE]
-                                                                                                      Reduce Output Operator [RS_9]
+                                                                                                      Reduce Output Operator [RS_7]
                                                                                                          key expressions:_col1 (type: int)
                                                                                                          Map-reduce partition columns:_col1 (type: int)
                                                                                                          sort order:+
@@ -343,7 +343,7 @@ Stage-0
                                                                                                          Select Operator [SEL_5]
                                                                                                             outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                                            Filter Operator [FIL_140]
+                                                                                                            Filter Operator [FIL_122]
                                                                                                                predicate:((inv_item_sk is not null and inv_warehouse_sk is not null) and inv_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/query73.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query73.q.out b/ql/src/test/results/clientpositive/perf/query73.q.out
index 3ab3df5..9c88854 100644
--- a/ql/src/test/results/clientpositive/perf/query73.q.out
+++ b/ql/src/test/results/clientpositive/perf/query73.q.out
@@ -17,80 +17,80 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_45]
+         File Output Operator [FS_37]
             compressed:false
             Statistics:Num rows: 88000001 Data size: 75681779077 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"}
-            Select Operator [SEL_44]
+            Select Operator [SEL_36]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_43]
+               Reduce Output Operator [RS_35]
                   key expressions:_col5 (type: bigint)
                   sort order:-
                   Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int)
-                  Select Operator [SEL_42]
+                  Select Operator [SEL_34]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_69]
+                     Merge Join Operator [MERGEJOIN_60]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col0","_col2","_col4","_col5","_col6","_col7"]
                      |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 11 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_40]
+                     |  Reduce Output Operator [RS_32]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                      |     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
-                     |     Select Operator [SEL_36]
+                     |     Select Operator [SEL_30]
                      |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                      |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_65]
+                     |        Filter Operator [FIL_56]
                      |           predicate:c_customer_sk is not null (type: boolean)
                      |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_34]
+                     |           TableScan [TS_28]
                      |              alias:customer
                      |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_38]
+                        Reduce Output Operator [RS_31]
                            key expressions:_col1 (type: int)
                            Map-reduce partition columns:_col1 (type: int)
                            sort order:+
                            Statistics:Num rows: 6076 Data size: 6799525 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col0 (type: int), _col2 (type: bigint)
-                           Select Operator [SEL_31]
-                              outputColumnNames:["_col0","_col1","_col2"]
+                           Filter Operator [FIL_26]
+                              predicate:_col2 BETWEEN 1 AND 5 (type: boolean)
                               Statistics:Num rows: 6076 Data size: 6799525 Basic stats: COMPLETE Column stats: NONE
-                              Filter Operator [FIL_60]
-                                 predicate:_col2 BETWEEN 1 AND 5 (type: boolean)
-                                 Statistics:Num rows: 6076 Data size: 6799525 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_30]
+                              Select Operator [SEL_25]
+                                 outputColumnNames:["_col0","_col1","_col2"]
+                                 Statistics:Num rows: 12152 Data size: 13599051 Basic stats: COMPLETE Column stats: NONE
+                                 Group By Operator [GBY_24]
                                  |  aggregations:["count(VALUE._col0)"]
                                  |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                                  |  outputColumnNames:["_col0","_col1","_col2"]
                                  |  Statistics:Num rows: 12152 Data size: 13599051 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_29]
+                                    Reduce Output Operator [RS_23]
                                        key expressions:_col0 (type: int), _col1 (type: int)
                                        Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                        sort order:++
                                        Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col2 (type: bigint)
-                                       Group By Operator [GBY_28]
+                                       Group By Operator [GBY_22]
                                           aggregations:["count()"]
                                           keys:_col1 (type: int), _col4 (type: int)
                                           outputColumnNames:["_col0","_col1","_col2"]
                                           Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
-                                          Merge Join Operator [MERGEJOIN_68]
+                                          Merge Join Operator [MERGEJOIN_59]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col1","_col4"]
                                           |  Statistics:Num rows: 24305 Data size: 27199223 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:+
@@ -98,26 +98,26 @@ Stage-0
                                           |     Select Operator [SEL_11]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 800 Data size: 85600 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_64]
+                                          |        Filter Operator [FIL_55]
                                           |           predicate:(((((hd_buy_potential = '1001-5000') or (hd_buy_potential = '5001-10000')) and (hd_vehicle_count > 0)) and (CASE WHEN ((hd_vehicle_count > 0)) THEN ((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count))) ELSE (null) END > 1.0)) and hd_demo_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 800 Data size: 85600 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: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (type: int), _col4 (type: int)
-                                                Merge Join Operator [MERGEJOIN_67]
+                                                Merge Join Operator [MERGEJOIN_58]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col1","_col2","_col4"]
                                                 |  Statistics:Num rows: 22096 Data size: 24726566 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:+
@@ -125,26 +125,26 @@ Stage-0
                                                 |     Select Operator [SEL_8]
                                                 |        outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_63]
+                                                |        Filter Operator [FIL_54]
                                                 |           predicate:((s_county) IN ('Kittitas County', 'Adams County', 'Richland County', 'Furnas County') and s_store_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_6]
                                                 |              alias:store
                                                 |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_18]
+                                                   Reduce Output Operator [RS_15]
                                                       key expressions:_col3 (type: int)
                                                       Map-reduce partition columns:_col3 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col1 (type: int), _col2 (type: int), _col4 (type: int)
-                                                      Merge Join Operator [MERGEJOIN_66]
+                                                      Merge Join Operator [MERGEJOIN_57]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col2","_col3","_col4"]
                                                       |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_13]
+                                                      |  Reduce Output Operator [RS_12]
                                                       |     key expressions:_col0 (type: int)
                                                       |     Map-reduce partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -153,14 +153,14 @@ Stage-0
                                                       |     Select Operator [SEL_2]
                                                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_61]
+                                                      |        Filter Operator [FIL_52]
                                                       |           predicate:(((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_hdemo_sk is not null) and ss_customer_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:+
@@ -168,7 +168,7 @@ Stage-0
                                                             Select Operator [SEL_5]
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                               Filter Operator [FIL_62]
+                                                               Filter Operator [FIL_53]
                                                                   predicate:(((d_year) IN (1998, 1999, 2000) and d_dom BETWEEN 1 AND 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_3]


[28/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

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

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

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

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


[18/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query67.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query67.q.out b/ql/src/test/results/clientpositive/perf/query67.q.out
index 33a7da2..0a61d0f 100644
--- a/ql/src/test/results/clientpositive/perf/query67.q.out
+++ b/ql/src/test/results/clientpositive/perf/query67.q.out
@@ -99,67 +99,67 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_42]
+         File Output Operator [FS_36]
             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_41]
+            Limit [LIM_35]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_40]
+               Select Operator [SEL_34]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                |  Statistics:Num rows: 762300 Data size: 1094874777 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_39]
+                  Reduce Output Operator [RS_33]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col8 (type: decimal(28,2)), _col9 (type: int)
                      sort order:++++++++++
                      Statistics:Num rows: 762300 Data size: 1094874777 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_35]
+                     Select Operator [SEL_29]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                         Statistics:Num rows: 762300 Data size: 1094874777 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_52]
+                        Filter Operator [FIL_46]
                            predicate:(rank_window_0 <= 100) (type: boolean)
                            Statistics:Num rows: 762300 Data size: 1094874777 Basic stats: COMPLETE Column stats: NONE
-                           PTF Operator [PTF_34]
+                           PTF Operator [PTF_28]
                               Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col9(DESC)","partition by:":"_col0"}]
                               Statistics:Num rows: 2286900 Data size: 3284624331 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_33]
+                              Select Operator [SEL_27]
                               |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col9"]
                               |  Statistics:Num rows: 2286900 Data size: 3284624331 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 5 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_32]
+                                 Reduce Output Operator [RS_26]
                                     key expressions:_col0 (type: string), _col9 (type: decimal(28,2))
                                     Map-reduce partition columns:_col0 (type: string)
                                     sort order:+-
                                     Statistics:Num rows: 2286900 Data size: 3284624331 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col9 (type: decimal(28,2))
-                                    Group By Operator [GBY_31]
+                                    Group By Operator [GBY_25]
                                     |  aggregations:["sum(VALUE._col0)"]
                                     |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int), KEY._col5 (type: int), KEY._col6 (type: int), KEY._col7 (type: string), KEY._col8 (type: string)
                                     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col9"]
                                     |  Statistics:Num rows: 2286900 Data size: 3284624331 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_30]
+                                       Reduce Output Operator [RS_24]
                                           key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col8 (type: string)
                                           Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col8 (type: string)
                                           sort order:+++++++++
                                           Statistics:Num rows: 4573800 Data size: 6569248662 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col9 (type: decimal(28,2))
-                                          Group By Operator [GBY_29]
+                                          Group By Operator [GBY_23]
                                              aggregations:["sum(_col8)"]
                                              keys:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: string), '0' (type: string)
                                              outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                                              Statistics:Num rows: 4573800 Data size: 6569248662 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_27]
+                                             Select Operator [SEL_21]
                                                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                                 Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_59]
+                                                Merge Join Operator [MERGEJOIN_53]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col3","_col4","_col7","_col8","_col9","_col11","_col13","_col14","_col15","_col16"]
                                                 |  Statistics:Num rows: 508200 Data size: 729916518 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:+
@@ -168,26 +168,26 @@ Stage-0
                                                 |     Select Operator [SEL_11]
                                                 |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                 |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_56]
+                                                |        Filter Operator [FIL_50]
                                                 |           predicate:i_item_sk is not null (type: boolean)
                                                 |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_9]
                                                 |              alias:item
                                                 |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_23]
+                                                   Reduce Output Operator [RS_18]
                                                       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:_col3 (type: int), _col4 (type: decimal(7,2)), _col7 (type: int), _col8 (type: int), _col9 (type: int), _col11 (type: string)
-                                                      Merge Join Operator [MERGEJOIN_58]
+                                                      Merge Join Operator [MERGEJOIN_52]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col3","_col4","_col7","_col8","_col9","_col11"]
                                                       |  Statistics:Num rows: 44193 Data size: 49453132 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:+
@@ -196,26 +196,26 @@ Stage-0
                                                       |     Select Operator [SEL_8]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_55]
+                                                      |        Filter Operator [FIL_49]
                                                       |           predicate:s_store_sk is not null (type: boolean)
                                                       |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_6]
                                                       |              alias:store
                                                       |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 2 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_18]
+                                                         Reduce Output Operator [RS_15]
                                                             key expressions:_col2 (type: int)
                                                             Map-reduce partition columns:_col2 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col7 (type: int), _col8 (type: int), _col9 (type: int)
-                                                            Merge Join Operator [MERGEJOIN_57]
+                                                            Merge Join Operator [MERGEJOIN_51]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col1","_col2","_col3","_col4","_col7","_col8","_col9"]
                                                             |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 1 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_13]
+                                                            |  Reduce Output Operator [RS_12]
                                                             |     key expressions:_col0 (type: int)
                                                             |     Map-reduce partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -224,14 +224,14 @@ Stage-0
                                                             |     Select Operator [SEL_2]
                                                             |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                             |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            |        Filter Operator [FIL_53]
+                                                            |        Filter Operator [FIL_47]
                                                             |           predicate:((ss_sold_date_sk is not null and ss_store_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_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:+
@@ -240,7 +240,7 @@ Stage-0
                                                                   Select Operator [SEL_5]
                                                                      outputColumnNames:["_col0","_col2","_col3","_col4"]
                                                                      Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                                     Filter Operator [FIL_54]
+                                                                     Filter Operator [FIL_48]
                                                                         predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                                         Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                         TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query68.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query68.q.out b/ql/src/test/results/clientpositive/perf/query68.q.out
index bfe90da..8ecde89 100644
--- a/ql/src/test/results/clientpositive/perf/query68.q.out
+++ b/ql/src/test/results/clientpositive/perf/query68.q.out
@@ -19,114 +19,114 @@ Stage-0
       limit:100
       Stage-1
          Reducer 9
-         File Output Operator [FS_62]
+         File Output Operator [FS_50]
             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_61]
+            Limit [LIM_49]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_60]
+               Select Operator [SEL_48]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 8 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_59]
+                  Reduce Output Operator [RS_47]
                      key expressions:_col0 (type: string), _col4 (type: int)
                      sort order:++
                      Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: decimal(17,2))
-                     Select Operator [SEL_58]
+                     Select Operator [SEL_46]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                         Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_90]
+                        Filter Operator [FIL_45]
                            predicate:(_col11 <> _col2) (type: boolean)
                            Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_103]
+                           Merge Join Operator [MERGEJOIN_90]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col7 (type: int)","1":"_col0 (type: int)"}
                            |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5","_col8","_col9","_col11"]
                            |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 15 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_55]
+                           |  Reduce Output Operator [RS_43]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col1 (type: string)
-                           |     Select Operator [SEL_46]
+                           |     Select Operator [SEL_38]
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_97]
+                           |        Filter Operator [FIL_84]
                            |           predicate:ca_address_sk is not null (type: boolean)
                            |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                           |           TableScan [TS_44]
+                           |           TableScan [TS_36]
                            |              alias:customer_address
                            |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 7 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_53]
+                              Reduce Output Operator [RS_42]
                                  key expressions:_col7 (type: int)
                                  Map-reduce partition columns:_col7 (type: int)
                                  sort order:+
                                  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: int), _col2 (type: string), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: decimal(17,2)), _col8 (type: string), _col9 (type: string)
-                                 Merge Join Operator [MERGEJOIN_102]
+                                 Merge Join Operator [MERGEJOIN_89]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5","_col7","_col8","_col9"]
                                  |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 14 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_50]
+                                 |  Reduce Output Operator [RS_40]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                  |     value expressions:_col1 (type: int), _col2 (type: string), _col3 (type: string)
-                                 |     Select Operator [SEL_43]
+                                 |     Select Operator [SEL_35]
                                  |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_96]
+                                 |        Filter Operator [FIL_83]
                                  |           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_41]
+                                 |           TableScan [TS_33]
                                  |              alias:customer
                                  |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 6 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_48]
+                                    Reduce Output Operator [RS_39]
                                        key expressions:_col1 (type: int)
                                        Map-reduce partition columns:_col1 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), _col2 (type: string), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: decimal(17,2))
-                                       Select Operator [SEL_39]
+                                       Select Operator [SEL_31]
                                           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                           Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                          Group By Operator [GBY_38]
+                                          Group By Operator [GBY_30]
                                           |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                                           |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: string)
                                           |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                           |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 5 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_37]
+                                             Reduce Output Operator [RS_29]
                                                 key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                                 Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                                 sort order:++++
                                                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col4 (type: decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2))
-                                                Group By Operator [GBY_36]
+                                                Group By Operator [GBY_28]
                                                    aggregations:["sum(_col6)","sum(_col7)","sum(_col8)"]
                                                    keys:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col18 (type: string)
                                                    outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                   Select Operator [SEL_35]
+                                                   Select Operator [SEL_27]
                                                       outputColumnNames:["_col1","_col3","_col5","_col18","_col6","_col7","_col8"]
                                                       Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_101]
+                                                      Merge Join Operator [MERGEJOIN_88]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col3","_col5","_col6","_col7","_col8","_col18"]
                                                       |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 13 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_33]
+                                                      |  Reduce Output Operator [RS_25]
                                                       |     key expressions:_col0 (type: int)
                                                       |     Map-reduce partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -135,26 +135,26 @@ Stage-0
                                                       |     Select Operator [SEL_14]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_95]
+                                                      |        Filter Operator [FIL_82]
                                                       |           predicate:ca_address_sk is not null (type: boolean)
                                                       |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_12]
                                                       |              alias:customer_address
                                                       |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 4 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_31]
+                                                         Reduce Output Operator [RS_24]
                                                             key expressions:_col3 (type: int)
                                                             Map-reduce partition columns:_col3 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col1 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col8 (type: decimal(7,2))
-                                                            Merge Join Operator [MERGEJOIN_100]
+                                                            Merge Join Operator [MERGEJOIN_87]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col1","_col3","_col5","_col6","_col7","_col8"]
                                                             |  Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 12 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_28]
+                                                            |  Reduce Output Operator [RS_22]
                                                             |     key expressions:_col0 (type: int)
                                                             |     Map-reduce partition columns:_col0 (type: int)
                                                             |     sort order:+
@@ -162,26 +162,26 @@ Stage-0
                                                             |     Select Operator [SEL_11]
                                                             |        outputColumnNames:["_col0"]
                                                             |        Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                                                            |        Filter Operator [FIL_94]
+                                                            |        Filter Operator [FIL_81]
                                                             |           predicate:(((hd_dep_count = 4) or (hd_vehicle_count = 2)) 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_26]
+                                                               Reduce Output Operator [RS_21]
                                                                   key expressions:_col2 (type: int)
                                                                   Map-reduce partition columns:_col2 (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), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col8 (type: decimal(7,2))
-                                                                  Merge Join Operator [MERGEJOIN_99]
+                                                                  Merge Join Operator [MERGEJOIN_86]
                                                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                   |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                                   |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col7","_col8"]
                                                                   |  Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Map 11 [SIMPLE_EDGE]
-                                                                  |  Reduce Output Operator [RS_23]
+                                                                  |  Reduce Output Operator [RS_19]
                                                                   |     key expressions:_col0 (type: int)
                                                                   |     Map-reduce partition columns:_col0 (type: int)
                                                                   |     sort order:+
@@ -189,26 +189,26 @@ Stage-0
                                                                   |     Select Operator [SEL_8]
                                                                   |        outputColumnNames:["_col0"]
                                                                   |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                                                  |        Filter Operator [FIL_93]
+                                                                  |        Filter Operator [FIL_80]
                                                                   |           predicate:((s_city) IN ('Rosedale', 'Bethlehem') and s_store_sk is not null) (type: boolean)
                                                                   |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                                                   |           TableScan [TS_6]
                                                                   |              alias:store
                                                                   |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Reducer 2 [SIMPLE_EDGE]
-                                                                     Reduce Output Operator [RS_21]
+                                                                     Reduce Output Operator [RS_18]
                                                                         key expressions:_col4 (type: int)
                                                                         Map-reduce partition columns:_col4 (type: int)
                                                                         sort order:+
                                                                         Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                         value expressions:_col1 (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))
-                                                                        Merge Join Operator [MERGEJOIN_98]
+                                                                        Merge Join Operator [MERGEJOIN_85]
                                                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                         |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                         |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                                                         |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                         |<-Map 1 [SIMPLE_EDGE]
-                                                                        |  Reduce Output Operator [RS_16]
+                                                                        |  Reduce Output Operator [RS_15]
                                                                         |     key expressions:_col0 (type: int)
                                                                         |     Map-reduce partition columns:_col0 (type: int)
                                                                         |     sort order:+
@@ -217,14 +217,14 @@ Stage-0
                                                                         |     Select Operator [SEL_2]
                                                                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                                                         |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                        |        Filter Operator [FIL_91]
+                                                                        |        Filter Operator [FIL_78]
                                                                         |           predicate:((((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_hdemo_sk is not null) and ss_addr_sk is not null) and ss_customer_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 10 [SIMPLE_EDGE]
-                                                                           Reduce Output Operator [RS_18]
+                                                                           Reduce Output Operator [RS_16]
                                                                               key expressions:_col0 (type: int)
                                                                               Map-reduce partition columns:_col0 (type: int)
                                                                               sort order:+
@@ -232,7 +232,7 @@ Stage-0
                                                                               Select Operator [SEL_5]
                                                                                  outputColumnNames:["_col0"]
                                                                                  Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                                                 Filter Operator [FIL_92]
+                                                                                 Filter Operator [FIL_79]
                                                                                     predicate:(((d_year) IN (1998, 1999, 2000) and d_dom BETWEEN 1 AND 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_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query7.q.out b/ql/src/test/results/clientpositive/perf/query7.q.out
index 5e1b0ed..a463a8b 100644
--- a/ql/src/test/results/clientpositive/perf/query7.q.out
+++ b/ql/src/test/results/clientpositive/perf/query7.q.out
@@ -17,49 +17,49 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_43]
+         File Output Operator [FS_35]
             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_42]
+            Limit [LIM_34]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_41]
+               Select Operator [SEL_33]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_40]
+                  Reduce Output Operator [RS_32]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: double), _col2 (type: decimal(11,6)), _col3 (type: decimal(11,6)), _col4 (type: decimal(11,6))
-                     Group By Operator [GBY_38]
+                     Group By Operator [GBY_30]
                      |  aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)"]
                      |  keys:KEY._col0 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                      |  Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_37]
+                        Reduce Output Operator [RS_29]
                            key expressions:_col0 (type: string)
                            Map-reduce partition columns:_col0 (type: string)
                            sort order:+
                            Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: struct<count:bigint,sum:double,input:int>), _col2 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col3 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col4 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
-                           Group By Operator [GBY_36]
+                           Group By Operator [GBY_28]
                               aggregations:["avg(_col4)","avg(_col5)","avg(_col7)","avg(_col6)"]
                               keys:_col15 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                               Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_35]
+                              Select Operator [SEL_27]
                                  outputColumnNames:["_col15","_col4","_col5","_col7","_col6"]
                                  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_66]
+                                 Merge Join Operator [MERGEJOIN_58]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col4","_col5","_col6","_col7","_col15"]
                                  |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_33]
+                                 |  Reduce Output Operator [RS_25]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -67,26 +67,26 @@ Stage-0
                                  |     Select Operator [SEL_14]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_62]
+                                 |        Filter Operator [FIL_54]
                                  |           predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_12]
                                  |              alias:promotion
                                  |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_31]
+                                    Reduce Output Operator [RS_24]
                                        key expressions:_col3 (type: int)
                                        Map-reduce partition columns:_col3 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col15 (type: string)
-                                       Merge Join Operator [MERGEJOIN_65]
+                                       Merge Join Operator [MERGEJOIN_57]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col3","_col4","_col5","_col6","_col7","_col15"]
                                        |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_28]
+                                       |  Reduce Output Operator [RS_22]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -95,26 +95,26 @@ Stage-0
                                        |     Select Operator [SEL_11]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_61]
+                                       |        Filter Operator [FIL_53]
                                        |           predicate:i_item_sk is not null (type: boolean)
                                        |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_9]
                                        |              alias:item
                                        |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 3 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_26]
+                                          Reduce Output Operator [RS_21]
                                              key expressions:_col1 (type: int)
                                              Map-reduce partition columns:_col1 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                             Merge Join Operator [MERGEJOIN_64]
+                                             Merge Join Operator [MERGEJOIN_56]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7"]
                                              |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 9 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_23]
+                                             |  Reduce Output Operator [RS_19]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -122,26 +122,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_60]
+                                             |        Filter Operator [FIL_52]
                                              |           predicate:((d_year = 1998) and d_date_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              alias:date_dim
                                              |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_21]
+                                                Reduce Output Operator [RS_18]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                   Merge Join Operator [MERGEJOIN_63]
+                                                   Merge Join Operator [MERGEJOIN_55]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col7"]
                                                    |  Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_16]
+                                                   |  Reduce Output Operator [RS_15]
                                                    |     key expressions:_col2 (type: int)
                                                    |     Map-reduce partition columns:_col2 (type: int)
                                                    |     sort order:+
@@ -150,14 +150,14 @@ Stage-0
                                                    |     Select Operator [SEL_2]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_58]
+                                                   |        Filter Operator [FIL_50]
                                                    |           predicate:(((ss_cdemo_sk is not null and ss_sold_date_sk is not null) and ss_item_sk is not null) and ss_promo_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_18]
+                                                      Reduce Output Operator [RS_16]
                                                          key expressions:_col0 (type: int)
                                                          Map-reduce partition columns:_col0 (type: int)
                                                          sort order:+
@@ -165,7 +165,7 @@ Stage-0
                                                          Select Operator [SEL_5]
                                                             outputColumnNames:["_col0"]
                                                             Statistics:Num rows: 2475 Data size: 896382 Basic stats: COMPLETE Column stats: NONE
-                                                            Filter Operator [FIL_59]
+                                                            Filter Operator [FIL_51]
                                                                predicate:((((cd_gender = 'F') and (cd_marital_status = 'W')) and (cd_education_status = 'Primary')) and cd_demo_sk is not null) (type: boolean)
                                                                Statistics:Num rows: 2475 Data size: 896382 Basic stats: COMPLETE Column stats: NONE
                                                                TableScan [TS_3]


[09/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

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

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query94.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query94.q.out b/ql/src/test/results/clientpositive/perf/query94.q.out
index 46acdb1..0357835 100644
--- a/ql/src/test/results/clientpositive/perf/query94.q.out
+++ b/ql/src/test/results/clientpositive/perf/query94.q.out
@@ -18,146 +18,146 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_59]
+         File Output Operator [FS_49]
             compressed:false
             Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_58]
+            Limit [LIM_48]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: NONE
-               Group By Operator [GBY_56]
+               Group By Operator [GBY_46]
                |  aggregations:["count(DISTINCT KEY._col0:0._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_55]
+                  Reduce Output Operator [RS_45]
                      key expressions:_col0 (type: int)
                      sort order:+
                      Statistics:Num rows: 14641000 Data size: 14858857641 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(17,2)), _col3 (type: decimal(17,2))
-                     Group By Operator [GBY_54]
+                     Group By Operator [GBY_44]
                         aggregations:["count(DISTINCT _col3)","sum(_col4)","sum(_col5)"]
                         keys:_col3 (type: int)
                         outputColumnNames:["_col0","_col1","_col2","_col3"]
                         Statistics:Num rows: 14641000 Data size: 14858857641 Basic stats: COMPLETE Column stats: NONE
-                        Select Operator [SEL_53]
+                        Select Operator [SEL_43]
                            outputColumnNames:["_col3","_col4","_col5"]
                            Statistics:Num rows: 14641000 Data size: 14858857641 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_81]
+                           Filter Operator [FIL_42]
                               predicate:_col12 is null (type: boolean)
                               Statistics:Num rows: 14641000 Data size: 14858857641 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_95]
+                              Merge Join Operator [MERGEJOIN_83]
                               |  condition map:[{"":"Left Outer Join0 to 1"}]
                               |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col3","_col4","_col5","_col12"]
                               |  Statistics:Num rows: 29282000 Data size: 29717715282 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 14 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_50]
+                              |  Reduce Output Operator [RS_40]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: int)
                               |     sort order:+
                               |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                              |     Select Operator [SEL_26]
+                              |     Select Operator [SEL_24]
                               |        outputColumnNames:["_col0"]
                               |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                              |        TableScan [TS_25]
+                              |        TableScan [TS_23]
                               |           alias:wr1
                               |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                               |<-Reducer 5 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_49]
+                                 Reduce Output Operator [RS_39]
                                     key expressions:_col3 (type: int)
                                     Map-reduce partition columns:_col3 (type: int)
                                     sort order:+
                                     Statistics:Num rows: 26620000 Data size: 27016104217 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                    Merge Join Operator [MERGEJOIN_94]
+                                    Merge Join Operator [MERGEJOIN_82]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 26620000 Data size: 27016104217 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 13 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_47]
+                                    |  Reduce Output Operator [RS_37]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
                                     |     Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |     Select Operator [SEL_24]
+                                    |     Select Operator [SEL_22]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_88]
+                                    |        Filter Operator [FIL_76]
                                     |           predicate:(d_date BETWEEN '1999-05-01' AND '1999-07-01' and d_date_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |           TableScan [TS_22]
+                                    |           TableScan [TS_20]
                                     |              alias:d
                                     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_45]
+                                       Reduce Output Operator [RS_36]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 24200000 Data size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                          Merge Join Operator [MERGEJOIN_93]
+                                          Merge Join Operator [MERGEJOIN_81]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col0","_col3","_col4","_col5"]
                                           |  Statistics:Num rows: 24200000 Data size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 12 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_42]
+                                          |  Reduce Output Operator [RS_34]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
                                           |     Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |     Select Operator [SEL_21]
+                                          |     Select Operator [SEL_19]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_87]
+                                          |        Filter Operator [FIL_75]
                                           |           predicate:((web_company_name = 'pri') and web_site_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                                          |           TableScan [TS_19]
+                                          |           TableScan [TS_17]
                                           |              alias:s
                                           |              Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 3 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_40]
+                                             Reduce Output Operator [RS_33]
                                                 key expressions:_col2 (type: int)
                                                 Map-reduce partition columns:_col2 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                                Merge Join Operator [MERGEJOIN_92]
+                                                Merge Join Operator [MERGEJOIN_80]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5"]
                                                 |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 11 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_37]
+                                                |  Reduce Output Operator [RS_31]
                                                 |     key expressions:_col0 (type: int)
                                                 |     Map-reduce partition columns:_col0 (type: int)
                                                 |     sort order:+
                                                 |     Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |     Select Operator [SEL_18]
+                                                |     Select Operator [SEL_16]
                                                 |        outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_86]
+                                                |        Filter Operator [FIL_74]
                                                 |           predicate:((ca_state = 'TX') and ca_address_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                |           TableScan [TS_16]
+                                                |           TableScan [TS_14]
                                                 |              alias:ca
                                                 |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_35]
+                                                   Reduce Output Operator [RS_30]
                                                       key expressions:_col1 (type: int)
                                                       Map-reduce partition columns:_col1 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                                      Merge Join Operator [MERGEJOIN_91]
+                                                      Merge Join Operator [MERGEJOIN_79]
                                                       |  condition map:[{"":"Left Semi Join 0 to 1"}]
                                                       |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                       |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_30]
+                                                      |  Reduce Output Operator [RS_27]
                                                       |     key expressions:_col3 (type: int)
                                                       |     Map-reduce partition columns:_col3 (type: int)
                                                       |     sort order:+
@@ -166,35 +166,35 @@ Stage-0
                                                       |     Select Operator [SEL_2]
                                                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_82]
+                                                      |        Filter Operator [FIL_71]
                                                       |           predicate:(((ws_ship_addr_sk is not null and ws_web_site_sk is not null) and ws_ship_date_sk is not null) and ws_order_number is not null) (type: boolean)
                                                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan [TS_0]
                                                       |              alias:ws1
                                                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Reducer 9 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_32]
+                                                         Reduce Output Operator [RS_28]
                                                             key expressions:_col0 (type: int)
                                                             Map-reduce partition columns:_col0 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            Group By Operator [GBY_28]
+                                                            Group By Operator [GBY_26]
                                                                keys:_col0 (type: int)
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               Select Operator [SEL_15]
+                                                               Select Operator [SEL_13]
                                                                   outputColumnNames:["_col0"]
                                                                   Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                  Filter Operator [FIL_83]
+                                                                  Filter Operator [FIL_12]
                                                                      predicate:(_col0 <> _col2) (type: boolean)
                                                                      Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     Merge Join Operator [MERGEJOIN_90]
+                                                                     Merge Join Operator [MERGEJOIN_78]
                                                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                      |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                                                      |  outputColumnNames:["_col0","_col1","_col2"]
                                                                      |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |<-Map 10 [SIMPLE_EDGE]
-                                                                     |  Reduce Output Operator [RS_12]
+                                                                     |  Reduce Output Operator [RS_10]
                                                                      |     key expressions:_col1 (type: int)
                                                                      |     Map-reduce partition columns:_col1 (type: int)
                                                                      |     sort order:+
@@ -203,14 +203,14 @@ Stage-0
                                                                      |     Select Operator [SEL_8]
                                                                      |        outputColumnNames:["_col0","_col1"]
                                                                      |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     |        Filter Operator [FIL_85]
+                                                                     |        Filter Operator [FIL_73]
                                                                      |           predicate:ws_order_number is not null (type: boolean)
                                                                      |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |           TableScan [TS_6]
                                                                      |              alias:ws1
                                                                      |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |<-Map 8 [SIMPLE_EDGE]
-                                                                        Reduce Output Operator [RS_10]
+                                                                        Reduce Output Operator [RS_9]
                                                                            key expressions:_col1 (type: int)
                                                                            Map-reduce partition columns:_col1 (type: int)
                                                                            sort order:+
@@ -219,7 +219,7 @@ Stage-0
                                                                            Select Operator [SEL_5]
                                                                               outputColumnNames:["_col0","_col1"]
                                                                               Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                              Filter Operator [FIL_84]
+                                                                              Filter Operator [FIL_72]
                                                                                  predicate:ws_order_number is not null (type: boolean)
                                                                                  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                  TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query95.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query95.q.out b/ql/src/test/results/clientpositive/perf/query95.q.out
index 03b0c5c..a7c6a98 100644
--- a/ql/src/test/results/clientpositive/perf/query95.q.out
+++ b/ql/src/test/results/clientpositive/perf/query95.q.out
@@ -19,113 +19,113 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 6
-         File Output Operator [FS_78]
+         File Output Operator [FS_63]
             compressed:false
             Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [GBY_76]
+            Group By Operator [GBY_61]
             |  aggregations:["count(DISTINCT KEY._col0:0._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             |  outputColumnNames:["_col0","_col1","_col2"]
             |  Statistics:Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 5 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_75]
+               Reduce Output Operator [RS_60]
                   key expressions:_col0 (type: int)
                   sort order:+
                   Statistics:Num rows: 26620000 Data size: 27016104217 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col2 (type: decimal(17,2)), _col3 (type: decimal(17,2))
-                  Group By Operator [GBY_74]
+                  Group By Operator [GBY_59]
                      aggregations:["count(DISTINCT _col3)","sum(_col4)","sum(_col5)"]
                      keys:_col3 (type: int)
                      outputColumnNames:["_col0","_col1","_col2","_col3"]
                      Statistics:Num rows: 26620000 Data size: 27016104217 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_139]
+                     Merge Join Operator [MERGEJOIN_122]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  outputColumnNames:["_col3","_col4","_col5"]
                      |  Statistics:Num rows: 26620000 Data size: 27016104217 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 17 [SIMPLE_EDGE]
-                     |  Reduce Output Operator [RS_71]
+                     |  Reduce Output Operator [RS_56]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |     Select Operator [SEL_46]
+                     |     Select Operator [SEL_40]
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |        Filter Operator [FIL_132]
+                     |        Filter Operator [FIL_115]
                      |           predicate:(d_date BETWEEN '2002-05-01' AND '2002-06-30' and d_date_sk is not null) (type: boolean)
                      |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                     |           TableScan [TS_44]
+                     |           TableScan [TS_38]
                      |              alias:d
                      |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_69]
+                        Reduce Output Operator [RS_55]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 24200000 Data size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                           Merge Join Operator [MERGEJOIN_138]
+                           Merge Join Operator [MERGEJOIN_121]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                            |  outputColumnNames:["_col0","_col3","_col4","_col5"]
                            |  Statistics:Num rows: 24200000 Data size: 24560094211 Basic stats: COMPLETE Column stats: NONE
                            |<-Map 16 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_66]
+                           |  Reduce Output Operator [RS_53]
                            |     key expressions:_col0 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int)
                            |     sort order:+
                            |     Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_43]
+                           |     Select Operator [SEL_37]
                            |        outputColumnNames:["_col0"]
                            |        Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                           |        Filter Operator [FIL_131]
+                           |        Filter Operator [FIL_114]
                            |           predicate:((web_company_name = 'pri') and web_site_sk is not null) (type: boolean)
                            |           Statistics:Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE
-                           |           TableScan [TS_41]
+                           |           TableScan [TS_35]
                            |              alias:s
                            |              Statistics:Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 3 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_64]
+                              Reduce Output Operator [RS_52]
                                  key expressions:_col2 (type: int)
                                  Map-reduce partition columns:_col2 (type: int)
                                  sort order:+
                                  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                 Merge Join Operator [MERGEJOIN_137]
+                                 Merge Join Operator [MERGEJOIN_120]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5"]
                                  |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 15 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_61]
+                                 |  Reduce Output Operator [RS_50]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |     Select Operator [SEL_40]
+                                 |     Select Operator [SEL_34]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_130]
+                                 |        Filter Operator [FIL_113]
                                  |           predicate:((ca_state = 'GA') and ca_address_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_38]
+                                 |           TableScan [TS_32]
                                  |              alias:ca
                                  |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_59]
+                                    Reduce Output Operator [RS_49]
                                        key expressions:_col1 (type: int)
                                        Map-reduce partition columns:_col1 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_136]
+                                       Merge Join Operator [MERGEJOIN_119]
                                        |  condition map:[{"":"Left Semi Join 0 to 1"},{"":"Left Semi Join 0 to 2"}]
                                        |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                        |  Statistics:Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_52]
+                                       |  Reduce Output Operator [RS_45]
                                        |     key expressions:_col3 (type: int)
                                        |     Map-reduce partition columns:_col3 (type: int)
                                        |     sort order:+
@@ -134,114 +134,114 @@ Stage-0
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                        |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        Filter Operator [FIL_122]
+                                       |        Filter Operator [FIL_107]
                                        |           predicate:(((ws_ship_addr_sk is not null and ws_web_site_sk is not null) and ws_ship_date_sk is not null) and ws_order_number is not null) (type: boolean)
                                        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:ws1
                                        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |<-Reducer 11 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_56]
+                                       |  Reduce Output Operator [RS_47]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |     Group By Operator [GBY_50]
+                                       |     Group By Operator [GBY_44]
                                        |        keys:_col0 (type: int)
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        Merge Join Operator [MERGEJOIN_135]
+                                       |        Merge Join Operator [MERGEJOIN_118]
                                        |        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |        |  outputColumnNames:["_col0"]
                                        |        |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Map 10 [SIMPLE_EDGE]
-                                       |        |  Reduce Output Operator [RS_33]
+                                       |        |  Reduce Output Operator [RS_28]
                                        |        |     key expressions:_col0 (type: int)
                                        |        |     Map-reduce partition columns:_col0 (type: int)
                                        |        |     sort order:+
                                        |        |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |     Select Operator [SEL_18]
+                                       |        |     Select Operator [SEL_16]
                                        |        |        outputColumnNames:["_col0"]
                                        |        |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |        Filter Operator [FIL_126]
+                                       |        |        Filter Operator [FIL_110]
                                        |        |           predicate:wr_order_number is not null (type: boolean)
                                        |        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |           TableScan [TS_16]
+                                       |        |           TableScan [TS_14]
                                        |        |              alias:wr
                                        |        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Reducer 13 [SIMPLE_EDGE]
-                                       |           Reduce Output Operator [RS_35]
+                                       |           Reduce Output Operator [RS_29]
                                        |              key expressions:_col0 (type: int)
                                        |              Map-reduce partition columns:_col0 (type: int)
                                        |              sort order:+
                                        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |              Select Operator [SEL_31]
+                                       |              Select Operator [SEL_27]
                                        |                 outputColumnNames:["_col0"]
                                        |                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                 Filter Operator [FIL_127]
+                                       |                 Filter Operator [FIL_26]
                                        |                    predicate:(_col0 <> _col2) (type: boolean)
                                        |                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    Merge Join Operator [MERGEJOIN_134]
+                                       |                    Merge Join Operator [MERGEJOIN_117]
                                        |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |                    |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                        |                    |  outputColumnNames:["_col0","_col1","_col2"]
                                        |                    |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |<-Map 12 [SIMPLE_EDGE]
-                                       |                    |  Reduce Output Operator [RS_26]
+                                       |                    |  Reduce Output Operator [RS_23]
                                        |                    |     key expressions:_col1 (type: int)
                                        |                    |     Map-reduce partition columns:_col1 (type: int)
                                        |                    |     sort order:+
                                        |                    |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |     value expressions:_col0 (type: int)
-                                       |                    |     Select Operator [SEL_21]
+                                       |                    |     Select Operator [SEL_19]
                                        |                    |        outputColumnNames:["_col0","_col1"]
                                        |                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    |        Filter Operator [FIL_128]
+                                       |                    |        Filter Operator [FIL_111]
                                        |                    |           predicate:ws_order_number is not null (type: boolean)
                                        |                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                    |           TableScan [TS_19]
+                                       |                    |           TableScan [TS_17]
                                        |                    |              alias:ws1
                                        |                    |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                    |<-Map 14 [SIMPLE_EDGE]
-                                       |                       Reduce Output Operator [RS_28]
+                                       |                       Reduce Output Operator [RS_24]
                                        |                          key expressions:_col1 (type: int)
                                        |                          Map-reduce partition columns:_col1 (type: int)
                                        |                          sort order:+
                                        |                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                          value expressions:_col0 (type: int)
-                                       |                          Select Operator [SEL_24]
+                                       |                          Select Operator [SEL_22]
                                        |                             outputColumnNames:["_col0","_col1"]
                                        |                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                             Filter Operator [FIL_129]
+                                       |                             Filter Operator [FIL_112]
                                        |                                predicate:ws_order_number is not null (type: boolean)
                                        |                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                                TableScan [TS_22]
+                                       |                                TableScan [TS_20]
                                        |                                   alias:ws1
                                        |                                   Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |<-Reducer 8 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_54]
+                                          Reduce Output Operator [RS_46]
                                              key expressions:_col0 (type: int)
                                              Map-reduce partition columns:_col0 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                             Group By Operator [GBY_48]
+                                             Group By Operator [GBY_42]
                                                 keys:_col0 (type: int)
                                                 outputColumnNames:["_col0"]
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Select Operator [SEL_15]
+                                                Select Operator [SEL_13]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   Filter Operator [FIL_123]
+                                                   Filter Operator [FIL_12]
                                                       predicate:(_col0 <> _col2) (type: boolean)
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_133]
+                                                      Merge Join Operator [MERGEJOIN_116]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col1 (type: int)","1":"_col1 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col1","_col2"]
                                                       |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 7 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_10]
+                                                      |  Reduce Output Operator [RS_9]
                                                       |     key expressions:_col1 (type: int)
                                                       |     Map-reduce partition columns:_col1 (type: int)
                                                       |     sort order:+
@@ -250,14 +250,14 @@ Stage-0
                                                       |     Select Operator [SEL_5]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_124]
+                                                      |        Filter Operator [FIL_108]
                                                       |           predicate:ws_order_number is not null (type: boolean)
                                                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |           TableScan [TS_3]
                                                       |              alias:ws1
                                                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                       |<-Map 9 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_12]
+                                                         Reduce Output Operator [RS_10]
                                                             key expressions:_col1 (type: int)
                                                             Map-reduce partition columns:_col1 (type: int)
                                                             sort order:+
@@ -266,7 +266,7 @@ Stage-0
                                                             Select Operator [SEL_8]
                                                                outputColumnNames:["_col0","_col1"]
                                                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               Filter Operator [FIL_125]
+                                                               Filter Operator [FIL_109]
                                                                   predicate:ws_order_number is not null (type: boolean)
                                                                   Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   TableScan [TS_6]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query96.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query96.q.out b/ql/src/test/results/clientpositive/perf/query96.q.out
index 6290ff0..bba8965 100644
--- a/ql/src/test/results/clientpositive/perf/query96.q.out
+++ b/ql/src/test/results/clientpositive/perf/query96.q.out
@@ -16,40 +16,40 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_35]
+         File Output Operator [FS_29]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_34]
+            Limit [LIM_28]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_33]
+               Select Operator [SEL_27]
                |  outputColumnNames:["_col0"]
                |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_32]
+                  Reduce Output Operator [RS_26]
                      key expressions:_col0 (type: bigint)
                      sort order:+
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_30]
+                     Group By Operator [GBY_24]
                      |  aggregations:["count(VALUE._col0)"]
                      |  outputColumnNames:["_col0"]
                      |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 4 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_29]
+                        Reduce Output Operator [RS_23]
                            sort order:
                            Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col0 (type: bigint)
-                           Group By Operator [GBY_28]
+                           Group By Operator [GBY_22]
                               aggregations:["count()"]
                               outputColumnNames:["_col0"]
                               Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_51]
+                              Merge Join Operator [MERGEJOIN_45]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                               |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 9 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_25]
+                              |  Reduce Output Operator [RS_19]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: int)
                               |     sort order:+
@@ -57,25 +57,25 @@ Stage-0
                               |     Select Operator [SEL_11]
                               |        outputColumnNames:["_col0"]
                               |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                              |        Filter Operator [FIL_48]
+                              |        Filter Operator [FIL_42]
                               |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
                               |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                               |           TableScan [TS_9]
                               |              alias:store
                               |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 3 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_23]
+                                 Reduce Output Operator [RS_18]
                                     key expressions:_col2 (type: int)
                                     Map-reduce partition columns:_col2 (type: int)
                                     sort order:+
                                     Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_50]
+                                    Merge Join Operator [MERGEJOIN_44]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col2"]
                                     |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 8 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_20]
+                                    |  Reduce Output Operator [RS_16]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -83,26 +83,26 @@ Stage-0
                                     |     Select Operator [SEL_8]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_47]
+                                    |        Filter Operator [FIL_41]
                                     |           predicate:(((t_minute >= 30) and (t_hour = 8)) and t_time_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_6]
                                     |              alias:time_dim
                                     |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 2 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_18]
+                                       Reduce Output Operator [RS_15]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col2 (type: int)
-                                          Merge Join Operator [MERGEJOIN_49]
+                                          Merge Join Operator [MERGEJOIN_43]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col0","_col2"]
                                           |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 1 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_13]
+                                          |  Reduce Output Operator [RS_12]
                                           |     key expressions:_col1 (type: int)
                                           |     Map-reduce partition columns:_col1 (type: int)
                                           |     sort order:+
@@ -111,14 +111,14 @@ Stage-0
                                           |     Select Operator [SEL_2]
                                           |        outputColumnNames:["_col0","_col1","_col2"]
                                           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                          |        Filter Operator [FIL_45]
+                                          |        Filter Operator [FIL_39]
                                           |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                           |           TableScan [TS_0]
                                           |              alias:store_sales
                                           |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                           |<-Map 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_15]
+                                             Reduce Output Operator [RS_13]
                                                 key expressions:_col0 (type: int)
                                                 Map-reduce partition columns:_col0 (type: int)
                                                 sort order:+
@@ -126,7 +126,7 @@ Stage-0
                                                 Select Operator [SEL_5]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_46]
+                                                   Filter Operator [FIL_40]
                                                       predicate:((hd_dep_count = 5) and hd_demo_sk is not null) (type: boolean)
                                                       Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
                                                       TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query97.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query97.q.out b/ql/src/test/results/clientpositive/perf/query97.q.out
index 3e5d3bb..c4c384d 100644
--- a/ql/src/test/results/clientpositive/perf/query97.q.out
+++ b/ql/src/test/results/clientpositive/perf/query97.q.out
@@ -17,64 +17,64 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_42]
+         File Output Operator [FS_38]
             compressed:false
             Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_41]
+            Limit [LIM_37]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-               Group By Operator [GBY_39]
+               Group By Operator [GBY_35]
                |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                |  outputColumnNames:["_col0","_col1","_col2"]
                |  Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_38]
+                  Reduce Output Operator [RS_34]
                      sort order:
                      Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint)
-                     Group By Operator [GBY_37]
+                     Group By Operator [GBY_33]
                         aggregations:["sum(_col0)","sum(_col1)","sum(_col2)"]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                        Select Operator [SEL_35]
+                        Select Operator [SEL_31]
                            outputColumnNames:["_col0","_col1","_col2"]
                            Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_53]
+                           Merge Join Operator [MERGEJOIN_49]
                            |  condition map:[{"":"Outer Join 0 to 1"}]
                            |  keys:{"0":"_col0 (type: int), _col1 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                            |  outputColumnNames:["_col0","_col2"]
                            |  Statistics:Num rows: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 3 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_32]
+                           |  Reduce Output Operator [RS_28]
                            |     key expressions:_col0 (type: int), _col1 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                            |     sort order:++
                            |     Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_15]
+                           |     Select Operator [SEL_13]
                            |        outputColumnNames:["_col0","_col1"]
                            |        Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                           |        Group By Operator [GBY_14]
+                           |        Group By Operator [GBY_12]
                            |        |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                            |        |  outputColumnNames:["_col0","_col1"]
                            |        |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 2 [SIMPLE_EDGE]
-                           |           Reduce Output Operator [RS_13]
+                           |           Reduce Output Operator [RS_11]
                            |              key expressions:_col0 (type: int), _col1 (type: int)
                            |              Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                            |              sort order:++
                            |              Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |              Group By Operator [GBY_12]
+                           |              Group By Operator [GBY_10]
                            |                 keys:_col1 (type: int), _col2 (type: int)
                            |                 outputColumnNames:["_col0","_col1"]
                            |                 Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_51]
+                           |                 Merge Join Operator [MERGEJOIN_47]
                            |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                 |  outputColumnNames:["_col1","_col2"]
                            |                 |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Map 1 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_7]
+                           |                 |  Reduce Output Operator [RS_6]
                            |                 |     key expressions:_col0 (type: int)
                            |                 |     Map-reduce partition columns:_col0 (type: int)
                            |                 |     sort order:+
@@ -83,14 +83,14 @@ Stage-0
                            |                 |     Select Operator [SEL_2]
                            |                 |        outputColumnNames:["_col0","_col1","_col2"]
                            |                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                 |        Filter Operator [FIL_47]
+                           |                 |        Filter Operator [FIL_43]
                            |                 |           predicate:ss_sold_date_sk is not null (type: boolean)
                            |                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |           TableScan [TS_0]
                            |                 |              alias:store_sales
                            |                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |<-Map 6 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_9]
+                           |                    Reduce Output Operator [RS_7]
                            |                       key expressions:_col0 (type: int)
                            |                       Map-reduce partition columns:_col0 (type: int)
                            |                       sort order:+
@@ -98,66 +98,66 @@ Stage-0
                            |                       Select Operator [SEL_5]
                            |                          outputColumnNames:["_col0"]
                            |                          Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                          Filter Operator [FIL_48]
+                           |                          Filter Operator [FIL_44]
                            |                             predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                            |                             Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                             TableScan [TS_3]
                            |                                alias:date_dim
                            |                                Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 9 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_33]
+                              Reduce Output Operator [RS_29]
                                  key expressions:_col0 (type: int), _col1 (type: int)
                                  Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                  sort order:++
                                  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_30]
+                                 Group By Operator [GBY_26]
                                  |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                                  |  outputColumnNames:["_col0","_col1"]
                                  |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 8 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_29]
+                                    Reduce Output Operator [RS_25]
                                        key expressions:_col0 (type: int), _col1 (type: int)
                                        Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                        sort order:++
                                        Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                       Group By Operator [GBY_28]
+                                       Group By Operator [GBY_24]
                                           keys:_col1 (type: int), _col2 (type: int)
                                           outputColumnNames:["_col0","_col1"]
                                           Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                          Merge Join Operator [MERGEJOIN_52]
+                                          Merge Join Operator [MERGEJOIN_48]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col1","_col2"]
                                           |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 10 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_25]
+                                          |  Reduce Output Operator [RS_21]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
                                           |     Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |     Select Operator [SEL_21]
+                                          |     Select Operator [SEL_19]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_50]
+                                          |        Filter Operator [FIL_46]
                                           |           predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |           TableScan [TS_19]
+                                          |           TableScan [TS_17]
                                           |              alias:date_dim
                                           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_23]
+                                             Reduce Output Operator [RS_20]
                                                 key expressions:_col0 (type: int)
                                                 Map-reduce partition columns:_col0 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 value expressions:_col1 (type: int), _col2 (type: int)
-                                                Select Operator [SEL_18]
+                                                Select Operator [SEL_16]
                                                    outputColumnNames:["_col0","_col1","_col2"]
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   Filter Operator [FIL_49]
+                                                   Filter Operator [FIL_45]
                                                       predicate:cs_sold_date_sk is not null (type: boolean)
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      TableScan [TS_16]
+                                                      TableScan [TS_14]
                                                          alias:catalog_sales
                                                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 


[20/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query64.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query64.q.out b/ql/src/test/results/clientpositive/perf/query64.q.out
index 9735b45..a630000 100644
--- a/ql/src/test/results/clientpositive/perf/query64.q.out
+++ b/ql/src/test/results/clientpositive/perf/query64.q.out
@@ -51,294 +51,294 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 20
-         File Output Operator [FS_325]
+         File Output Operator [FS_253]
             compressed:false
             Statistics:Num rows: 122532649 Data size: 105380558466 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"}
-            Select Operator [SEL_324]
+            Select Operator [SEL_252]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"]
             |  Statistics:Num rows: 122532649 Data size: 105380558466 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 19 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_323]
+               Reduce Output Operator [RS_251]
                   key expressions:_col0 (type: string), _col1 (type: string), _col20 (type: bigint)
                   sort order:+++
                   Statistics:Num rows: 122532649 Data size: 105380558466 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: int), _col12 (type: bigint), _col13 (type: decimal(17,2)), _col14 (type: decimal(17,2)), _col15 (type: decimal(17,2)), _col16 (type: decimal(17,2)), _col17 (type: decimal(17,2)), _col18 (type: decimal(17,2)), _col19 (type: int)
-                  Select Operator [SEL_322]
+                  Select Operator [SEL_250]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"]
                      Statistics:Num rows: 122532649 Data size: 105380558466 Basic stats: COMPLETE Column stats: NONE
-                     Filter Operator [FIL_714]
+                     Filter Operator [FIL_249]
                         predicate:(_col34 <= _col15) (type: boolean)
                         Statistics:Num rows: 122532649 Data size: 105380558466 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_791]
+                        Merge Join Operator [MERGEJOIN_714]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{"0":"_col1 (type: int), _col2 (type: string), _col3 (type: string)","1":"_col1 (type: int), _col2 (type: string), _col3 (type: string)"}
                         |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col31","_col34","_col35","_col36","_col37"]
                         |  Statistics:Num rows: 367597947 Data size: 316141675400 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 18 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_317]
+                        |  Reduce Output Operator [RS_246]
                         |     key expressions:_col1 (type: int), _col2 (type: string), _col3 (type: string)
                         |     Map-reduce partition columns:_col1 (type: int), _col2 (type: string), _col3 (type: string)
                         |     sort order:+++
                         |     Statistics:Num rows: 334179945 Data size: 287401516862 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col0 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: string), _col12 (type: int), _col15 (type: bigint), _col16 (type: decimal(17,2)), _col17 (type: decimal(17,2)), _col18 (type: decimal(17,2))
-                        |     Select Operator [SEL_157]
+                        |     Select Operator [SEL_122]
                         |        outputColumnNames:["_col0","_col1","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                         |        Statistics:Num rows: 334179945 Data size: 287401516862 Basic stats: COMPLETE Column stats: NONE
-                        |        Group By Operator [GBY_156]
+                        |        Group By Operator [GBY_121]
                         |        |  aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"]
                         |        |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: string), KEY._col4 (type: string), KEY._col5 (type: string), KEY._col6 (type: string), KEY._col7 (type: string), KEY._col8 (type: string), KEY._col9 (type: string), KEY._col10 (type: string), KEY._col11 (type: string), KEY._col12 (type: string), KEY._col13 (type: int), KEY._col14 (type: string)
                         |        |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"]
                         |        |  Statistics:Num rows: 334179945 Data size: 287401516862 Basic stats: COMPLETE Column stats: NONE
                         |        |<-Reducer 17 [SIMPLE_EDGE]
-                        |           Reduce Output Operator [RS_155]
+                        |           Reduce Output Operator [RS_120]
                         |              key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: int), _col14 (type: string)
                         |              Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: int), _col14 (type: string)
                         |              sort order:+++++++++++++++
                         |              Statistics:Num rows: 668359891 Data size: 574803034585 Basic stats: COMPLETE Column stats: NONE
                         |              value expressions:_col15 (type: bigint), _col16 (type: decimal(17,2)), _col17 (type: decimal(17,2)), _col18 (type: decimal(17,2))
-                        |              Group By Operator [GBY_154]
+                        |              Group By Operator [GBY_119]
                         |                 aggregations:["count()","sum(_col9)","sum(_col10)","sum(_col11)"]
                         |                 keys:_col21 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col39 (type: string), _col40 (type: string), _col41 (type: string), _col42 (type: string), _col44 (type: string), _col45 (type: string), _col46 (type: string), _col47 (type: string), _col50 (type: int), _col53 (type: string)
                         |                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"]
                         |                 Statistics:Num rows: 668359891 Data size: 574803034585 Basic stats: COMPLETE Column stats: NONE
-                        |                 Select Operator [SEL_153]
+                        |                 Select Operator [SEL_118]
                         |                    outputColumnNames:["_col21","_col23","_col25","_col27","_col28","_col39","_col40","_col41","_col42","_col44","_col45","_col46","_col47","_col50","_col53","_col9","_col10","_col11"]
                         |                    Statistics:Num rows: 668359891 Data size: 574803034585 Basic stats: COMPLETE Column stats: NONE
-                        |                    Merge Join Operator [MERGEJOIN_773]
+                        |                    Merge Join Operator [MERGEJOIN_696]
                         |                    |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                         |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                         |                    |  outputColumnNames:["_col9","_col10","_col11","_col23","_col25","_col27","_col28","_col39","_col40","_col41","_col42","_col44","_col45","_col46","_col47","_col50","_col53"]
                         |                    |  Statistics:Num rows: 668359891 Data size: 574803034585 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Map 36 [SIMPLE_EDGE]
-                        |                    |  Reduce Output Operator [RS_149]
+                        |                    |  Reduce Output Operator [RS_115]
                         |                    |     key expressions:_col0 (type: int)
                         |                    |     Map-reduce partition columns:_col0 (type: int)
                         |                    |     sort order:+
                         |                    |     Statistics:Num rows: 57750 Data size: 82945057 Basic stats: COMPLETE Column stats: NONE
                         |                    |     value expressions:_col3 (type: string)
-                        |                    |     Select Operator [SEL_92]
+                        |                    |     Select Operator [SEL_76]
                         |                    |        outputColumnNames:["_col0","_col3"]
                         |                    |        Statistics:Num rows: 57750 Data size: 82945057 Basic stats: COMPLETE Column stats: NONE
-                        |                    |        Filter Operator [FIL_732]
+                        |                    |        Filter Operator [FIL_658]
                         |                    |           predicate:((((i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate') and i_current_price BETWEEN 35 AND 45) and i_current_price BETWEEN 36 AND 50) and i_item_sk is not null) (type: boolean)
                         |                    |           Statistics:Num rows: 57750 Data size: 82945057 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           TableScan [TS_90]
+                        |                    |           TableScan [TS_74]
                         |                    |              alias:item
                         |                    |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Reducer 16 [SIMPLE_EDGE]
-                        |                    |  Reduce Output Operator [RS_147]
+                        |                    |  Reduce Output Operator [RS_114]
                         |                    |     key expressions:_col1 (type: int)
                         |                    |     Map-reduce partition columns:_col1 (type: int)
                         |                    |     sort order:+
                         |                    |     Statistics:Num rows: 303799944 Data size: 261274100967 Basic stats: COMPLETE Column stats: NONE
                         |                    |     value expressions:_col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col39 (type: string), _col40 (type: string), _col41 (type: string), _col42 (type: string), _col44 (type: string), _col45 (type: string), _col46 (type: string), _col47 (type: string)
-                        |                    |     Merge Join Operator [MERGEJOIN_771]
+                        |                    |     Merge Join Operator [MERGEJOIN_694]
                         |                    |     |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |     |  keys:{"0":"_col37 (type: int)","1":"_col0 (type: int)"}
                         |                    |     |  outputColumnNames:["_col1","_col9","_col10","_col11","_col23","_col25","_col27","_col28","_col39","_col40","_col41","_col42","_col44","_col45","_col46","_col47"]
                         |                    |     |  Statistics:Num rows: 303799944 Data size: 261274100967 Basic stats: COMPLETE Column stats: NONE
                         |                    |     |<-Map 35 [SIMPLE_EDGE]
-                        |                    |     |  Reduce Output Operator [RS_144]
+                        |                    |     |  Reduce Output Operator [RS_112]
                         |                    |     |     key expressions:_col0 (type: int)
                         |                    |     |     Map-reduce partition columns:_col0 (type: int)
                         |                    |     |     sort order:+
                         |                    |     |     Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |     |     Select Operator [SEL_89]
+                        |                    |     |     Select Operator [SEL_73]
                         |                    |     |        outputColumnNames:["_col0"]
                         |                    |     |        Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |     |        Filter Operator [FIL_731]
+                        |                    |     |        Filter Operator [FIL_657]
                         |                    |     |           predicate:ib_income_band_sk is not null (type: boolean)
                         |                    |     |           Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |     |           TableScan [TS_87]
+                        |                    |     |           TableScan [TS_71]
                         |                    |     |              alias:ib1
                         |                    |     |              Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
                         |                    |     |<-Reducer 15 [SIMPLE_EDGE]
-                        |                    |        Reduce Output Operator [RS_142]
+                        |                    |        Reduce Output Operator [RS_111]
                         |                    |           key expressions:_col37 (type: int)
                         |                    |           Map-reduce partition columns:_col37 (type: int)
                         |                    |           sort order:+
                         |                    |           Statistics:Num rows: 276181762 Data size: 237521904822 Basic stats: COMPLETE Column stats: NONE
                         |                    |           value expressions:_col1 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col39 (type: string), _col40 (type: string), _col41 (type: string), _col42 (type: string), _col44 (type: string), _col45 (type: string), _col46 (type: string), _col47 (type: string)
-                        |                    |           Merge Join Operator [MERGEJOIN_770]
+                        |                    |           Merge Join Operator [MERGEJOIN_693]
                         |                    |           |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |           |  keys:{"0":"_col35 (type: int)","1":"_col0 (type: int)"}
                         |                    |           |  outputColumnNames:["_col1","_col9","_col10","_col11","_col23","_col25","_col27","_col28","_col37","_col39","_col40","_col41","_col42","_col44","_col45","_col46","_col47"]
                         |                    |           |  Statistics:Num rows: 276181762 Data size: 237521904822 Basic stats: COMPLETE Column stats: NONE
                         |                    |           |<-Map 34 [SIMPLE_EDGE]
-                        |                    |           |  Reduce Output Operator [RS_139]
+                        |                    |           |  Reduce Output Operator [RS_109]
                         |                    |           |     key expressions:_col0 (type: int)
                         |                    |           |     Map-reduce partition columns:_col0 (type: int)
                         |                    |           |     sort order:+
                         |                    |           |     Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           |     Select Operator [SEL_86]
+                        |                    |           |     Select Operator [SEL_70]
                         |                    |           |        outputColumnNames:["_col0"]
                         |                    |           |        Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           |        Filter Operator [FIL_730]
+                        |                    |           |        Filter Operator [FIL_656]
                         |                    |           |           predicate:ib_income_band_sk is not null (type: boolean)
                         |                    |           |           Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           |           TableScan [TS_84]
+                        |                    |           |           TableScan [TS_68]
                         |                    |           |              alias:ib1
                         |                    |           |              Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
                         |                    |           |<-Reducer 14 [SIMPLE_EDGE]
-                        |                    |              Reduce Output Operator [RS_137]
+                        |                    |              Reduce Output Operator [RS_108]
                         |                    |                 key expressions:_col35 (type: int)
                         |                    |                 Map-reduce partition columns:_col35 (type: int)
                         |                    |                 sort order:+
                         |                    |                 Statistics:Num rows: 251074324 Data size: 215928999704 Basic stats: COMPLETE Column stats: NONE
                         |                    |                 value expressions:_col1 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col37 (type: int), _col39 (type: string), _col40 (type: string), _col41 (type: string), _col42 (type: string), _col44 (type: string), _col45 (type: string), _col46 (type: string), _col47 (type: string)
-                        |                    |                 Merge Join Operator [MERGEJOIN_769]
+                        |                    |                 Merge Join Operator [MERGEJOIN_692]
                         |                    |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                 |  keys:{"0":"_col17 (type: int)","1":"_col0 (type: int)"}
                         |                    |                 |  outputColumnNames:["_col1","_col9","_col10","_col11","_col23","_col25","_col27","_col28","_col35","_col37","_col39","_col40","_col41","_col42","_col44","_col45","_col46","_col47"]
                         |                    |                 |  Statistics:Num rows: 251074324 Data size: 215928999704 Basic stats: COMPLETE Column stats: NONE
                         |                    |                 |<-Map 33 [SIMPLE_EDGE]
-                        |                    |                 |  Reduce Output Operator [RS_134]
+                        |                    |                 |  Reduce Output Operator [RS_106]
                         |                    |                 |     key expressions:_col0 (type: int)
                         |                    |                 |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                 |     sort order:+
                         |                    |                 |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |                 |     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
-                        |                    |                 |     Select Operator [SEL_83]
+                        |                    |                 |     Select Operator [SEL_67]
                         |                    |                 |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                         |                    |                 |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                 |        Filter Operator [FIL_729]
+                        |                    |                 |        Filter Operator [FIL_655]
                         |                    |                 |           predicate:ca_address_sk is not null (type: boolean)
                         |                    |                 |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                 |           TableScan [TS_81]
+                        |                    |                 |           TableScan [TS_65]
                         |                    |                 |              alias:ad1
                         |                    |                 |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |                 |<-Reducer 13 [SIMPLE_EDGE]
-                        |                    |                    Reduce Output Operator [RS_132]
+                        |                    |                    Reduce Output Operator [RS_105]
                         |                    |                       key expressions:_col17 (type: int)
                         |                    |                       Map-reduce partition columns:_col17 (type: int)
                         |                    |                       sort order:+
                         |                    |                       Statistics:Num rows: 228249381 Data size: 196299086386 Basic stats: COMPLETE Column stats: NONE
                         |                    |                       value expressions:_col1 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col35 (type: int), _col37 (type: int), _col39 (type: string), _col40 (type: string), _col41 (type: string), _col42 (type: string)
-                        |                    |                       Merge Join Operator [MERGEJOIN_768]
+                        |                    |                       Merge Join Operator [MERGEJOIN_691]
                         |                    |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                       |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                         |                    |                       |  outputColumnNames:["_col1","_col9","_col10","_col11","_col17","_col23","_col25","_col27","_col28","_col35","_col37","_col39","_col40","_col41","_col42"]
                         |                    |                       |  Statistics:Num rows: 228249381 Data size: 196299086386 Basic stats: COMPLETE Column stats: NONE
                         |                    |                       |<-Map 32 [SIMPLE_EDGE]
-                        |                    |                       |  Reduce Output Operator [RS_129]
+                        |                    |                       |  Reduce Output Operator [RS_103]
                         |                    |                       |     key expressions:_col0 (type: int)
                         |                    |                       |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                       |     sort order:+
                         |                    |                       |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |                       |     value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
-                        |                    |                       |     Select Operator [SEL_80]
+                        |                    |                       |     Select Operator [SEL_64]
                         |                    |                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                         |                    |                       |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                       |        Filter Operator [FIL_728]
+                        |                    |                       |        Filter Operator [FIL_654]
                         |                    |                       |           predicate:ca_address_sk is not null (type: boolean)
                         |                    |                       |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                       |           TableScan [TS_78]
+                        |                    |                       |           TableScan [TS_62]
                         |                    |                       |              alias:ad1
                         |                    |                       |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |                       |<-Reducer 12 [SIMPLE_EDGE]
-                        |                    |                          Reduce Output Operator [RS_127]
+                        |                    |                          Reduce Output Operator [RS_102]
                         |                    |                             key expressions:_col5 (type: int)
                         |                    |                             Map-reduce partition columns:_col5 (type: int)
                         |                    |                             sort order:+
                         |                    |                             Statistics:Num rows: 207499433 Data size: 178453711029 Basic stats: COMPLETE Column stats: NONE
                         |                    |                             value expressions:_col1 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col35 (type: int), _col37 (type: int)
-                        |                    |                             Merge Join Operator [MERGEJOIN_767]
+                        |                    |                             Merge Join Operator [MERGEJOIN_690]
                         |                    |                             |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                             |  keys:{"0":"_col16 (type: int)","1":"_col0 (type: int)"}
                         |                    |                             |  outputColumnNames:["_col1","_col5","_col9","_col10","_col11","_col17","_col23","_col25","_col27","_col28","_col35","_col37"]
                         |                    |                             |  Statistics:Num rows: 207499433 Data size: 178453711029 Basic stats: COMPLETE Column stats: NONE
                         |                    |                             |<-Map 31 [SIMPLE_EDGE]
-                        |                    |                             |  Reduce Output Operator [RS_124]
+                        |                    |                             |  Reduce Output Operator [RS_100]
                         |                    |                             |     key expressions:_col0 (type: int)
                         |                    |                             |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                             |     sort order:+
                         |                    |                             |     Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                         |                    |                             |     value expressions:_col1 (type: int)
-                        |                    |                             |     Select Operator [SEL_77]
+                        |                    |                             |     Select Operator [SEL_61]
                         |                    |                             |        outputColumnNames:["_col0","_col1"]
                         |                    |                             |        Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                             |        Filter Operator [FIL_727]
+                        |                    |                             |        Filter Operator [FIL_653]
                         |                    |                             |           predicate:(hd_demo_sk is not null and hd_income_band_sk is not null) (type: boolean)
                         |                    |                             |           Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                             |           TableScan [TS_75]
+                        |                    |                             |           TableScan [TS_59]
                         |                    |                             |              alias:hd1
                         |                    |                             |              Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                         |                    |                             |<-Reducer 11 [SIMPLE_EDGE]
-                        |                    |                                Reduce Output Operator [RS_122]
+                        |                    |                                Reduce Output Operator [RS_99]
                         |                    |                                   key expressions:_col16 (type: int)
                         |                    |                                   Map-reduce partition columns:_col16 (type: int)
                         |                    |                                   sort order:+
                         |                    |                                   Statistics:Num rows: 188635845 Data size: 162230642874 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                   value expressions:_col1 (type: int), _col5 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col35 (type: int)
-                        |                    |                                   Merge Join Operator [MERGEJOIN_766]
+                        |                    |                                   Merge Join Operator [MERGEJOIN_689]
                         |                    |                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                   |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                   |  outputColumnNames:["_col1","_col5","_col9","_col10","_col11","_col16","_col17","_col23","_col25","_col27","_col28","_col35"]
                         |                    |                                   |  Statistics:Num rows: 188635845 Data size: 162230642874 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                   |<-Map 30 [SIMPLE_EDGE]
-                        |                    |                                   |  Reduce Output Operator [RS_119]
+                        |                    |                                   |  Reduce Output Operator [RS_97]
                         |                    |                                   |     key expressions:_col0 (type: int)
                         |                    |                                   |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                   |     sort order:+
                         |                    |                                   |     Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                   |     value expressions:_col1 (type: int)
-                        |                    |                                   |     Select Operator [SEL_74]
+                        |                    |                                   |     Select Operator [SEL_58]
                         |                    |                                   |        outputColumnNames:["_col0","_col1"]
                         |                    |                                   |        Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                   |        Filter Operator [FIL_726]
+                        |                    |                                   |        Filter Operator [FIL_652]
                         |                    |                                   |           predicate:(hd_demo_sk is not null and hd_income_band_sk is not null) (type: boolean)
                         |                    |                                   |           Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                   |           TableScan [TS_72]
+                        |                    |                                   |           TableScan [TS_56]
                         |                    |                                   |              alias:hd1
                         |                    |                                   |              Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                   |<-Reducer 10 [SIMPLE_EDGE]
-                        |                    |                                      Reduce Output Operator [RS_117]
+                        |                    |                                      Reduce Output Operator [RS_96]
                         |                    |                                         key expressions:_col4 (type: int)
                         |                    |                                         Map-reduce partition columns:_col4 (type: int)
                         |                    |                                         sort order:+
                         |                    |                                         Statistics:Num rows: 171487129 Data size: 147482399417 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                         value expressions:_col1 (type: int), _col5 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col16 (type: int), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string)
-                        |                    |                                         Merge Join Operator [MERGEJOIN_765]
+                        |                    |                                         Merge Join Operator [MERGEJOIN_688]
                         |                    |                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                         |  keys:{"0":"_col7 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                         |  outputColumnNames:["_col1","_col4","_col5","_col9","_col10","_col11","_col16","_col17","_col23","_col25","_col27","_col28"]
                         |                    |                                         |  Statistics:Num rows: 171487129 Data size: 147482399417 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                         |<-Map 29 [SIMPLE_EDGE]
-                        |                    |                                         |  Reduce Output Operator [RS_114]
+                        |                    |                                         |  Reduce Output Operator [RS_94]
                         |                    |                                         |     key expressions:_col0 (type: int)
                         |                    |                                         |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                         |     sort order:+
                         |                    |                                         |     Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                         |     Select Operator [SEL_71]
+                        |                    |                                         |     Select Operator [SEL_55]
                         |                    |                                         |        outputColumnNames:["_col0"]
                         |                    |                                         |        Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                         |        Filter Operator [FIL_725]
+                        |                    |                                         |        Filter Operator [FIL_651]
                         |                    |                                         |           predicate:p_promo_sk is not null (type: boolean)
                         |                    |                                         |           Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                         |           TableScan [TS_69]
+                        |                    |                                         |           TableScan [TS_53]
                         |                    |                                         |              alias:promotion
                         |                    |                                         |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                         |<-Reducer 9 [SIMPLE_EDGE]
-                        |                    |                                            Reduce Output Operator [RS_112]
+                        |                    |                                            Reduce Output Operator [RS_93]
                         |                    |                                               key expressions:_col7 (type: int)
                         |                    |                                               Map-reduce partition columns:_col7 (type: int)
                         |                    |                                               sort order:+
                         |                    |                                               Statistics:Num rows: 155897387 Data size: 134074905655 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                               value expressions:_col1 (type: int), _col4 (type: int), _col5 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col16 (type: int), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string)
-                        |                    |                                               Select Operator [SEL_68]
+                        |                    |                                               Select Operator [SEL_52]
                         |                    |                                                  outputColumnNames:["_col1","_col10","_col11","_col16","_col17","_col23","_col25","_col27","_col28","_col4","_col5","_col7","_col9"]
                         |                    |                                                  Statistics:Num rows: 155897387 Data size: 134074905655 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                  Filter Operator [FIL_715]
+                        |                    |                                                  Filter Operator [FIL_51]
                         |                    |                                                     predicate:(_col30 <> _col32) (type: boolean)
                         |                    |                                                     Statistics:Num rows: 155897387 Data size: 134074905655 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                     Merge Join Operator [MERGEJOIN_764]
+                        |                    |                                                     Merge Join Operator [MERGEJOIN_687]
                         |                    |                                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                     |  keys:{"0":"_col15 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                     |  outputColumnNames:["_col1","_col4","_col5","_col7","_col9","_col10","_col11","_col16","_col17","_col23","_col25","_col27","_col28","_col30","_col32"]
                         |                    |                                                     |  Statistics:Num rows: 155897387 Data size: 134074905655 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                     |<-Map 28 [SIMPLE_EDGE]
-                        |                    |                                                     |  Reduce Output Operator [RS_65]
+                        |                    |                                                     |  Reduce Output Operator [RS_49]
                         |                    |                                                     |     key expressions:_col0 (type: int)
                         |                    |                                                     |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                     |     sort order:+
@@ -347,26 +347,26 @@ Stage-0
                         |                    |                                                     |     Select Operator [SEL_26]
                         |                    |                                                     |        outputColumnNames:["_col0","_col1"]
                         |                    |                                                     |        Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                     |        Filter Operator [FIL_724]
+                        |                    |                                                     |        Filter Operator [FIL_650]
                         |                    |                                                     |           predicate:cd_demo_sk is not null (type: boolean)
                         |                    |                                                     |           Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                     |           TableScan [TS_24]
                         |                    |                                                     |              alias:cd1
                         |                    |                                                     |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                     |<-Reducer 8 [SIMPLE_EDGE]
-                        |                    |                                                        Reduce Output Operator [RS_63]
+                        |                    |                                                        Reduce Output Operator [RS_48]
                         |                    |                                                           key expressions:_col15 (type: int)
                         |                    |                                                           Map-reduce partition columns:_col15 (type: int)
                         |                    |                                                           sort order:+
                         |                    |                                                           Statistics:Num rows: 141724895 Data size: 121886275227 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                           value expressions:_col1 (type: int), _col4 (type: int), _col5 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col16 (type: int), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string), _col30 (type: string)
-                        |                    |                                                           Merge Join Operator [MERGEJOIN_763]
+                        |                    |                                                           Merge Join Operator [MERGEJOIN_686]
                         |                    |                                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                           |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                           |  outputColumnNames:["_col1","_col4","_col5","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col23","_col25","_col27","_col28","_col30"]
                         |                    |                                                           |  Statistics:Num rows: 141724895 Data size: 121886275227 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                           |<-Map 27 [SIMPLE_EDGE]
-                        |                    |                                                           |  Reduce Output Operator [RS_60]
+                        |                    |                                                           |  Reduce Output Operator [RS_46]
                         |                    |                                                           |     key expressions:_col0 (type: int)
                         |                    |                                                           |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                           |     sort order:+
@@ -375,26 +375,26 @@ Stage-0
                         |                    |                                                           |     Select Operator [SEL_23]
                         |                    |                                                           |        outputColumnNames:["_col0","_col1"]
                         |                    |                                                           |        Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                           |        Filter Operator [FIL_723]
+                        |                    |                                                           |        Filter Operator [FIL_649]
                         |                    |                                                           |           predicate:cd_demo_sk is not null (type: boolean)
                         |                    |                                                           |           Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                           |           TableScan [TS_21]
                         |                    |                                                           |              alias:cd1
                         |                    |                                                           |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                           |<-Reducer 7 [SIMPLE_EDGE]
-                        |                    |                                                              Reduce Output Operator [RS_58]
+                        |                    |                                                              Reduce Output Operator [RS_45]
                         |                    |                                                                 key expressions:_col3 (type: int)
                         |                    |                                                                 Map-reduce partition columns:_col3 (type: int)
                         |                    |                                                                 sort order:+
                         |                    |                                                                 Statistics:Num rows: 128840811 Data size: 110805702351 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                 value expressions:_col1 (type: int), _col4 (type: int), _col5 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col15 (type: int), _col16 (type: int), _col17 (type: int), _col23 (type: int), _col25 (type: int), _col27 (type: string), _col28 (type: string)
-                        |                    |                                                                 Merge Join Operator [MERGEJOIN_762]
+                        |                    |                                                                 Merge Join Operator [MERGEJOIN_685]
                         |                    |                                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                 |  keys:{"0":"_col6 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                                 |  outputColumnNames:["_col1","_col3","_col4","_col5","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col23","_col25","_col27","_col28"]
                         |                    |                                                                 |  Statistics:Num rows: 128840811 Data size: 110805702351 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                 |<-Map 26 [SIMPLE_EDGE]
-                        |                    |                                                                 |  Reduce Output Operator [RS_55]
+                        |                    |                                                                 |  Reduce Output Operator [RS_43]
                         |                    |                                                                 |     key expressions:_col0 (type: int)
                         |                    |                                                                 |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                 |     sort order:+
@@ -403,26 +403,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_722]
+                        |                    |                                                                 |        Filter Operator [FIL_648]
                         |                    |                                                                 |           predicate:((s_store_sk is not null and s_zip is not null) and s_store_name 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_53]
+                        |                    |                                                                    Reduce Output Operator [RS_42]
                         |                    |                                                                       key expressions:_col6 (type: int)
                         |                    |                                                                       Map-reduce partition columns:_col6 (type: int)
                         |                    |                                                                       sort order:+
                         |                    |                                                                       Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                       value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col15 (type: int), _col16 (type: int), _col17 (type: int), _col23 (type: int), _col25 (type: int)
-                        |                    |                                                                       Merge Join Operator [MERGEJOIN_761]
+                        |                    |                                                                       Merge Join Operator [MERGEJOIN_684]
                         |                    |                                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                       |  keys:{"0":"_col18 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                                       |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col23","_col25"]
                         |                    |                                                                       |  Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                       |<-Map 25 [SIMPLE_EDGE]
-                        |                    |                                                                       |  Reduce Output Operator [RS_50]
+                        |                    |                                                                       |  Reduce Output Operator [RS_40]
                         |                    |                                                                       |     key expressions:_col0 (type: int)
                         |                    |                                                                       |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                       |     sort order:+
@@ -431,26 +431,26 @@ Stage-0
                         |                    |                                                                       |     Select Operator [SEL_17]
                         |                    |                                                                       |        outputColumnNames:["_col0","_col1"]
                         |                    |                                                                       |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                                       |        Filter Operator [FIL_721]
+                        |                    |                                                                       |        Filter Operator [FIL_647]
                         |                    |                                                                       |           predicate:d_date_sk is not null (type: boolean)
                         |                    |                                                                       |           Statistics:Num rows: 73049 Data size: 81741831 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_48]
+                        |                    |                                                                          Reduce Output Operator [RS_39]
                         |                    |                                                                             key expressions:_col18 (type: int)
                         |                    |                                                                             Map-reduce partition columns:_col18 (type: int)
                         |                    |                                                                             sort order:+
                         |                    |                                                                             Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                             value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col15 (type: int), _col16 (type: int), _col17 (type: int), _col23 (type: int)
-                        |                    |                                                                             Merge Join Operator [MERGEJOIN_760]
+                        |                    |                                                                             Merge Join Operator [MERGEJOIN_683]
                         |                    |                                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                             |  keys:{"0":"_col19 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                                             |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col23"]
                         |                    |                                                                             |  Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                             |<-Map 24 [SIMPLE_EDGE]
-                        |                    |                                                                             |  Reduce Output Operator [RS_45]
+                        |                    |                                                                             |  Reduce Output Operator [RS_37]
                         |                    |                                                                             |     key expressions:_col0 (type: int)
                         |                    |                                                                             |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                             |     sort order:+
@@ -459,26 +459,26 @@ Stage-0
                         |                    |                                                                             |     Select Operator [SEL_14]
                         |                    |                                                                             |        outputColumnNames:["_col0","_col1"]
                         |                    |                                                                             |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                                             |        Filter Operator [FIL_720]
+                        |                    |                                                                             |        Filter Operator [FIL_646]
                         |                    |                                                                             |           predicate:d_date_sk is not null (type: boolean)
                         |                    |                                                                             |           Statistics:Num rows: 73049 Data size: 81741831 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_43]
+                        |                    |                                                                                Reduce Output Operator [RS_36]
                         |                    |                                                                                   key expressions:_col19 (type: int)
                         |                    |                                                                                   Map-reduce partition columns:_col19 (type: int)
                         |                    |                                                                                   sort order:+
                         |                    |                                                                                   Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                   value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col15 (type: int), _col16 (type: int), _col17 (type: int), _col18 (type: int)
-                        |                    |                                                                                   Merge Join Operator [MERGEJOIN_759]
+                        |                    |                                                                                   Merge Join Operator [MERGEJOIN_682]
                         |                    |                                                                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                                   |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                                                   |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19"]
                         |                    |                                                                                   |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                   |<-Map 23 [SIMPLE_EDGE]
-                        |                    |                                                                                   |  Reduce Output Operator [RS_40]
+                        |                    |                                                                                   |  Reduce Output Operator [RS_34]
                         |                    |                                                                                   |     key expressions:_col0 (type: int)
                         |                    |                                                                                   |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                                   |     sort order:+
@@ -486,26 +486,26 @@ Stage-0
                         |                    |                                                                                   |     Select Operator [SEL_11]
                         |                    |                                                                                   |        outputColumnNames:["_col0"]
                         |                    |                                                                                   |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                                                   |        Filter Operator [FIL_719]
+                        |                    |                                                                                   |        Filter Operator [FIL_645]
                         |                    |                                                                                   |           predicate:((d_year = 2000) and d_date_sk is not null) (type: boolean)
                         |                    |                                                                                   |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                   |           TableScan [TS_9]
                         |                    |                                                                                   |              alias:d1
                         |                    |                                                                                   |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                   |<-Reducer 3 [SIMPLE_EDGE]
-                        |                    |                                                                                      Reduce Output Operator [RS_38]
+                        |                    |                                                                                      Reduce Output Operator [RS_33]
                         |                    |                                                                                         key expressions:_col0 (type: int)
                         |                    |                                                                                         Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                                         sort order:+
                         |                    |                                                                                         Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                         value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2)), _col15 (type: int), _col16 (type: int), _col17 (type: int), _col18 (type: int), _col19 (type: int)
-                        |                    |                                                                                         Merge Join Operator [MERGEJOIN_758]
+                        |                    |                                                                                         Merge Join Operator [MERGEJOIN_681]
                         |                    |                                                                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                                         |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                         |                    |                                                                                         |  outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19"]
                         |                    |                                                                                         |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                         |<-Map 22 [SIMPLE_EDGE]
-                        |                    |                                                                                         |  Reduce Output Operator [RS_35]
+                        |                    |                                                                                         |  Reduce Output Operator [RS_31]
                         |                    |                                                                                         |     key expressions:_col0 (type: int)
                         |                    |                                                                                         |     Map-reduce partition columns:_col0 (type: int)
                         |                    |                                                                                         |     sort order:+
@@ -514,26 +514,26 @@ Stage-0
                         |                    |                                                                                         |     Select Operator [SEL_8]
                         |                    |                                                                                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |                    |                                                                                         |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                        |                    |                                                                                         |        Filter Operator [FIL_718]
+                        |                    |                                                                                         |        Filter Operator [FIL_644]
                         |                    |                                                                                         |           predicate:(((((c_customer_sk is not null and c_first_sales_date_sk is not null) and c_first_shipto_date_sk is not null) and c_current_cdemo_sk is not null) and c_current_hdemo_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_6]
                         |                    |                                                                                         |              alias:customer
                         |                    |                                                                                         |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                         |                    |                                                                                         |<-Reducer 2 [SIMPLE_EDGE]
-                        |                    |                                                                                            Reduce Output Operator [RS_33]
+                        |                    |                                                                                            Reduce Output Operator [RS_30]
                         |                    |                                                                                               key expressions:_col2 (type: int)
                         |                    |                                                                                               Map-reduce partition columns:_col2 (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), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col9 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: decimal(7,2))
-                        |                    |                                                                                               Merge Join Operator [MERGEJOIN_757]
+                        |                    |                                                                                               Merge Join Operator [MERGEJOIN_680]
                         |                    |                                                                                               |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |                                                                                               |  keys:{"0":"_col1 (type: int), _col8 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                         |                    |                                                                                               |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11"]
                         |                    |                                                                                               |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                    |                                                                                               |<-Map 1 [SIMPLE_EDGE]
-                        |                    |                                                                                               |  Reduce Output Operator [RS_28]
+                        |                    |                                                                                               |  Reduce Output Operator [RS_27]
                         |                    |                                                                                               |     key expressions:_col1 (type: int), _col8 (type: int)
                         |                    |                                                                                               |     Map-reduce partition columns:_col1 (type: int), _col8 (type: int)
                         |                    |                                                                                               |     sort order:++
@@ -542,14 +542,14 @@ Stage-0
                         |                    |                                                                                               |     Select Operator [SEL_2]
                         |                    |                                                                                               |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                         |                    |                                                                                               |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                    |                                                                                               |        Filter Operator [FIL_716]
+                        |                    |                                                                                               |        Filter Operator [FIL_642]
                         |                    |                                                                                               |           predicate:((((((((ss_ticket_number is not null and ss_item_sk is not null) and ss_customer_sk is not null) and ss_sold_date_sk is not null) and ss_store_sk is not null) and ss_cdemo_sk is not null) and ss_promo_sk is not null) and ss_hdemo_sk is not null) and ss_addr_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 21 [SIMPLE_EDGE]
-                        |                    |                                                                                                  Reduce Output Operator [RS_30]
+                        |                    |                                                                                                  Reduce Output Operator [RS_28]
                         |                    |                                                                                                     key expressions:_col0 (type: int), _col1 (type: int)
                         |                    |                                                                                                     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                         |                    |                                                                                                     sort order:++
@@ -557,636 +557,636 @@ Stage-0
                         |                    |                                                                                                     Select Operator [SEL_5]
                         |                    |                                                                                                        outputColumnNames:["_col0","_col1"]
                         |                    |                                                                                                        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                    |                                                                                                        Filter Operator [FIL_717]
+                        |                    |                                                                                                        Filter Operator [FIL_643]
                         |                    |            

<TRUNCATED>

[12/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query84.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query84.q.out b/ql/src/test/results/clientpositive/perf/query84.q.out
index 8e15aee..e522f23 100644
--- a/ql/src/test/results/clientpositive/perf/query84.q.out
+++ b/ql/src/test/results/clientpositive/perf/query84.q.out
@@ -16,32 +16,32 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_44]
+         File Output Operator [FS_35]
             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_43]
+            Limit [LIM_34]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_42]
+               Select Operator [SEL_33]
                |  outputColumnNames:["_col0","_col1"]
                |  Statistics:Num rows: 234256017 Data size: 201464909002 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_41]
+                  Reduce Output Operator [RS_32]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 234256017 Data size: 201464909002 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: string)
-                     Select Operator [SEL_40]
+                     Select Operator [SEL_31]
                         outputColumnNames:["_col0","_col1"]
                         Statistics:Num rows: 234256017 Data size: 201464909002 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_75]
+                        Merge Join Operator [MERGEJOIN_66]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{"0":"_col11 (type: int)","1":"_col0 (type: int)"}
                         |  outputColumnNames:["_col0","_col4","_col5"]
                         |  Statistics:Num rows: 234256017 Data size: 201464909002 Basic stats: COMPLETE Column stats: NONE
                         |<-Map 10 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_38]
+                        |  Reduce Output Operator [RS_29]
                         |     key expressions:_col0 (type: int)
                         |     Map-reduce partition columns:_col0 (type: int)
                         |     sort order:+
@@ -49,26 +49,26 @@ Stage-0
                         |     Select Operator [SEL_14]
                         |        outputColumnNames:["_col0"]
                         |        Statistics:Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                        |        Filter Operator [FIL_70]
+                        |        Filter Operator [FIL_61]
                         |           predicate:(((ib_upper_bound <= 82287) and (ib_lower_bound >= 32287)) and ib_income_band_sk is not null) (type: boolean)
                         |           Statistics:Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                         |           TableScan [TS_12]
                         |              alias:income_band
                         |              Statistics:Num rows: 20 Data size: 240 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 4 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_36]
+                           Reduce Output Operator [RS_28]
                               key expressions:_col11 (type: int)
                               Map-reduce partition columns:_col11 (type: int)
                               sort order:+
                               Statistics:Num rows: 212960011 Data size: 183149913305 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: string), _col4 (type: string), _col5 (type: string)
-                              Merge Join Operator [MERGEJOIN_74]
+                              Merge Join Operator [MERGEJOIN_65]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col0","_col4","_col5","_col11"]
                               |  Statistics:Num rows: 212960011 Data size: 183149913305 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 9 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_33]
+                              |  Reduce Output Operator [RS_26]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: int)
                               |     sort order:+
@@ -77,26 +77,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_69]
+                              |        Filter Operator [FIL_60]
                               |           predicate:(hd_demo_sk is not null and hd_income_band_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_31]
+                                 Reduce Output Operator [RS_25]
                                     key expressions:_col2 (type: int)
                                     Map-reduce partition columns:_col2 (type: int)
                                     sort order:+
                                     Statistics:Num rows: 193600006 Data size: 166499917578 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col0 (type: string), _col4 (type: string), _col5 (type: string)
-                                    Merge Join Operator [MERGEJOIN_73]
+                                    Merge Join Operator [MERGEJOIN_64]
                                     |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 1 to 2"}]
                                     |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col0","_col2","_col4","_col5"]
                                     |  Statistics:Num rows: 193600006 Data size: 166499917578 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 11 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_28]
+                                    |  Reduce Output Operator [RS_23]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -104,14 +104,14 @@ Stage-0
                                     |     Select Operator [SEL_17]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |        Filter Operator [FIL_71]
+                                    |        Filter Operator [FIL_62]
                                     |           predicate:sr_cdemo_sk is not null (type: boolean)
                                     |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           TableScan [TS_15]
                                     |              alias:store_returns
                                     |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |<-Map 8 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_26]
+                                    |  Reduce Output Operator [RS_22]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -119,26 +119,26 @@ Stage-0
                                     |     Select Operator [SEL_8]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_68]
+                                    |        Filter Operator [FIL_59]
                                     |           predicate: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_24]
+                                       Reduce Output Operator [RS_21]
                                           key expressions:_col1 (type: int)
                                           Map-reduce partition columns:_col1 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col0 (type: string), _col2 (type: int), _col4 (type: string), _col5 (type: string)
-                                          Merge Join Operator [MERGEJOIN_72]
+                                          Merge Join Operator [MERGEJOIN_63]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col0","_col1","_col2","_col4","_col5"]
                                           |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 1 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_19]
+                                          |  Reduce Output Operator [RS_18]
                                           |     key expressions:_col3 (type: int)
                                           |     Map-reduce partition columns:_col3 (type: int)
                                           |     sort order:+
@@ -147,14 +147,14 @@ Stage-0
                                           |     Select Operator [SEL_2]
                                           |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                           |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_66]
+                                          |        Filter Operator [FIL_57]
                                           |           predicate:((c_current_addr_sk is not null and c_current_cdemo_sk is not null) and c_current_hdemo_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_0]
                                           |              alias:customer
                                           |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 7 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_21]
+                                             Reduce Output Operator [RS_19]
                                                 key expressions:_col0 (type: int)
                                                 Map-reduce partition columns:_col0 (type: int)
                                                 sort order:+
@@ -162,7 +162,7 @@ Stage-0
                                                 Select Operator [SEL_5]
                                                    outputColumnNames:["_col0"]
                                                    Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_67]
+                                                   Filter Operator [FIL_58]
                                                       predicate:((ca_city = 'Hopewell') and ca_address_sk is not null) (type: boolean)
                                                       Statistics:Num rows: 20000000 Data size: 20297597642 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/query85.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query85.q.out b/ql/src/test/results/clientpositive/perf/query85.q.out
index 660c578..54061ce 100644
--- a/ql/src/test/results/clientpositive/perf/query85.q.out
+++ b/ql/src/test/results/clientpositive/perf/query85.q.out
@@ -20,173 +20,173 @@ Stage-0
       limit:100
       Stage-1
          Reducer 10
-         File Output Operator [FS_71]
+         File Output Operator [FS_57]
             compressed:false
             Statistics:Num rows: 100 Data size: 101400 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_70]
+            Limit [LIM_56]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 101400 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_69]
+               Select Operator [SEL_55]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 9982500 Data size: 10131039080 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 9 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_68]
+                  Reduce Output Operator [RS_54]
                      key expressions:_col0 (type: string), _col1 (type: double), _col2 (type: decimal(11,6)), _col3 (type: decimal(11,6))
                      sort order:++++
                      Statistics:Num rows: 9982500 Data size: 10131039080 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_67]
+                     Select Operator [SEL_53]
                         outputColumnNames:["_col0","_col1","_col2","_col3"]
                         Statistics:Num rows: 9982500 Data size: 10131039080 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_66]
+                        Group By Operator [GBY_52]
                         |  aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)"]
                         |  keys:KEY._col0 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                         |  Statistics:Num rows: 9982500 Data size: 10131039080 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 8 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_65]
+                           Reduce Output Operator [RS_51]
                               key expressions:_col0 (type: string)
                               Map-reduce partition columns:_col0 (type: string)
                               sort order:+
                               Statistics:Num rows: 19965000 Data size: 20262078161 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col1 (type: struct<count:bigint,sum:double,input:int>), _col2 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col3 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
-                              Group By Operator [GBY_64]
+                              Group By Operator [GBY_50]
                                  aggregations:["avg(_col4)","avg(_col14)","avg(_col13)"]
                                  keys:_col28 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 19965000 Data size: 20262078161 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_63]
+                                 Select Operator [SEL_49]
                                     outputColumnNames:["_col28","_col4","_col14","_col13"]
                                     Statistics:Num rows: 19965000 Data size: 20262078161 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_123]
+                                    Merge Join Operator [MERGEJOIN_107]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col11 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col4","_col13","_col14","_col28"]
                                     |  Statistics:Num rows: 19965000 Data size: 20262078161 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 17 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_61]
+                                    |  Reduce Output Operator [RS_47]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
                                     |     Statistics:Num rows: 72 Data size: 14400 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col1 (type: string)
-                                    |     Select Operator [SEL_52]
+                                    |     Select Operator [SEL_42]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 72 Data size: 14400 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_116]
+                                    |        Filter Operator [FIL_100]
                                     |           predicate:r_reason_sk is not null (type: boolean)
                                     |           Statistics:Num rows: 72 Data size: 14400 Basic stats: COMPLETE Column stats: NONE
-                                    |           TableScan [TS_50]
+                                    |           TableScan [TS_40]
                                     |              alias:reason
                                     |              Statistics:Num rows: 72 Data size: 14400 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 7 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_59]
+                                       Reduce Output Operator [RS_46]
                                           key expressions:_col11 (type: int)
                                           Map-reduce partition columns:_col11 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 18150000 Data size: 18420070657 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col4 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                          Merge Join Operator [MERGEJOIN_122]
+                                          Merge Join Operator [MERGEJOIN_106]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col4","_col11","_col13","_col14"]
                                           |  Statistics:Num rows: 18150000 Data size: 18420070657 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 16 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_56]
+                                          |  Reduce Output Operator [RS_44]
                                           |     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_49]
+                                          |     Select Operator [SEL_39]
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_115]
+                                          |        Filter Operator [FIL_99]
                                           |           predicate:((d_year = 1998) and d_date_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                          |           TableScan [TS_47]
+                                          |           TableScan [TS_37]
                                           |              alias:date_dim
                                           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 6 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_54]
+                                             Reduce Output Operator [RS_43]
                                                 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:_col4 (type: int), _col11 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                Select Operator [SEL_46]
+                                                Select Operator [SEL_36]
                                                    outputColumnNames:["_col0","_col11","_col13","_col14","_col4"]
                                                    Statistics:Num rows: 16500000 Data size: 16745518417 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_107]
+                                                   Filter Operator [FIL_35]
                                                       predicate:(((_col23) IN ('KY', 'GA', 'NM') and _col6 BETWEEN 100 AND 200) or ((_col23) IN ('MT', 'OR', 'IN') and _col6 BETWEEN 150 AND 300) or ((_col23) IN ('WI', 'MO', 'WV') and _col6 BETWEEN 50 AND 250)) (type: boolean)
                                                       Statistics:Num rows: 16500000 Data size: 16745518417 Basic stats: COMPLETE Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_121]
+                                                      Merge Join Operator [MERGEJOIN_105]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col9 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col4","_col6","_col11","_col13","_col14","_col23"]
                                                       |  Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 15 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_43]
+                                                      |  Reduce Output Operator [RS_33]
                                                       |     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_34]
+                                                      |     Select Operator [SEL_28]
                                                       |        outputColumnNames:["_col0","_col1"]
                                                       |        Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_114]
+                                                      |        Filter Operator [FIL_98]
                                                       |           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_32]
+                                                      |           TableScan [TS_26]
                                                       |              alias:customer_address
                                                       |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 5 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_41]
+                                                         Reduce Output Operator [RS_32]
                                                             key expressions:_col9 (type: int)
                                                             Map-reduce partition columns:_col9 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 21780 Data size: 7888165 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col0 (type: int), _col4 (type: int), _col6 (type: decimal(7,2)), _col11 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                            Merge Join Operator [MERGEJOIN_120]
+                                                            Merge Join Operator [MERGEJOIN_104]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col10 (type: int), _col17 (type: string), _col18 (type: string)","1":"_col0 (type: int), _col1 (type: string), _col2 (type: string)"}
                                                             |  outputColumnNames:["_col0","_col4","_col6","_col9","_col11","_col13","_col14"]
                                                             |  Statistics:Num rows: 21780 Data size: 7888165 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 14 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_38]
+                                                            |  Reduce Output Operator [RS_30]
                                                             |     key expressions:_col0 (type: int), _col1 (type: string), _col2 (type: string)
                                                             |     Map-reduce partition columns:_col0 (type: int), _col1 (type: string), _col2 (type: string)
                                                             |     sort order:+++
                                                             |     Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                                            |     Select Operator [SEL_31]
+                                                            |     Select Operator [SEL_25]
                                                             |        outputColumnNames:["_col0","_col1","_col2"]
                                                             |        Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                                            |        Filter Operator [FIL_113]
+                                                            |        Filter Operator [FIL_97]
                                                             |           predicate:((((((cd_education_status = '4 yr Degree') or (cd_education_status = 'Primary') or (cd_education_status = 'Advanced Degree')) and cd_education_status is not null) and ((cd_marital_status = 'M') or (cd_marital_status = 'D') or (cd_marital_status = 'U'))) and cd_marital_status is not null) and cd_demo_sk is not null) (type: boolean)
                                                             |           Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                                            |           TableScan [TS_29]
+                                                            |           TableScan [TS_23]
                                                             |              alias:cd1
                                                             |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Reducer 4 [SIMPLE_EDGE]
-                                                               Reduce Output Operator [RS_36]
+                                                               Reduce Output Operator [RS_29]
                                                                   key expressions:_col10 (type: int), _col17 (type: string), _col18 (type: string)
                                                                   Map-reduce partition columns:_col10 (type: int), _col17 (type: string), _col18 (type: string)
                                                                   sort order:+++
                                                                   Statistics:Num rows: 8166 Data size: 2957518 Basic stats: COMPLETE Column stats: NONE
                                                                   value expressions:_col0 (type: int), _col4 (type: int), _col6 (type: decimal(7,2)), _col9 (type: int), _col11 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                                  Select Operator [SEL_28]
+                                                                  Select Operator [SEL_22]
                                                                      outputColumnNames:["_col0","_col10","_col11","_col13","_col14","_col17","_col18","_col4","_col6","_col9"]
                                                                      Statistics:Num rows: 8166 Data size: 2957518 Basic stats: COMPLETE Column stats: NONE
-                                                                     Filter Operator [FIL_108]
+                                                                     Filter Operator [FIL_21]
                                                                         predicate:(((_col17 = 'M') and (_col18 = '4 yr Degree') and _col5 BETWEEN 100.0 AND 150.0) or ((_col17 = 'D') and (_col18 = 'Primary') and _col5 BETWEEN 50.0 AND 100.0) or ((_col17 = 'U') and (_col18 = 'Advanced Degree') and _col5 BETWEEN 150.0 AND 200.0)) (type: boolean)
                                                                         Statistics:Num rows: 8166 Data size: 2957518 Basic stats: COMPLETE Column stats: NONE
-                                                                        Merge Join Operator [MERGEJOIN_119]
+                                                                        Merge Join Operator [MERGEJOIN_103]
                                                                         |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                         |  keys:{"0":"_col8 (type: int)","1":"_col0 (type: int)"}
                                                                         |  outputColumnNames:["_col0","_col4","_col5","_col6","_col9","_col10","_col11","_col13","_col14","_col17","_col18"]
                                                                         |  Statistics:Num rows: 21780 Data size: 7888165 Basic stats: COMPLETE Column stats: NONE
                                                                         |<-Map 13 [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:+
@@ -195,26 +195,26 @@ Stage-0
                                                                         |     Select Operator [SEL_11]
                                                                         |        outputColumnNames:["_col0","_col1","_col2"]
                                                                         |        Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
-                                                                        |        Filter Operator [FIL_112]
+                                                                        |        Filter Operator [FIL_96]
                                                                         |           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) and cd_education_status is not null) and cd_marital_status is not null) (type: boolean)
                                                                         |           Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                                                         |           TableScan [TS_9]
                                                                         |              alias:cd1
                                                                         |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                                                         |<-Reducer 3 [SIMPLE_EDGE]
-                                                                           Reduce Output Operator [RS_23]
+                                                                           Reduce Output Operator [RS_18]
                                                                               key expressions:_col8 (type: int)
                                                                               Map-reduce partition columns:_col8 (type: int)
                                                                               sort order:+
                                                                               Statistics:Num rows: 5062 Data size: 2965795 Basic stats: COMPLETE Column stats: NONE
                                                                               value expressions:_col0 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col9 (type: int), _col10 (type: int), _col11 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                                              Merge Join Operator [MERGEJOIN_118]
+                                                                              Merge Join Operator [MERGEJOIN_102]
                                                                               |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                               |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                                               |  outputColumnNames:["_col0","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col13","_col14"]
                                                                               |  Statistics:Num rows: 5062 Data size: 2965795 Basic stats: COMPLETE Column stats: NONE
                                                                               |<-Map 12 [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:+
@@ -222,26 +222,26 @@ Stage-0
                                                                               |     Select Operator [SEL_8]
                                                                               |        outputColumnNames:["_col0"]
                                                                               |        Statistics:Num rows: 4602 Data size: 2696178 Basic stats: COMPLETE Column stats: NONE
-                                                                              |        Filter Operator [FIL_111]
+                                                                              |        Filter Operator [FIL_95]
                                                                               |           predicate:wp_web_page_sk is not null (type: boolean)
                                                                               |           Statistics:Num rows: 4602 Data size: 2696178 Basic stats: COMPLETE Column stats: NONE
                                                                               |           TableScan [TS_6]
                                                                               |              alias:web_page
                                                                               |              Statistics:Num rows: 4602 Data size: 2696178 Basic stats: COMPLETE Column stats: NONE
                                                                               |<-Reducer 2 [SIMPLE_EDGE]
-                                                                                 Reduce Output Operator [RS_18]
+                                                                                 Reduce Output Operator [RS_15]
                                                                                     key expressions:_col2 (type: int)
                                                                                     Map-reduce partition columns:_col2 (type: int)
                                                                                     sort order:+
                                                                                     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                     value expressions:_col0 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: int), _col9 (type: int), _col10 (type: int), _col11 (type: int), _col13 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                                                    Merge Join Operator [MERGEJOIN_117]
+                                                                                    Merge Join Operator [MERGEJOIN_101]
                                                                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                     |  keys:{"0":"_col1 (type: int), _col3 (type: int)","1":"_col0 (type: int), _col5 (type: int)"}
                                                                                     |  outputColumnNames:["_col0","_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col13","_col14"]
                                                                                     |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                     |<-Map 1 [SIMPLE_EDGE]
-                                                                                    |  Reduce Output Operator [RS_13]
+                                                                                    |  Reduce Output Operator [RS_12]
                                                                                     |     key expressions:_col1 (type: int), _col3 (type: int)
                                                                                     |     Map-reduce partition columns:_col1 (type: int), _col3 (type: int)
                                                                                     |     sort order:++
@@ -250,14 +250,14 @@ Stage-0
                                                                                     |     Select Operator [SEL_2]
                                                                                     |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                                                     |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                    |        Filter Operator [FIL_109]
+                                                                                    |        Filter Operator [FIL_93]
                                                                                     |           predicate:(((((ws_item_sk is not null and (ws_sales_price BETWEEN 100.0 AND 150.0 or ws_sales_price BETWEEN 50.0 AND 100.0 or ws_sales_price BETWEEN 150.0 AND 200.0)) and ws_order_number is not null) and (ws_net_profit BETWEEN 100 AND 200 or ws_net_profit BETWEEN 150 AND 300 or ws_net_profit BETWEEN 50 AND 250)) and ws_web_page_sk is not null) and ws_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:web_sales
                                                                                     |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                     |<-Map 11 [SIMPLE_EDGE]
-                                                                                       Reduce Output Operator [RS_15]
+                                                                                       Reduce Output Operator [RS_13]
                                                                                           key expressions:_col0 (type: int), _col5 (type: int)
                                                                                           Map-reduce partition columns:_col0 (type: int), _col5 (type: int)
                                                                                           sort order:++
@@ -266,7 +266,7 @@ Stage-0
                                                                                           Select Operator [SEL_5]
                                                                                              outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                             Filter Operator [FIL_110]
+                                                                                             Filter Operator [FIL_94]
                                                                                                 predicate:(((((wr_order_number is not null and wr_item_sk is not null) and wr_refunded_cdemo_sk is not null) and wr_returning_cdemo_sk is not null) and wr_refunded_addr_sk is not null) and wr_reason_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/query87.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query87.q.out b/ql/src/test/results/clientpositive/perf/query87.q.out
index e4762b2..a336189 100644
--- a/ql/src/test/results/clientpositive/perf/query87.q.out
+++ b/ql/src/test/results/clientpositive/perf/query87.q.out
@@ -23,256 +23,256 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_86]
+         File Output Operator [FS_74]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [GBY_84]
+            Group By Operator [GBY_72]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_83]
+               Reduce Output Operator [RS_71]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_82]
+                  Group By Operator [GBY_70]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_81]
+                     Select Operator [SEL_69]
                         Statistics:Num rows: 24200000 Data size: 20812489029 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_108]
+                        Filter Operator [FIL_68]
                            predicate:_col6 is null (type: boolean)
                            Statistics:Num rows: 24200000 Data size: 20812489029 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_126]
+                           Merge Join Operator [MERGEJOIN_112]
                            |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |  keys:{"0":"_col0 (type: string), _col1 (type: string), _col2 (type: string)","1":"_col0 (type: string), _col1 (type: string), _col2 (type: string)"}
                            |  outputColumnNames:["_col6"]
                            |  Statistics:Num rows: 48400001 Data size: 41624978920 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 19 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_78]
+                           |  Reduce Output Operator [RS_66]
                            |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |     sort order:+++
                            |     Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                           |     Select Operator [SEL_76]
+                           |     Select Operator [SEL_64]
                            |        outputColumnNames:["_col0","_col1","_col2"]
                            |        Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                           |        Group By Operator [GBY_75]
+                           |        Group By Operator [GBY_63]
                            |        |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                            |        |  outputColumnNames:["_col0","_col1","_col2"]
                            |        |  Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 18 [SIMPLE_EDGE]
-                           |           Reduce Output Operator [RS_74]
+                           |           Reduce Output Operator [RS_62]
                            |              key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |              Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                            |              sort order:+++
                            |              Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                           |              Group By Operator [GBY_73]
+                           |              Group By Operator [GBY_61]
                            |                 keys:_col3 (type: string), _col6 (type: string), _col7 (type: string)
                            |                 outputColumnNames:["_col0","_col1","_col2"]
                            |                 Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_124]
+                           |                 Merge Join Operator [MERGEJOIN_110]
                            |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |                 |  outputColumnNames:["_col3","_col6","_col7"]
                            |                 |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Map 21 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_70]
+                           |                 |  Reduce Output Operator [RS_58]
                            |                 |     key expressions:_col0 (type: int)
                            |                 |     Map-reduce partition columns:_col0 (type: int)
                            |                 |     sort order:+
                            |                 |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                            |                 |     value expressions:_col1 (type: string), _col2 (type: string)
-                           |                 |     Select Operator [SEL_61]
+                           |                 |     Select Operator [SEL_53]
                            |                 |        outputColumnNames:["_col0","_col1","_col2"]
                            |                 |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                           |                 |        Filter Operator [FIL_118]
+                           |                 |        Filter Operator [FIL_104]
                            |                 |           predicate:c_customer_sk is not null (type: boolean)
                            |                 |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                           |                 |           TableScan [TS_59]
+                           |                 |           TableScan [TS_51]
                            |                 |              alias:customer
                            |                 |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Reducer 17 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_68]
+                           |                    Reduce Output Operator [RS_57]
                            |                       key expressions:_col1 (type: int)
                            |                       Map-reduce partition columns:_col1 (type: int)
                            |                       sort order:+
                            |                       Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                       value expressions:_col3 (type: string)
-                           |                       Merge Join Operator [MERGEJOIN_123]
+                           |                       Merge Join Operator [MERGEJOIN_109]
                            |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                       |  outputColumnNames:["_col1","_col3"]
                            |                       |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                       |<-Map 16 [SIMPLE_EDGE]
-                           |                       |  Reduce Output Operator [RS_63]
+                           |                       |  Reduce Output Operator [RS_54]
                            |                       |     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)
-                           |                       |     Select Operator [SEL_55]
+                           |                       |     Select Operator [SEL_47]
                            |                       |        outputColumnNames:["_col0","_col1"]
                            |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                       |        Filter Operator [FIL_116]
+                           |                       |        Filter Operator [FIL_102]
                            |                       |           predicate:(ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean)
                            |                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                       |           TableScan [TS_53]
+                           |                       |           TableScan [TS_45]
                            |                       |              alias:web_sales
                            |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                       |<-Map 20 [SIMPLE_EDGE]
-                           |                          Reduce Output Operator [RS_65]
+                           |                          Reduce Output Operator [RS_55]
                            |                             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
                            |                             value expressions:_col1 (type: string)
-                           |                             Select Operator [SEL_58]
+                           |                             Select Operator [SEL_50]
                            |                                outputColumnNames:["_col0","_col1"]
                            |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                Filter Operator [FIL_117]
+                           |                                Filter Operator [FIL_103]
                            |                                   predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                            |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                                   TableScan [TS_56]
+                           |                                   TableScan [TS_48]
                            |                                      alias:date_dim
                            |                                      Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 5 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_77]
+                              Reduce Output Operator [RS_65]
                                  key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                  Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                  sort order:+++
                                  Statistics:Num rows: 24200000 Data size: 20812489029 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_52]
+                                 Select Operator [SEL_44]
                                     outputColumnNames:["_col0","_col1","_col2"]
                                     Statistics:Num rows: 24200000 Data size: 20812489029 Basic stats: COMPLETE Column stats: NONE
-                                    Filter Operator [FIL_109]
+                                    Filter Operator [FIL_43]
                                        predicate:_col3 is null (type: boolean)
                                        Statistics:Num rows: 24200000 Data size: 20812489029 Basic stats: COMPLETE Column stats: NONE
-                                       Merge Join Operator [MERGEJOIN_125]
+                                       Merge Join Operator [MERGEJOIN_111]
                                        |  condition map:[{"":"Left Outer Join0 to 1"}]
                                        |  keys:{"0":"_col0 (type: string), _col1 (type: string), _col2 (type: string)","1":"_col0 (type: string), _col1 (type: string), _col2 (type: string)"}
                                        |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                        |  Statistics:Num rows: 48400001 Data size: 41624978920 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 13 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_49]
+                                       |  Reduce Output Operator [RS_41]
                                        |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                        |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                        |     sort order:+++
                                        |     Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                                       |     Select Operator [SEL_47]
+                                       |     Select Operator [SEL_39]
                                        |        outputColumnNames:["_col0","_col1","_col2"]
                                        |        Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                                       |        Group By Operator [GBY_46]
+                                       |        Group By Operator [GBY_38]
                                        |        |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                                        |        |  outputColumnNames:["_col0","_col1","_col2"]
                                        |        |  Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
                                        |        |<-Reducer 12 [SIMPLE_EDGE]
-                                       |           Reduce Output Operator [RS_45]
+                                       |           Reduce Output Operator [RS_37]
                                        |              key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                        |              Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                        |              sort order:+++
                                        |              Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                       |              Group By Operator [GBY_44]
+                                       |              Group By Operator [GBY_36]
                                        |                 keys:_col3 (type: string), _col6 (type: string), _col7 (type: string)
                                        |                 outputColumnNames:["_col0","_col1","_col2"]
                                        |                 Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                       |                 Merge Join Operator [MERGEJOIN_122]
+                                       |                 Merge Join Operator [MERGEJOIN_108]
                                        |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                        |                 |  outputColumnNames:["_col3","_col6","_col7"]
                                        |                 |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                        |                 |<-Map 15 [SIMPLE_EDGE]
-                                       |                 |  Reduce Output Operator [RS_41]
+                                       |                 |  Reduce Output Operator [RS_33]
                                        |                 |     key expressions:_col0 (type: int)
                                        |                 |     Map-reduce partition columns:_col0 (type: int)
                                        |                 |     sort order:+
                                        |                 |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                        |                 |     value expressions:_col1 (type: string), _col2 (type: string)
-                                       |                 |     Select Operator [SEL_32]
+                                       |                 |     Select Operator [SEL_28]
                                        |                 |        outputColumnNames:["_col0","_col1","_col2"]
                                        |                 |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                       |                 |        Filter Operator [FIL_115]
+                                       |                 |        Filter Operator [FIL_101]
                                        |                 |           predicate:c_customer_sk is not null (type: boolean)
                                        |                 |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                       |                 |           TableScan [TS_30]
+                                       |                 |           TableScan [TS_26]
                                        |                 |              alias:customer
                                        |                 |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                        |                 |<-Reducer 11 [SIMPLE_EDGE]
-                                       |                    Reduce Output Operator [RS_39]
+                                       |                    Reduce Output Operator [RS_32]
                                        |                       key expressions:_col1 (type: int)
                                        |                       Map-reduce partition columns:_col1 (type: int)
                                        |                       sort order:+
                                        |                       Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                        |                       value expressions:_col3 (type: string)
-                                       |                       Merge Join Operator [MERGEJOIN_121]
+                                       |                       Merge Join Operator [MERGEJOIN_107]
                                        |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |                       |  outputColumnNames:["_col1","_col3"]
                                        |                       |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                        |                       |<-Map 10 [SIMPLE_EDGE]
-                                       |                       |  Reduce Output Operator [RS_34]
+                                       |                       |  Reduce Output Operator [RS_29]
                                        |                       |     key expressions:_col0 (type: int)
                                        |                       |     Map-reduce partition columns:_col0 (type: int)
                                        |                       |     sort order:+
                                        |                       |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                       |     value expressions:_col1 (type: int)
-                                       |                       |     Select Operator [SEL_26]
+                                       |                       |     Select Operator [SEL_22]
                                        |                       |        outputColumnNames:["_col0","_col1"]
                                        |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                       |        Filter Operator [FIL_113]
+                                       |                       |        Filter Operator [FIL_99]
                                        |                       |           predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean)
                                        |                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |                       |           TableScan [TS_24]
+                                       |                       |           TableScan [TS_20]
                                        |                       |              alias:catalog_sales
                                        |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |                       |<-Map 14 [SIMPLE_EDGE]
-                                       |                          Reduce Output Operator [RS_36]
+                                       |                          Reduce Output Operator [RS_30]
                                        |                             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
                                        |                             value expressions:_col1 (type: string)
-                                       |                             Select Operator [SEL_29]
+                                       |                             Select Operator [SEL_25]
                                        |                                outputColumnNames:["_col0","_col1"]
                                        |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                       |                                Filter Operator [FIL_114]
+                                       |                                Filter Operator [FIL_100]
                                        |                                   predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                        |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                       |                                   TableScan [TS_27]
+                                       |                                   TableScan [TS_23]
                                        |                                      alias:date_dim
                                        |                                      Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 4 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_48]
+                                          Reduce Output Operator [RS_40]
                                              key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                              Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                              sort order:+++
                                              Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_23]
+                                             Select Operator [SEL_19]
                                                 outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
-                                                Group By Operator [GBY_22]
+                                                Group By Operator [GBY_18]
                                                 |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                                                 |  outputColumnNames:["_col0","_col1","_col2"]
                                                 |  Statistics:Num rows: 44000000 Data size: 37840889108 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_21]
+                                                   Reduce Output Operator [RS_17]
                                                       key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                                       Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                                       sort order:+++
                                                       Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                                      Group By Operator [GBY_20]
+                                                      Group By Operator [GBY_16]
                                                          keys:_col3 (type: string), _col6 (type: string), _col7 (type: string)
                                                          outputColumnNames:["_col0","_col1","_col2"]
                                                          Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                                                         Merge Join Operator [MERGEJOIN_120]
+                                                         Merge Join Operator [MERGEJOIN_106]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col3","_col6","_col7"]
                                                          |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 9 [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:+
@@ -281,26 +281,26 @@ Stage-0
                                                          |     Select Operator [SEL_8]
                                                          |        outputColumnNames:["_col0","_col1","_col2"]
                                                          |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_112]
+                                                         |        Filter Operator [FIL_98]
                                                          |           predicate:c_customer_sk is not null (type: boolean)
                                                          |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                          |           TableScan [TS_6]
                                                          |              alias:customer
                                                          |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 2 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_15]
+                                                            Reduce Output Operator [RS_12]
                                                                key expressions:_col1 (type: int)
                                                                Map-reduce partition columns:_col1 (type: int)
                                                                sort order:+
                                                                Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col3 (type: string)
-                                                               Merge Join Operator [MERGEJOIN_119]
+                                                               Merge Join Operator [MERGEJOIN_105]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col3"]
                                                                |  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:+
@@ -309,14 +309,14 @@ Stage-0
                                                                |     Select Operator [SEL_2]
                                                                |        outputColumnNames:["_col0","_col1"]
                                                                |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                               |        Filter Operator [FIL_110]
+                                                               |        Filter Operator [FIL_96]
                                                                |           predicate:(ss_sold_date_sk is not null and ss_customer_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_12]
+                                                                  Reduce Output Operator [RS_10]
                                                                      key expressions:_col0 (type: int)
                                                                      Map-reduce partition columns:_col0 (type: int)
                                                                      sort order:+
@@ -325,7 +325,7 @@ Stage-0
                                                                      Select Operator [SEL_5]
                                                                         outputColumnNames:["_col0","_col1"]
                                                                         Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                                        Filter Operator [FIL_111]
+                                                                        Filter Operator [FIL_97]
                                                                            predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                                            Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                            TableScan [TS_3]


[02/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 33d9457..e2db163 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -719,14 +719,14 @@ Stage-0
       limit:-1
       Stage-1
          Map 2
-         File Output Operator [FS_12]
+         File Output Operator [FS_10]
             compressed:false
             Statistics:Num rows: 550 Data size: 5843 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"}
-            Select Operator [SEL_11]
+            Select Operator [SEL_9]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-               Map Join Operator [MAPJOIN_17]
+               Map Join Operator [MAPJOIN_15]
                |  BucketMapJoin:true
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  HybridGraceHashJoin:true
@@ -734,7 +734,7 @@ Stage-0
                |  outputColumnNames:["_col0","_col1","_col3"]
                |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [CUSTOM_EDGE]
-               |  Reduce Output Operator [RS_7]
+               |  Reduce Output Operator [RS_6]
                |     key expressions:_col0 (type: int)
                |     Map-reduce partition columns:_col0 (type: int)
                |     sort order:+
@@ -743,7 +743,7 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
-               |        Filter Operator [FIL_15]
+               |        Filter Operator [FIL_13]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                |           TableScan [TS_0]
@@ -752,7 +752,7 @@ Stage-0
                |<-Select Operator [SEL_5]
                      outputColumnNames:["_col0","_col1"]
                      Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                     Filter Operator [FIL_16]
+                     Filter Operator [FIL_14]
                         predicate:key is not null (type: boolean)
                         Statistics:Num rows: 500 Data size: 5312 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/tez/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
index 3c7b406..012c28e 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
@@ -139,7 +139,6 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: decimal(6,2))
                         Statistics: Num rows: 1049 Data size: 117488 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: decimal(4,0))
         Reducer 2 
             Reduce Operator Tree:
               Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
index 485e1c1..63b9462 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
@@ -490,7 +490,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/tez/mergejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mergejoin.q.out b/ql/src/test/results/clientpositive/tez/mergejoin.q.out
index 15c204d..4b2d963 100644
--- a/ql/src/test/results/clientpositive/tez/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mergejoin.q.out
@@ -2711,7 +2711,7 @@ NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
-Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: select * from
 (select * from tab where tab.key = 0)a
 join

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/skewjoin.q.out b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
index 70d2418..fc084cc 100644
--- a/ql/src/test/results/clientpositive/tez/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
@@ -705,7 +705,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and UDFToDouble(substring(value, 5)) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -722,16 +722,16 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and (UDFToDouble(substring(value, 5)) + 1.0) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: string)
         Reducer 2 
@@ -741,7 +741,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: string), UDFToDouble(substring(_col1, 5)) (type: double)
-                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                 outputColumnNames: _col2, _col3
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
@@ -837,7 +837,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -854,7 +854,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
index 66b48d4..5121a14 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string), key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_in.q.out b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
index ff75000..a4887e4 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
@@ -149,7 +149,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -166,7 +166,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -282,15 +282,12 @@ STAGE PLANS:
                       expressions: p_name (type: string), p_size (type: int), UDFToDouble(p_size) (type: double)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col2 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col2 (type: double)
+                        sort order: +
+                        Map-reduce partition columns: _col2 (type: double)
                         Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col2 (type: double)
-                          sort order: +
-                          Map-reduce partition columns: _col2 (type: double)
-                          Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col0 (type: string), _col1 (type: int)
+                        value expressions: _col0 (type: string), _col1 (type: int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -632,7 +629,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -649,7 +646,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
index c9e712d..322462b 100644
--- a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -62,7 +62,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -79,7 +79,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -230,7 +230,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -248,7 +248,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -265,7 +265,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -414,7 +414,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -432,7 +432,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -449,7 +449,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
index e71a4ef..d45ff04 100644
--- a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -62,7 +62,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -79,7 +79,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -230,7 +230,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -249,7 +249,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -266,7 +266,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -416,7 +416,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -435,7 +435,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -452,7 +452,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
index 9b62353..51c4ac8 100644
--- a/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
@@ -64,24 +64,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
@@ -89,7 +89,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:key is not null (type: boolean)
                      |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -98,7 +98,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:key is not null (type: boolean)
                               Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -153,40 +153,40 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3 vectorized
-         File Output Operator [FS_21]
+         File Output Operator [FS_19]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_31]
+            Group By Operator [OP_29]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 2 [SIMPLE_EDGE] vectorized
-               Reduce Output Operator [RS_18]
+               Reduce Output Operator [RS_16]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [OP_30]
+                  Group By Operator [OP_28]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [OP_29]
+                     Select Operator [OP_27]
                         Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [OP_28]
+                        Group By Operator [OP_26]
                         |  keys:KEY._col0 (type: int)
                         |  outputColumnNames:["_col0"]
                         |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                         |<-Map 1 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_13]
+                           Reduce Output Operator [RS_11]
                               key expressions:_col0 (type: int)
                               Map-reduce partition columns:_col0 (type: int)
                               sort order:+
                               Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                              Group By Operator [GBY_12]
+                              Group By Operator [GBY_10]
                                  keys:_col0 (type: int)
                                  outputColumnNames:["_col0"]
                                  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_26]
+                                 Merge Join Operator [MERGEJOIN_24]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0"]
@@ -195,7 +195,7 @@ Stage-0
                                  |<-Select Operator [SEL_5]
                                  |     outputColumnNames:["_col0"]
                                  |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                 |     Filter Operator [FIL_25]
+                                 |     Filter Operator [FIL_23]
                                  |        predicate:key is not null (type: boolean)
                                  |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                                  |        TableScan [TS_3]
@@ -204,7 +204,7 @@ Stage-0
                                  |<-Select Operator [SEL_2]
                                        outputColumnNames:["_col0"]
                                        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                       Filter Operator [FIL_24]
+                                       Filter Operator [FIL_22]
                                           predicate:key is not null (type: boolean)
                                           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                                           TableScan [TS_0]
@@ -286,43 +286,43 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3
-         File Output Operator [FS_38]
+         File Output Operator [FS_32]
             compressed:false
             Statistics:Num rows: 5 Data size: 511 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"}
-            Select Operator [SEL_37]
+            Select Operator [SEL_31]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 5 Data size: 511 Basic stats: COMPLETE Column stats: NONE
-               Merge Join Operator [MERGEJOIN_55]
+               Merge Join Operator [MERGEJOIN_49]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col3"]
                |  Statistics:Num rows: 5 Data size: 511 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 2 [SIMPLE_EDGE] vectorized
-               |  Reduce Output Operator [RS_57]
+               |  Reduce Output Operator [RS_51]
                |     key expressions:_col0 (type: int)
                |     Map-reduce partition columns:_col0 (type: int)
                |     sort order:+
                |     Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:_col1 (type: bigint)
-               |     Group By Operator [OP_56]
+               |     Group By Operator [OP_50]
                |     |  aggregations:["count(VALUE._col0)"]
                |     |  keys:KEY._col0 (type: int)
                |     |  outputColumnNames:["_col0","_col1"]
                |     |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                |     |<-Map 1 [SIMPLE_EDGE]
-               |        Reduce Output Operator [RS_13]
+               |        Reduce Output Operator [RS_11]
                |           key expressions:_col0 (type: int)
                |           Map-reduce partition columns:_col0 (type: int)
                |           sort order:+
                |           Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                |           value expressions:_col1 (type: bigint)
-               |           Group By Operator [GBY_12]
+               |           Group By Operator [GBY_10]
                |              aggregations:["count()"]
                |              keys:_col0 (type: int)
                |              outputColumnNames:["_col0","_col1"]
                |              Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-               |              Merge Join Operator [MERGEJOIN_51]
+               |              Merge Join Operator [MERGEJOIN_45]
                |              |  condition map:[{"":"Inner Join 0 to 1"}]
                |              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                |              |  outputColumnNames:["_col0"]
@@ -331,7 +331,7 @@ Stage-0
                |              |<-Select Operator [SEL_5]
                |              |     outputColumnNames:["_col0"]
                |              |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-               |              |     Filter Operator [FIL_48]
+               |              |     Filter Operator [FIL_42]
                |              |        predicate:key is not null (type: boolean)
                |              |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |              |        TableScan [TS_3]
@@ -340,58 +340,58 @@ Stage-0
                |              |<-Select Operator [SEL_2]
                |                    outputColumnNames:["_col0"]
                |                    Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-               |                    Filter Operator [FIL_47]
+               |                    Filter Operator [FIL_41]
                |                       predicate:key is not null (type: boolean)
                |                       Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |                       TableScan [TS_0]
                |                          alias:a
                |                          Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE] vectorized
-                  Reduce Output Operator [RS_59]
+                  Reduce Output Operator [RS_53]
                      key expressions:_col0 (type: int)
                      Map-reduce partition columns:_col0 (type: int)
                      sort order:+
                      Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: bigint)
-                     Group By Operator [OP_58]
+                     Group By Operator [OP_52]
                      |  aggregations:["count(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int)
                      |  outputColumnNames:["_col0","_col1"]
                      |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_29]
+                        Reduce Output Operator [RS_25]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: bigint)
-                           Group By Operator [GBY_28]
+                           Group By Operator [GBY_24]
                               aggregations:["count()"]
                               keys:_col0 (type: int)
                               outputColumnNames:["_col0","_col1"]
                               Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_53]
+                              Merge Join Operator [MERGEJOIN_47]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col0"]
                               |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                               |  
-                              |<-Select Operator [SEL_21]
+                              |<-Select Operator [SEL_19]
                               |     outputColumnNames:["_col0"]
                               |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |     Filter Operator [FIL_50]
+                              |     Filter Operator [FIL_44]
                               |        predicate:key is not null (type: boolean)
                               |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |        TableScan [TS_19]
+                              |        TableScan [TS_17]
                               |           alias:b
                               |           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |<-Select Operator [SEL_18]
+                              |<-Select Operator [SEL_16]
                                     outputColumnNames:["_col0"]
                                     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                    Filter Operator [FIL_49]
+                                    Filter Operator [FIL_43]
                                        predicate:key is not null (type: boolean)
                                        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                       TableScan [TS_16]
+                                       TableScan [TS_14]
                                           alias:a
                                           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
 
@@ -467,24 +467,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -492,7 +492,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -501,7 +501,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -565,24 +565,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -590,8 +590,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:b
@@ -599,8 +599,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a
@@ -687,24 +687,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -712,8 +712,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:a
@@ -721,8 +721,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a
@@ -799,24 +799,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -824,7 +824,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 8) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -833,7 +833,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 8) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -888,63 +888,57 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_32]
+            Group By Operator [OP_28]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 2 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_23]
+                     Merge Join Operator [MERGEJOIN_21]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 1 [SIMPLE_EDGE] vectorized
-                     |  Reduce Output Operator [RS_27]
+                     |  Reduce Output Operator [RS_24]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_26]
-                     |        predicate:_col0 is not null (type: boolean)
+                     |     Select Operator [OP_23]
+                     |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |        Select Operator [OP_25]
-                     |           outputColumnNames:["_col0"]
+                     |        Filter Operator [FIL_22]
+                     |           predicate:(key + 1) is not null (type: boolean)
                      |           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |           Filter Operator [FIL_24]
-                     |              predicate:(key + 1) is not null (type: boolean)
+                     |           TableScan [TS_0]
+                     |              alias:a
                      |              Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |              TableScan [TS_0]
-                     |                 alias:a
-                     |                 Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 4 [SIMPLE_EDGE] vectorized
-                        Reduce Output Operator [RS_31]
+                        Reduce Output Operator [RS_27]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_30]
-                              predicate:_col0 is not null (type: boolean)
+                           Select Operator [OP_26]
+                              outputColumnNames:["_col0"]
                               Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [OP_29]
-                                 outputColumnNames:["_col0"]
+                              Filter Operator [FIL_25]
+                                 predicate:(key + 1) is not null (type: boolean)
                                  Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                 Filter Operator [FIL_28]
-                                    predicate:(key + 1) is not null (type: boolean)
+                                 TableScan [TS_3]
+                                    alias:a
                                     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                    TableScan [TS_3]
-                                       alias:a
-                                       Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: select count(*) from 
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 
@@ -989,24 +983,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -1014,7 +1008,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -1023,7 +1017,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -1079,24 +1073,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_21]
+         File Output Operator [FS_18]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_34]
+            Group By Operator [OP_31]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_18]
+               Reduce Output Operator [RS_15]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_17]
+                  Group By Operator [GBY_14]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_31]
+                     Merge Join Operator [MERGEJOIN_28]
                      |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                      |  Statistics:Num rows: 6 Data size: 613 Basic stats: COMPLETE Column stats: NONE
@@ -1104,7 +1098,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_29]
+                     |     Filter Operator [FIL_26]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -1114,7 +1108,7 @@ Stage-0
                      |<-Select Operator [SEL_8]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_30]
+                     |     Filter Operator [FIL_27]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_6]
@@ -1123,7 +1117,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_28]
+                           Filter Operator [FIL_25]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -1195,24 +1189,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -1220,8 +1214,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:b
@@ -1229,8 +1223,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out b/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
index 972d694..7fe20a6 100644
--- a/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
@@ -60,7 +60,7 @@ POSTHOOK: Input: default@tint_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@TINT
 tint_txt.rnum	tint_txt.cint
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: -- We DO NOT expect the following to vectorized because the BETWEEN range expressions
 -- are not constants.  We currently do not support the range expressions being columns.
 explain
@@ -137,7 +137,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: select tint.rnum, tsint.rnum from tint , tsint where tint.cint between tsint.csint and tsint.csint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tint

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
index 2392fa2..c13ac6c 100644
--- a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
@@ -193,7 +193,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(*))
 FROM hundredorc t1 JOIN hundredorc t2 ON t2.bin = t2.bin
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
index 6e266af..6a74408 100644
--- a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
@@ -257,7 +257,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col1 (type: char(20))
                         Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: int), _col1 (type: char(10))
+                        value expressions: _col0 (type: int)
             Execution mode: vectorized
         Map 2 
             Map Operator Tree:
@@ -352,7 +352,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (c2 is not null and UDFToString(c2) is not null) (type: boolean)
+                    predicate: c2 is not null (type: boolean)
                     Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: c1 (type: int), c2 (type: char(10))

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
index ec8d0b0..0c76602 100644
--- a/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
@@ -137,7 +137,6 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: decimal(6,2))
                         Statistics: Num rows: 1049 Data size: 117488 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: decimal(4,0))
             Execution mode: vectorized
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
index cc9103d..42ce499 100644
--- a/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
@@ -177,31 +177,28 @@ STAGE PLANS:
                       expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col1 is not null (type: boolean)
-                        Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col1 (type: interval_day_time), _col0 (type: string)
-                            1 _col1 (type: interval_day_time), _col0 (type: string)
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col1 (type: interval_day_time), _col0 (type: string)
+                          1 _col1 (type: interval_day_time), _col0 (type: string)
+                        outputColumnNames: _col0, _col1, _col2
+                        input vertices:
+                          1 Map 2
+                        Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
+                        HybridGraceHashJoin: true
+                        Select Operator
+                          expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
                           outputColumnNames: _col0, _col1, _col2
-                          input vertices:
-                            1 Map 2
                           Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
-                          Select Operator
-                            expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
-                            outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
                             Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                            File Output Operator
-                              compressed: false
-                              Statistics: Num rows: 1100 Data size: 506290 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
+                            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
             Execution mode: vectorized
         Map 2 
             Map Operator Tree:
@@ -215,14 +212,11 @@ STAGE PLANS:
                       expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col1 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: interval_day_time), _col0 (type: string)
+                        sort order: ++
+                        Map-reduce partition columns: _col1 (type: interval_day_time), _col0 (type: string)
                         Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col1 (type: interval_day_time), _col0 (type: string)
-                          sort order: ++
-                          Map-reduce partition columns: _col1 (type: interval_day_time), _col0 (type: string)
-                          Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out b/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
index fb73843..cc8122a 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out b/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
index 2d84f42..3c9ce0a 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[15][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
index 0b087be..c7ce2b7 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
@@ -111,46 +111,46 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_12]
+         File Output Operator [FS_10]
             compressed:false
             Statistics:Num rows: 2 Data size: 224 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"}
-            Merge Join Operator [MERGEJOIN_23]
+            Merge Join Operator [MERGEJOIN_21]
             |  condition map:[{"":"Inner Join 0 to 1"}]
             |  keys:{"0":"_col2 (type: char(50))","1":"_col2 (type: char(50))"}
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |  Statistics:Num rows: 2 Data size: 224 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE] vectorized
-            |  Reduce Output Operator [RS_25]
+            |  Reduce Output Operator [RS_23]
             |     key expressions:_col2 (type: char(50))
             |     Map-reduce partition columns:_col2 (type: char(50))
             |     sort order:+
             |     Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
             |     value expressions:_col0 (type: string), _col1 (type: int)
-            |     Select Operator [OP_24]
+            |     Select Operator [OP_22]
             |        outputColumnNames:["_col0","_col1","_col2"]
             |        Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
             |        TableScan [TS_0]
             |           alias:c1
             |           Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |  Dynamic Partitioning Event Operator [EVENT_22]
+            |  Dynamic Partitioning Event Operator [EVENT_20]
             |     Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |     Group By Operator [OP_27]
+            |     Group By Operator [OP_25]
             |        keys:_col0 (type: char(50))
             |        outputColumnNames:["_col0"]
             |        Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |        Select Operator [OP_26]
+            |        Select Operator [OP_24]
             |           outputColumnNames:["_col0"]
             |           Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |            Please refer to the previous Select Operator [OP_24]
+            |            Please refer to the previous Select Operator [OP_22]
             |<-Map 3 [SIMPLE_EDGE] vectorized
-               Reduce Output Operator [RS_29]
+               Reduce Output Operator [RS_27]
                   key expressions:_col2 (type: char(50))
                   Map-reduce partition columns:_col2 (type: char(50))
                   sort order:+
                   Statistics:Num rows: 2 Data size: 203 Basic stats: COMPLETE Column stats: NONE
-                  value expressions:_col0 (type: string), _col1 (type: int), _col2 (type: char(5))
-                  Select Operator [OP_28]
+                  value expressions:_col0 (type: string), _col1 (type: int)
+                  Select Operator [OP_26]
                      outputColumnNames:["_col0","_col1","_col2"]
                      Statistics:Num rows: 2 Data size: 203 Basic stats: COMPLETE Column stats: NONE
                      TableScan [TS_3]


[10/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query89.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query89.q.out b/ql/src/test/results/clientpositive/perf/query89.q.out
index 4cab575..ee9eabc 100644
--- a/ql/src/test/results/clientpositive/perf/query89.q.out
+++ b/ql/src/test/results/clientpositive/perf/query89.q.out
@@ -67,74 +67,74 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_42]
+         File Output Operator [FS_36]
             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_41]
+            Limit [LIM_35]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_40]
+               Select Operator [SEL_34]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                |  Statistics:Num rows: 51243 Data size: 73599199 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_39]
+                  Reduce Output Operator [RS_33]
                      key expressions:(_col6 - _col7) (type: decimal(22,6)), _col3 (type: string)
                      sort order:++
                      Statistics:Num rows: 51243 Data size: 73599199 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: decimal(17,2)), _col7 (type: decimal(21,6))
-                     Select Operator [SEL_36]
+                     Select Operator [SEL_30]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                         Statistics:Num rows: 51243 Data size: 73599199 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_52]
+                        Filter Operator [FIL_46]
                            predicate:(CASE WHEN ((avg_window_0 <> 0)) THEN ((abs((_col6 - avg_window_0)) / avg_window_0)) ELSE (null) END > 0.1) (type: boolean)
                            Statistics:Num rows: 51243 Data size: 73599199 Basic stats: COMPLETE Column stats: NONE
-                           Select Operator [SEL_35]
+                           Select Operator [SEL_29]
                               outputColumnNames:["avg_window_0","_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                               Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
-                              PTF Operator [PTF_34]
+                              PTF Operator [PTF_28]
                                  Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col0, _col2, _col3, _col4","partition by:":"_col0, _col2, _col3, _col4"}]
                                  Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_33]
+                                 Select Operator [SEL_27]
                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                  |  Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 5 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_32]
+                                    Reduce Output Operator [RS_26]
                                        key expressions:_col0 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                                        Map-reduce partition columns:_col0 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                                        sort order:++++
                                        Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col1 (type: string), _col5 (type: int), _col6 (type: decimal(17,2))
-                                       Select Operator [SEL_31]
+                                       Select Operator [SEL_25]
                                           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                           Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
-                                          Group By Operator [GBY_30]
+                                          Group By Operator [GBY_24]
                                           |  aggregations:["sum(VALUE._col0)"]
                                           |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string), KEY._col3 (type: int), KEY._col4 (type: string), KEY._col5 (type: string)
                                           |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                           |  Statistics:Num rows: 153730 Data size: 220799036 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 4 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_29]
+                                             Reduce Output Operator [RS_23]
                                                 key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: int), _col4 (type: string), _col5 (type: string)
                                                 Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: int), _col4 (type: string), _col5 (type: string)
                                                 sort order:++++++
                                                 Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col6 (type: decimal(17,2))
-                                                Group By Operator [GBY_28]
+                                                Group By Operator [GBY_22]
                                                    aggregations:["sum(_col7)"]
                                                    keys:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col10 (type: int), _col12 (type: string), _col13 (type: string)
                                                    outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                    Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                                                   Select Operator [SEL_27]
+                                                   Select Operator [SEL_21]
                                                       outputColumnNames:["_col1","_col2","_col3","_col10","_col12","_col13","_col7"]
                                                       Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                                                      Merge Join Operator [MERGEJOIN_59]
+                                                      Merge Join Operator [MERGEJOIN_53]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col6 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col2","_col3","_col7","_col10","_col12","_col13"]
                                                       |  Statistics:Num rows: 307461 Data size: 441599510 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:+
@@ -143,26 +143,26 @@ Stage-0
                                                       |     Select Operator [SEL_11]
                                                       |        outputColumnNames:["_col0","_col1","_col2"]
                                                       |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_56]
+                                                      |        Filter Operator [FIL_50]
                                                       |           predicate:s_store_sk is not null (type: boolean)
                                                       |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_9]
                                                       |              alias:store
                                                       |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 3 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_23]
+                                                         Reduce Output Operator [RS_18]
                                                             key expressions:_col6 (type: int)
                                                             Map-reduce partition columns:_col6 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: decimal(7,2)), _col10 (type: int)
-                                                            Merge Join Operator [MERGEJOIN_58]
+                                                            Merge Join Operator [MERGEJOIN_52]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col1","_col2","_col3","_col6","_col7","_col10"]
                                                             |  Statistics:Num rows: 279510 Data size: 401454092 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:+
@@ -171,26 +171,26 @@ Stage-0
                                                             |     Select Operator [SEL_8]
                                                             |        outputColumnNames:["_col0","_col2"]
                                                             |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                            |        Filter Operator [FIL_55]
+                                                            |        Filter Operator [FIL_49]
                                                             |           predicate:((d_year) IN (2000) and d_date_sk is not null) (type: boolean)
                                                             |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                             |           TableScan [TS_6]
                                                             |              alias:date_dim
                                                             |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Reducer 2 [SIMPLE_EDGE]
-                                                               Reduce Output Operator [RS_18]
+                                                               Reduce Output Operator [RS_15]
                                                                   key expressions:_col4 (type: int)
                                                                   Map-reduce partition columns:_col4 (type: int)
                                                                   sort order:+
                                                                   Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                                   value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col6 (type: int), _col7 (type: decimal(7,2))
-                                                                  Merge Join Operator [MERGEJOIN_57]
+                                                                  Merge Join Operator [MERGEJOIN_51]
                                                                   |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                   |  keys:{"0":"_col0 (type: int)","1":"_col1 (type: int)"}
                                                                   |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7"]
                                                                   |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Map 1 [SIMPLE_EDGE]
-                                                                  |  Reduce Output Operator [RS_13]
+                                                                  |  Reduce Output Operator [RS_12]
                                                                   |     key expressions:_col0 (type: int)
                                                                   |     Map-reduce partition columns:_col0 (type: int)
                                                                   |     sort order:+
@@ -199,14 +199,14 @@ Stage-0
                                                                   |     Select Operator [SEL_2]
                                                                   |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                   |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                                                  |        Filter Operator [FIL_53]
+                                                                  |        Filter Operator [FIL_47]
                                                                   |           predicate:((((((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and ((i_category) IN ('Home', 'Books', 'Electronics') or (i_category) IN ('Shoes', 'Jewelry', 'Men'))) and ((i_class) IN ('wallpaper', 'parenting', 'musical') or (i_class) IN ('womens', 'birdal', 'pants'))) and i_item_sk is not null) (type: boolean)
                                                                   |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                                                   |           TableScan [TS_0]
                                                                   |              alias:item
                                                                   |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                                                   |<-Map 8 [SIMPLE_EDGE]
-                                                                     Reduce Output Operator [RS_15]
+                                                                     Reduce Output Operator [RS_13]
                                                                         key expressions:_col1 (type: int)
                                                                         Map-reduce partition columns:_col1 (type: int)
                                                                         sort order:+
@@ -215,7 +215,7 @@ Stage-0
                                                                         Select Operator [SEL_5]
                                                                            outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                            Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                           Filter Operator [FIL_54]
+                                                                           Filter Operator [FIL_48]
                                                                               predicate:((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_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query90.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query90.q.out b/ql/src/test/results/clientpositive/perf/query90.q.out
index 2c0f592..d34aaf4 100644
--- a/ql/src/test/results/clientpositive/perf/query90.q.out
+++ b/ql/src/test/results/clientpositive/perf/query90.q.out
@@ -1,4 +1,4 @@
-Warning: Shuffle Join MERGEJOIN[106][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 6' is a cross product
+Warning: Shuffle Join MERGEJOIN[93][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 6' is a cross product
 PREHOOK: query: explain select cast(amc as decimal(15,4))/cast(pmc as decimal(15,4)) am_pm_ratio from ( select count(*) amc from web_sales, household_demographics , time_dim, web_page where ws_sold_time_sk = time_dim.t_time_sk and ws_ship_hdemo_sk = household_demographics.hd_demo_sk and ws_web_page_sk = web_page.wp_web_page_sk and time_dim.t_hour between 6 and 6+1 and household_demographics.hd_dep_count = 8 and web_page.wp_char_count between 5000 and 5200) at, ( select count(*) pmc from web_sales, household_demographics , time_dim, web_page where ws_sold_time_sk = time_dim.t_time_sk and ws_ship_hdemo_sk = household_demographics.hd_demo_sk and ws_web_page_sk = web_page.wp_web_page_sk and time_dim.t_hour between 14 and 14+1 and household_demographics.hd_dep_count = 8 and web_page.wp_char_count between 5000 and 5200) pt order by am_pm_ratio limit 100
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select cast(amc as decimal(15,4))/cast(pmc as decimal(15,4)) am_pm_ratio from ( select count(*) amc from web_sales, household_demographics , time_dim, web_page where ws_sold_time_sk = time_dim.t_time_sk and ws_ship_hdemo_sk = household_demographics.hd_demo_sk and ws_web_page_sk = web_page.wp_web_page_sk and time_dim.t_hour between 6 and 6+1 and household_demographics.hd_dep_count = 8 and web_page.wp_char_count between 5000 and 5200) at, ( select count(*) pmc from web_sales, household_demographics , time_dim, web_page where ws_sold_time_sk = time_dim.t_time_sk and ws_ship_hdemo_sk = household_demographics.hd_demo_sk and ws_web_page_sk = web_page.wp_web_page_sk and time_dim.t_hour between 14 and 14+1 and household_demographics.hd_dep_count = 8 and web_page.wp_char_count between 5000 and 5200) pt order by am_pm_ratio limit 100
@@ -22,159 +22,159 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_72]
+         File Output Operator [FS_60]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_71]
+            Limit [LIM_59]
                Number of rows:100
                Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_70]
+               Select Operator [SEL_58]
                |  outputColumnNames:["_col0"]
                |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_69]
+                  Reduce Output Operator [RS_57]
                      key expressions:_col0 (type: decimal(35,20))
                      sort order:+
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_68]
+                     Select Operator [SEL_56]
                         outputColumnNames:["_col0"]
                         Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_106]
+                        Merge Join Operator [MERGEJOIN_93]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{}
                         |  outputColumnNames:["_col0","_col1"]
                         |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 15 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_66]
+                        |  Reduce Output Operator [RS_54]
                         |     sort order:
                         |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col0 (type: bigint)
-                        |     Group By Operator [GBY_62]
+                        |     Group By Operator [GBY_50]
                         |     |  aggregations:["count(VALUE._col0)"]
                         |     |  outputColumnNames:["_col0"]
                         |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         |     |<-Reducer 14 [SIMPLE_EDGE]
-                        |        Reduce Output Operator [RS_61]
+                        |        Reduce Output Operator [RS_49]
                         |           sort order:
                         |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         |           value expressions:_col0 (type: bigint)
-                        |           Group By Operator [GBY_60]
+                        |           Group By Operator [GBY_48]
                         |              aggregations:["count()"]
                         |              outputColumnNames:["_col0"]
                         |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                        |              Merge Join Operator [MERGEJOIN_105]
+                        |              Merge Join Operator [MERGEJOIN_92]
                         |              |  condition map:[{"":"Inner Join 0 to 1"}]
                         |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                         |              |  Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                         |              |<-Map 18 [SIMPLE_EDGE]
-                        |              |  Reduce Output Operator [RS_57]
+                        |              |  Reduce Output Operator [RS_45]
                         |              |     key expressions:_col0 (type: int)
                         |              |     Map-reduce partition columns:_col0 (type: int)
                         |              |     sort order:+
                         |              |     Statistics:Num rows: 2301 Data size: 1348089 Basic stats: COMPLETE Column stats: NONE
-                        |              |     Select Operator [SEL_43]
+                        |              |     Select Operator [SEL_37]
                         |              |        outputColumnNames:["_col0"]
                         |              |        Statistics:Num rows: 2301 Data size: 1348089 Basic stats: COMPLETE Column stats: NONE
-                        |              |        Filter Operator [FIL_99]
+                        |              |        Filter Operator [FIL_86]
                         |              |           predicate:(wp_char_count BETWEEN 5000 AND 5200 and wp_web_page_sk is not null) (type: boolean)
                         |              |           Statistics:Num rows: 2301 Data size: 1348089 Basic stats: COMPLETE Column stats: NONE
-                        |              |           TableScan [TS_41]
+                        |              |           TableScan [TS_35]
                         |              |              alias:web_page
                         |              |              Statistics:Num rows: 4602 Data size: 2696178 Basic stats: COMPLETE Column stats: NONE
                         |              |<-Reducer 13 [SIMPLE_EDGE]
-                        |                 Reduce Output Operator [RS_55]
+                        |                 Reduce Output Operator [RS_44]
                         |                    key expressions:_col2 (type: int)
                         |                    Map-reduce partition columns:_col2 (type: int)
                         |                    sort order:+
                         |                    Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
-                        |                    Merge Join Operator [MERGEJOIN_104]
+                        |                    Merge Join Operator [MERGEJOIN_91]
                         |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |                    |  outputColumnNames:["_col2"]
                         |                    |  Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Map 17 [SIMPLE_EDGE]
-                        |                    |  Reduce Output Operator [RS_52]
+                        |                    |  Reduce Output Operator [RS_42]
                         |                    |     key expressions:_col0 (type: int)
                         |                    |     Map-reduce partition columns:_col0 (type: int)
                         |                    |     sort order:+
                         |                    |     Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                    |     Select Operator [SEL_40]
+                        |                    |     Select Operator [SEL_34]
                         |                    |        outputColumnNames:["_col0"]
                         |                    |        Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                    |        Filter Operator [FIL_98]
+                        |                    |        Filter Operator [FIL_85]
                         |                    |           predicate:(t_hour BETWEEN 14 AND 15 and t_time_sk is not null) (type: boolean)
                         |                    |           Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           TableScan [TS_38]
+                        |                    |           TableScan [TS_32]
                         |                    |              alias:time_dim
                         |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Reducer 12 [SIMPLE_EDGE]
-                        |                       Reduce Output Operator [RS_50]
+                        |                       Reduce Output Operator [RS_41]
                         |                          key expressions:_col0 (type: int)
                         |                          Map-reduce partition columns:_col0 (type: int)
                         |                          sort order:+
                         |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                         |                          value expressions:_col2 (type: int)
-                        |                          Merge Join Operator [MERGEJOIN_103]
+                        |                          Merge Join Operator [MERGEJOIN_90]
                         |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                         |                          |  outputColumnNames:["_col0","_col2"]
                         |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                         |                          |<-Map 11 [SIMPLE_EDGE]
-                        |                          |  Reduce Output Operator [RS_45]
+                        |                          |  Reduce Output Operator [RS_38]
                         |                          |     key expressions:_col1 (type: int)
                         |                          |     Map-reduce partition columns:_col1 (type: int)
                         |                          |     sort order:+
                         |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-                        |                          |     Select Operator [SEL_34]
+                        |                          |     Select Operator [SEL_28]
                         |                          |        outputColumnNames:["_col0","_col1","_col2"]
                         |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |        Filter Operator [FIL_96]
+                        |                          |        Filter Operator [FIL_83]
                         |                          |           predicate:((ws_ship_hdemo_sk is not null and ws_sold_time_sk is not null) and ws_web_page_sk is not null) (type: boolean)
                         |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |           TableScan [TS_32]
+                        |                          |           TableScan [TS_26]
                         |                          |              alias:web_sales
                         |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                          |<-Map 16 [SIMPLE_EDGE]
-                        |                             Reduce Output Operator [RS_47]
+                        |                             Reduce Output Operator [RS_39]
                         |                                key expressions:_col0 (type: int)
                         |                                Map-reduce partition columns:_col0 (type: int)
                         |                                sort order:+
                         |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                        |                                Select Operator [SEL_37]
+                        |                                Select Operator [SEL_31]
                         |                                   outputColumnNames:["_col0"]
                         |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                        |                                   Filter Operator [FIL_97]
+                        |                                   Filter Operator [FIL_84]
                         |                                      predicate:((hd_dep_count = 8) and hd_demo_sk is not null) (type: boolean)
                         |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                        |                                      TableScan [TS_35]
+                        |                                      TableScan [TS_29]
                         |                                         alias:household_demographics
                         |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_65]
+                           Reduce Output Operator [RS_53]
                               sort order:
                               Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: bigint)
-                              Group By Operator [GBY_30]
+                              Group By Operator [GBY_24]
                               |  aggregations:["count(VALUE._col0)"]
                               |  outputColumnNames:["_col0"]
                               |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 4 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_29]
+                                 Reduce Output Operator [RS_23]
                                     sort order:
                                     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col0 (type: bigint)
-                                    Group By Operator [GBY_28]
+                                    Group By Operator [GBY_22]
                                        aggregations:["count()"]
                                        outputColumnNames:["_col0"]
                                        Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                                       Merge Join Operator [MERGEJOIN_102]
+                                       Merge Join Operator [MERGEJOIN_89]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                        |  Statistics:Num rows: 52272 Data size: 24620112 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:+
@@ -182,25 +182,25 @@ Stage-0
                                        |     Select Operator [SEL_11]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 2301 Data size: 1348089 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_95]
+                                       |        Filter Operator [FIL_82]
                                        |           predicate:(wp_char_count BETWEEN 5000 AND 5200 and wp_web_page_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 2301 Data size: 1348089 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_9]
                                        |              alias:web_page
                                        |              Statistics:Num rows: 4602 Data size: 2696178 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: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_101]
+                                             Merge Join Operator [MERGEJOIN_88]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col2"]
                                              |  Statistics:Num rows: 47520 Data size: 22381920 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:+
@@ -208,26 +208,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_94]
+                                             |        Filter Operator [FIL_81]
                                              |           predicate:(t_time_sk is not null and t_hour BETWEEN 6 AND 7) (type: boolean)
                                              |           Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              alias:time_dim
                                              |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_18]
+                                                Reduce Output Operator [RS_15]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col2 (type: int)
-                                                   Merge Join Operator [MERGEJOIN_100]
+                                                   Merge Join Operator [MERGEJOIN_87]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col2"]
                                                    |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_13]
+                                                   |  Reduce Output Operator [RS_12]
                                                    |     key expressions:_col1 (type: int)
                                                    |     Map-reduce partition columns:_col1 (type: int)
                                                    |     sort order:+
@@ -236,14 +236,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_92]
+                                                   |        Filter Operator [FIL_79]
                                                    |           predicate:((ws_ship_hdemo_sk is not null and ws_sold_time_sk is not null) and ws_web_page_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |           TableScan [TS_0]
                                                    |              alias:web_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:+
@@ -251,7 +251,7 @@ Stage-0
                                                          Select Operator [SEL_5]
                                                             outputColumnNames:["_col0"]
                                                             Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                                            Filter Operator [FIL_93]
+                                                            Filter Operator [FIL_80]
                                                                predicate:((hd_dep_count = 8) and hd_demo_sk is not null) (type: boolean)
                                                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
                                                                TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query91.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query91.q.out b/ql/src/test/results/clientpositive/perf/query91.q.out
index e2326b4..54f58e4 100644
--- a/ql/src/test/results/clientpositive/perf/query91.q.out
+++ b/ql/src/test/results/clientpositive/perf/query91.q.out
@@ -19,49 +19,49 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 9
-         File Output Operator [FS_58]
+         File Output Operator [FS_46]
             compressed:false
             Statistics:Num rows: 58564004 Data size: 50366227250 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"}
-            Select Operator [SEL_57]
+            Select Operator [SEL_45]
             |  outputColumnNames:["_col0","_col1","_col2","_col3"]
             |  Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 8 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_56]
+               Reduce Output Operator [RS_44]
                   key expressions:_col3 (type: decimal(17,2))
                   sort order:-
                   Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
-                  Select Operator [SEL_55]
+                  Select Operator [SEL_43]
                      outputColumnNames:["_col0","_col1","_col2","_col3"]
                      Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_54]
+                     Group By Operator [GBY_42]
                      |  aggregations:["sum(VALUE._col0)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |  Statistics:Num rows: 58564004 Data size: 50366227250 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 7 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_53]
+                        Reduce Output Operator [RS_41]
                            key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                            sort order:+++++
                            Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col5 (type: decimal(17,2))
-                           Group By Operator [GBY_52]
+                           Group By Operator [GBY_40]
                               aggregations:["sum(_col7)"]
                               keys:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col18 (type: string), _col19 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                               Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_51]
+                              Select Operator [SEL_39]
                                  outputColumnNames:["_col1","_col2","_col3","_col18","_col19","_col7"]
                                  Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_98]
+                                 Merge Join Operator [MERGEJOIN_86]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col13 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col1","_col2","_col3","_col7","_col18","_col19"]
                                  |  Statistics:Num rows: 117128008 Data size: 100732454500 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 15 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_49]
+                                 |  Reduce Output Operator [RS_37]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -69,26 +69,26 @@ Stage-0
                                  |     Select Operator [SEL_20]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_92]
+                                 |        Filter Operator [FIL_80]
                                  |           predicate:(hd_demo_sk is not null and (hd_buy_potential like '0-500%')) (type: boolean)
                                  |           Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_18]
                                  |              alias:household_demographics
                                  |              Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 6 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_47]
+                                    Reduce Output Operator [RS_36]
                                        key expressions:_col13 (type: int)
                                        Map-reduce partition columns:_col13 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: decimal(7,2)), _col18 (type: string), _col19 (type: string)
-                                       Merge Join Operator [MERGEJOIN_97]
+                                       Merge Join Operator [MERGEJOIN_85]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col12 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col1","_col2","_col3","_col7","_col13","_col18","_col19"]
                                        |  Statistics:Num rows: 106480005 Data size: 91574956652 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 14 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_44]
+                                       |  Reduce Output Operator [RS_34]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -97,26 +97,26 @@ Stage-0
                                        |     Select Operator [SEL_17]
                                        |        outputColumnNames:["_col0","_col1","_col2"]
                                        |        Statistics:Num rows: 9900 Data size: 3585529 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_91]
+                                       |        Filter Operator [FIL_79]
                                        |           predicate:((((((cd_marital_status = 'M') and (cd_education_status = 'Unknown')) or ((cd_marital_status = 'W') and (cd_education_status = 'Advanced Degree'))) and ((cd_education_status = 'Unknown') or (cd_education_status = 'Advanced Degree'))) and ((cd_marital_status = 'M') or (cd_marital_status = 'W'))) and cd_demo_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 9900 Data size: 3585529 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_15]
                                        |              alias:customer_demographics
                                        |              Statistics:Num rows: 19800 Data size: 7171059 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 5 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_42]
+                                          Reduce Output Operator [RS_33]
                                              key expressions:_col12 (type: int)
                                              Map-reduce partition columns:_col12 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: decimal(7,2)), _col13 (type: int)
-                                             Merge Join Operator [MERGEJOIN_96]
+                                             Merge Join Operator [MERGEJOIN_84]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col14 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col1","_col2","_col3","_col7","_col12","_col13"]
                                              |  Statistics:Num rows: 96800003 Data size: 83249958789 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 13 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_39]
+                                             |  Reduce Output Operator [RS_31]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -124,26 +124,26 @@ Stage-0
                                              |     Select Operator [SEL_14]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_90]
+                                             |        Filter Operator [FIL_78]
                                              |           predicate:((ca_gmt_offset = -7) and ca_address_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_12]
                                              |              alias:customer_address
                                              |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 4 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_37]
+                                                Reduce Output Operator [RS_30]
                                                    key expressions:_col14 (type: int)
                                                    Map-reduce partition columns:_col14 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: decimal(7,2)), _col12 (type: int), _col13 (type: int)
-                                                   Merge Join Operator [MERGEJOIN_95]
+                                                   Merge Join Operator [MERGEJOIN_83]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col5 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col1","_col2","_col3","_col7","_col12","_col13","_col14"]
                                                    |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 12 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_34]
+                                                   |  Reduce Output Operator [RS_28]
                                                    |     key expressions:_col0 (type: int)
                                                    |     Map-reduce partition columns:_col0 (type: int)
                                                    |     sort order:+
@@ -152,26 +152,26 @@ Stage-0
                                                    |     Select Operator [SEL_11]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                    |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator [FIL_89]
+                                                   |        Filter Operator [FIL_77]
                                                    |           predicate:(((c_customer_sk is not null and c_current_addr_sk is not null) and c_current_cdemo_sk is not null) and c_current_hdemo_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                    |           TableScan [TS_9]
                                                    |              alias:customer
                                                    |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Reducer 3 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_32]
+                                                      Reduce Output Operator [RS_27]
                                                          key expressions:_col5 (type: int)
                                                          Map-reduce partition columns:_col5 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: decimal(7,2))
-                                                         Merge Join Operator [MERGEJOIN_94]
+                                                         Merge Join Operator [MERGEJOIN_82]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col1","_col2","_col3","_col5","_col7"]
                                                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 11 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_29]
+                                                         |  Reduce Output Operator [RS_25]
                                                          |     key expressions:_col0 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int)
                                                          |     sort order:+
@@ -179,26 +179,26 @@ Stage-0
                                                          |     Select Operator [SEL_8]
                                                          |        outputColumnNames:["_col0"]
                                                          |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_88]
+                                                         |        Filter Operator [FIL_76]
                                                          |           predicate:(((d_moy = 11) and d_date_sk is not null) and (d_year = 1999)) (type: boolean)
                                                          |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                          |           TableScan [TS_6]
                                                          |              alias:date_dim
                                                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 2 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_27]
+                                                            Reduce Output Operator [RS_24]
                                                                key expressions:_col4 (type: int)
                                                                Map-reduce partition columns:_col4 (type: int)
                                                                sort order:+
                                                                Statistics:Num rows: 66 Data size: 134970 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col1 (type: string), _col2 (type: string), _col3 (type: string), _col5 (type: int), _col7 (type: decimal(7,2))
-                                                               Merge Join Operator [MERGEJOIN_93]
+                                                               Merge Join Operator [MERGEJOIN_81]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col2 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col7"]
                                                                |  Statistics:Num rows: 66 Data size: 134970 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 1 [SIMPLE_EDGE]
-                                                               |  Reduce Output Operator [RS_22]
+                                                               |  Reduce Output Operator [RS_21]
                                                                |     key expressions:_col0 (type: int)
                                                                |     Map-reduce partition columns:_col0 (type: int)
                                                                |     sort order:+
@@ -207,14 +207,14 @@ Stage-0
                                                                |     Select Operator [SEL_2]
                                                                |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                |        Statistics:Num rows: 60 Data size: 122700 Basic stats: COMPLETE Column stats: NONE
-                                                               |        Filter Operator [FIL_86]
+                                                               |        Filter Operator [FIL_74]
                                                                |           predicate:cc_call_center_sk is not null (type: boolean)
                                                                |           Statistics:Num rows: 60 Data size: 122700 Basic stats: COMPLETE Column stats: NONE
                                                                |           TableScan [TS_0]
                                                                |              alias:call_center
                                                                |              Statistics:Num rows: 60 Data size: 122700 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 10 [SIMPLE_EDGE]
-                                                                  Reduce Output Operator [RS_24]
+                                                                  Reduce Output Operator [RS_22]
                                                                      key expressions:_col2 (type: int)
                                                                      Map-reduce partition columns:_col2 (type: int)
                                                                      sort order:+
@@ -223,7 +223,7 @@ Stage-0
                                                                      Select Operator [SEL_5]
                                                                         outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                         Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                        Filter Operator [FIL_87]
+                                                                        Filter Operator [FIL_75]
                                                                            predicate:((cr_call_center_sk is not null and cr_returned_date_sk is not null) and cr_returning_customer_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/query92.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query92.q.out b/ql/src/test/results/clientpositive/perf/query92.q.out
index 9ea3adc..6fb2133 100644
--- a/ql/src/test/results/clientpositive/perf/query92.q.out
+++ b/ql/src/test/results/clientpositive/perf/query92.q.out
@@ -17,61 +17,61 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 5
-         File Output Operator [FS_41]
+         File Output Operator [FS_37]
             compressed:false
             Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [GBY_39]
+            Group By Operator [GBY_35]
             |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             |  outputColumnNames:["_col0","_col1","_col2"]
             |  Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 4 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_38]
+               Reduce Output Operator [RS_34]
                   sort order:
                   Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint)
-                  Group By Operator [GBY_37]
+                  Group By Operator [GBY_33]
                      aggregations:["sum(_col0)","sum(_col1)","sum(_col2)"]
                      outputColumnNames:["_col0","_col1","_col2"]
                      Statistics:Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_35]
+                     Select Operator [SEL_31]
                         outputColumnNames:["_col0","_col1","_col2"]
                         Statistics:Num rows: 4909 Data size: 5493875 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_52]
+                        Merge Join Operator [MERGEJOIN_48]
                         |  condition map:[{"":"Outer Join 0 to 1"}]
                         |  keys:{"0":"_col0 (type: int), _col1 (type: int)","1":"_col0 (type: int), _col1 (type: int)"}
                         |  outputColumnNames:["_col0","_col2"]
                         |  Statistics:Num rows: 4909 Data size: 5493875 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 3 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_32]
+                        |  Reduce Output Operator [RS_28]
                         |     key expressions:_col0 (type: int), _col1 (type: int)
                         |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                         |     sort order:++
                         |     Statistics:Num rows: 4463 Data size: 4994432 Basic stats: COMPLETE Column stats: NONE
-                        |     Select Operator [SEL_15]
+                        |     Select Operator [SEL_13]
                         |        outputColumnNames:["_col0","_col1"]
                         |        Statistics:Num rows: 4463 Data size: 4994432 Basic stats: COMPLETE Column stats: NONE
-                        |        Group By Operator [GBY_14]
+                        |        Group By Operator [GBY_12]
                         |        |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                         |        |  outputColumnNames:["_col0","_col1"]
                         |        |  Statistics:Num rows: 4463 Data size: 4994432 Basic stats: COMPLETE Column stats: NONE
                         |        |<-Reducer 2 [SIMPLE_EDGE]
-                        |           Reduce Output Operator [RS_13]
+                        |           Reduce Output Operator [RS_11]
                         |              key expressions:_col0 (type: int), _col1 (type: int)
                         |              Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                         |              sort order:++
                         |              Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
-                        |              Group By Operator [GBY_12]
+                        |              Group By Operator [GBY_10]
                         |                 keys:_col1 (type: int), _col2 (type: int)
                         |                 outputColumnNames:["_col0","_col1"]
                         |                 Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
-                        |                 Merge Join Operator [MERGEJOIN_50]
+                        |                 Merge Join Operator [MERGEJOIN_46]
                         |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |                 |  outputColumnNames:["_col1","_col2"]
                         |                 |  Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
                         |                 |<-Map 1 [SIMPLE_EDGE]
-                        |                 |  Reduce Output Operator [RS_7]
+                        |                 |  Reduce Output Operator [RS_6]
                         |                 |     key expressions:_col0 (type: int)
                         |                 |     Map-reduce partition columns:_col0 (type: int)
                         |                 |     sort order:+
@@ -80,14 +80,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_46]
+                        |                 |        Filter Operator [FIL_42]
                         |                 |           predicate:ss_sold_date_sk is not null (type: boolean)
                         |                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                 |           TableScan [TS_0]
                         |                 |              alias:ss
                         |                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                 |<-Map 6 [SIMPLE_EDGE]
-                        |                    Reduce Output Operator [RS_9]
+                        |                    Reduce Output Operator [RS_7]
                         |                       key expressions:_col0 (type: int)
                         |                       Map-reduce partition columns:_col0 (type: int)
                         |                       sort order:+
@@ -95,66 +95,66 @@ Stage-0
                         |                       Select Operator [SEL_5]
                         |                          outputColumnNames:["_col0"]
                         |                          Statistics:Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE
-                        |                          Filter Operator [FIL_47]
+                        |                          Filter Operator [FIL_43]
                         |                             predicate:(((d_month_seq <= 1217) and d_date_sk is not null) and (d_month_seq >= 1206)) (type: boolean)
                         |                             Statistics:Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE
                         |                             TableScan [TS_3]
                         |                                alias:d1
                         |                                Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 9 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_33]
+                           Reduce Output Operator [RS_29]
                               key expressions:_col0 (type: int), _col1 (type: int)
                               Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                               sort order:++
                               Statistics:Num rows: 4463 Data size: 4994432 Basic stats: COMPLETE Column stats: NONE
-                              Group By Operator [GBY_30]
+                              Group By Operator [GBY_26]
                               |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                               |  outputColumnNames:["_col0","_col1"]
                               |  Statistics:Num rows: 4463 Data size: 4994432 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 8 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_29]
+                                 Reduce Output Operator [RS_25]
                                     key expressions:_col0 (type: int), _col1 (type: int)
                                     Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                     sort order:++
                                     Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_28]
+                                    Group By Operator [GBY_24]
                                        keys:_col1 (type: int), _col2 (type: int)
                                        outputColumnNames:["_col0","_col1"]
                                        Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
-                                       Merge Join Operator [MERGEJOIN_51]
+                                       Merge Join Operator [MERGEJOIN_47]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col1","_col2"]
                                        |  Statistics:Num rows: 8927 Data size: 9989984 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_25]
+                                       |  Reduce Output Operator [RS_21]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE
-                                       |     Select Operator [SEL_21]
+                                       |     Select Operator [SEL_19]
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_49]
+                                       |        Filter Operator [FIL_45]
                                        |           predicate:(((d_month_seq <= 1217) and d_date_sk is not null) and (d_month_seq >= 1206)) (type: boolean)
                                        |           Statistics:Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE
-                                       |           TableScan [TS_19]
+                                       |           TableScan [TS_17]
                                        |              alias:d1
                                        |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 7 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_23]
+                                          Reduce Output Operator [RS_20]
                                              key expressions:_col0 (type: int)
                                              Map-reduce partition columns:_col0 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                              value expressions:_col1 (type: int), _col2 (type: int)
-                                             Select Operator [SEL_18]
+                                             Select Operator [SEL_16]
                                                 outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Filter Operator [FIL_48]
+                                                Filter Operator [FIL_44]
                                                    predicate:cs_sold_date_sk is not null (type: boolean)
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   TableScan [TS_16]
+                                                   TableScan [TS_14]
                                                       alias:cs
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 


[05/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
index 7be8eca..f2c7b08 100644
--- a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
+++ b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
@@ -277,7 +277,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -296,7 +296,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key,val
 Table:default@t2
@@ -330,7 +330,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -351,7 +351,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -369,7 +369,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -390,7 +390,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -411,7 +411,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -435,7 +435,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -472,7 +472,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -503,13 +503,13 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
 Keys:key
 
-Operator:GBY_18
+Operator:GBY_16
 Table:default@t3
 Keys:val
 
@@ -541,7 +541,7 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out b/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
index d44fff3..1559d4b 100644
--- a/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -300,7 +300,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table sm
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_input2
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -310,7 +310,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a LEFT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -320,7 +320,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 2' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 2' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a RIGHT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -330,7 +330,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a FULL OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out b/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
index a390851..5b68bb7 100644
--- a/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[15][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
index 17f0229..09a10bd 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
@@ -138,7 +138,7 @@ POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3out
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@bucket_medium@ds=2008-04-08
-Warning: Map Join MAPJOIN[39][bigTable=?] in task 'Map 3' is a cross product
+Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Map 3' is a cross product
 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
@@ -619,7 +619,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[39][bigTable=?] in task 'Map 3' is a cross product
+Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Map 3' is a cross product
 PREHOOK: query: select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket_big

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
index 2956bf8..521485a 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
@@ -483,7 +483,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -494,7 +494,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -519,7 +519,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -955,7 +955,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -966,7 +966,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -991,7 +991,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
index fbd0bb8..98cc8cc 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
@@ -840,7 +840,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -871,7 +871,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -992,7 +992,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1023,7 +1023,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1258,28 +1258,25 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col0 (type: int)
-                            1 _col0 (type: int)
-                          input vertices:
-                            1 Map 3
-                          Statistics: Num rows: 11 Data size: 77 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: int)
+                          1 _col0 (type: int)
+                        input vertices:
+                          1 Map 3
+                        Statistics: Num rows: 11 Data size: 77 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)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1292,14 +1289,11 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: int)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: int)
-                          Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Group By Operator
@@ -1762,7 +1756,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1793,7 +1787,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2654,7 +2648,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2685,7 +2679,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2806,7 +2800,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2837,7 +2831,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3452,7 +3446,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3483,7 +3477,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
index 6adf820..c5cb360 100644
--- a/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
@@ -257,7 +257,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -275,7 +275,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -333,7 +333,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 1) and (key > 2)) and key is not null) (type: boolean)
+                    predicate: ((key > 1) and (key > 2)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -363,7 +363,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 2) and (key > 1)) and key is not null) (type: boolean)
+                    predicate: ((key > 2) and (key > 1)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -626,7 +626,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and UDFToDouble(value) is not null) (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: value (type: string)
@@ -644,7 +644,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_join.q.out b/ql/src/test/results/clientpositive/tez/cross_join.q.out
index de3edbb..d397bd4 100644
--- a/ql/src/test/results/clientpositive/tez/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_join.q.out
@@ -1,4 +1,4 @@
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: -- current
 explain select src.key from src join src src2
 PREHOOK: type: QUERY
@@ -63,7 +63,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: -- ansi cross join
 explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
@@ -203,7 +203,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src join src src2
@@ -262,7 +262,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src cross join src src2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
index 0e7c681..ca44973 100644
--- a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -94,7 +94,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[25][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -198,7 +198,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[27][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key
@@ -324,8 +324,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_1, $hdt$_2]] in Stage 'Reducer 4' is a cross product
-Warning: Shuffle Join MERGEJOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_1, $hdt$_2]] in Stage 'Reducer 4' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1  group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1  group by d1.key) od1
@@ -434,7 +434,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[31][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A  group by key) ss join
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
index efd8b5d..ecd7f6b 100644
--- a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -90,7 +90,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -184,7 +184,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[30][bigTable=?] in task 'Reducer 3' is a cross product
+Warning: Map Join MAPJOIN[27][bigTable=?] in task 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key 
@@ -301,8 +301,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 2' is a cross product
-Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Reducer 3' is a cross product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Map 2' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
@@ -402,7 +402,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[34][bigTable=?] in task 'Reducer 4' is a cross product
+Warning: Map Join MAPJOIN[31][bigTable=?] in task 'Reducer 4' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
index d4b670d..caa4398 100644
--- a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
@@ -1284,28 +1284,25 @@ 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
         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: 14 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: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1409,20 +1406,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
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1462,7 +1456,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
@@ -1534,28 +1528,25 @@ 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
         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: 14 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: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1644,20 +1635,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
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1682,7 +1670,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
@@ -1767,28 +1755,25 @@ 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
         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: 14 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: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1820,7 +1805,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
@@ -2035,7 +2020,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
@@ -2129,7 +2114,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
@@ -4138,42 +4123,39 @@ 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)
         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: 14 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: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4259,34 +4241,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)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -5297,42 +5276,38 @@ 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)
         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: 108 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: 54 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)


[26/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
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]


[08/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query98.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query98.q.out b/ql/src/test/results/clientpositive/perf/query98.q.out
index ccd5874..baff7e0 100644
--- a/ql/src/test/results/clientpositive/perf/query98.q.out
+++ b/ql/src/test/results/clientpositive/perf/query98.q.out
@@ -16,65 +16,65 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 6
-         File Output Operator [FS_31]
+         File Output Operator [FS_27]
             compressed:false
             Statistics:Num rows: 139755 Data size: 200727046 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"}
-            Select Operator [SEL_30]
+            Select Operator [SEL_26]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
             |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 5 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_29]
+               Reduce Output Operator [RS_25]
                   key expressions:_col1 (type: string), _col2 (type: string), _col4 (type: string), _col0 (type: string), _col6 (type: decimal(38,23))
                   sort order:+++++
                   Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col3 (type: decimal(7,2)), _col5 (type: decimal(17,2))
-                  Select Operator [SEL_27]
+                  Select Operator [SEL_23]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                      Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
-                     PTF Operator [PTF_26]
+                     PTF Operator [PTF_22]
                         Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col3","partition by:":"_col3"}]
                         Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
-                        Select Operator [SEL_25]
+                        Select Operator [SEL_21]
                         |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 4 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_24]
+                           Reduce Output Operator [RS_20]
                               key expressions:_col3 (type: string)
                               Map-reduce partition columns:_col3 (type: string)
                               sort order:+
                               Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col4 (type: decimal(7,2)), _col5 (type: decimal(17,2))
-                              Select Operator [SEL_23]
+                              Select Operator [SEL_19]
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_22]
+                                 Group By Operator [GBY_18]
                                  |  aggregations:["sum(VALUE._col0)"]
                                  |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: decimal(7,2)), KEY._col3 (type: string), KEY._col4 (type: string)
                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 3 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_21]
+                                    Reduce Output Operator [RS_17]
                                        key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: decimal(7,2)), _col3 (type: string), _col4 (type: string)
                                        Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: decimal(7,2)), _col3 (type: string), _col4 (type: string)
                                        sort order:+++++
                                        Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col5 (type: decimal(17,2))
-                                       Group By Operator [GBY_20]
+                                       Group By Operator [GBY_16]
                                           aggregations:["sum(_col2)"]
                                           keys:_col4 (type: string), _col5 (type: string), _col6 (type: decimal(7,2)), _col7 (type: string), _col8 (type: string)
                                           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                           Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                          Select Operator [SEL_19]
+                                          Select Operator [SEL_15]
                                              outputColumnNames:["_col4","_col5","_col6","_col7","_col8","_col2"]
                                              Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_41]
+                                             Merge Join Operator [MERGEJOIN_37]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col2","_col4","_col5","_col6","_col7","_col8"]
                                              |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 8 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_17]
+                                             |  Reduce Output Operator [RS_13]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -82,26 +82,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_39]
+                                             |        Filter Operator [FIL_35]
                                              |           predicate:(d_date BETWEEN 2001-01-12 AND 2001-02-11 and d_date_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              alias:date_dim
                                              |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_15]
+                                                Reduce Output Operator [RS_12]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col2 (type: decimal(7,2)), _col4 (type: string), _col5 (type: string), _col6 (type: decimal(7,2)), _col7 (type: string), _col8 (type: string)
-                                                   Merge Join Operator [MERGEJOIN_40]
+                                                   Merge Join Operator [MERGEJOIN_36]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col2","_col4","_col5","_col6","_col7","_col8"]
                                                    |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_10]
+                                                   |  Reduce Output Operator [RS_9]
                                                    |     key expressions:_col1 (type: int)
                                                    |     Map-reduce partition columns:_col1 (type: int)
                                                    |     sort order:+
@@ -110,14 +110,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_37]
+                                                   |        Filter Operator [FIL_33]
                                                    |           predicate:(ss_item_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 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:+
@@ -126,7 +126,7 @@ Stage-0
                                                          Select Operator [SEL_5]
                                                             outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                             Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                                            Filter Operator [FIL_38]
+                                                            Filter Operator [FIL_34]
                                                                predicate:((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean)
                                                                Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                                                TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_gby_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby_join.q.out b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
index 09dfb82..205e0b5 100644
--- a/ql/src/test/results/clientpositive/ppd_gby_join.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
@@ -35,38 +35,32 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -311,7 +305,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -326,7 +320,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join.q.out b/ql/src/test/results/clientpositive/ppd_join.q.out
index f284237..c3123d2 100644
--- a/ql/src/test/results/clientpositive/ppd_join.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join.q.out
@@ -32,39 +32,33 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -563,7 +557,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: ((((((key > '1') and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -578,7 +572,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key > '2') and (key <> '4')) and (key > '1')) and (key > '20')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 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/ppd_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join2.q.out b/ql/src/test/results/clientpositive/ppd_join2.q.out
index fe2ad46..c503652 100644
--- a/ql/src/test/results/clientpositive/ppd_join2.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join2.q.out
@@ -39,40 +39,34 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) and key is not null) (type: boolean)
+              predicate: (((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -89,15 +83,12 @@ STAGE PLANS:
               expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string)
               outputColumnNames: _col0, _col1, _col3
               Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-              Filter Operator
-                predicate: _col1 is not null (type: boolean)
-                Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-1
     Map Reduce
@@ -112,14 +103,11 @@ STAGE PLANS:
                 expressions: value (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: _col1 (type: string)
@@ -1735,7 +1723,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) and key is not null) (type: boolean)
+              predicate: (((((((key <> '302') and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key < '400')) and (key <> '305')) and (key <> '14')) and value is not null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -1751,7 +1739,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key <> '305') and (key <> '14')) and (key <> '302')) and (key <> '311')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 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/ppd_join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join3.q.out b/ql/src/test/results/clientpositive/ppd_join3.q.out
index 64744aa..0000db1 100644
--- a/ql/src/test/results/clientpositive/ppd_join3.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join3.q.out
@@ -39,39 +39,33 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) and key is not null) (type: boolean)
+              predicate: ((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -88,15 +82,12 @@ STAGE PLANS:
               expressions: _col0 (type: string), _col2 (type: string)
               outputColumnNames: _col0, _col2
               Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-              Filter Operator
-                predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+              File Output Operator
+                compressed: false
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-1
     Map Reduce
@@ -105,20 +96,17 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: (((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: string)
@@ -1791,7 +1779,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) and key is not null) (type: boolean)
+              predicate: ((((((((key <> '11') and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key < '400')) and (key <> '12')) and (key <> '4')) and (key <> '13')) and (key <> '1')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -1806,7 +1794,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) and key is not null) (type: boolean)
+              predicate: (((((key <> '12') and (key <> '4')) and (key <> '11')) and (key > '0')) and (key < '400')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -1848,7 +1836,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) and key is not null) (type: boolean)
+              predicate: (((((((key <> '13') and (key <> '1')) and (key <> '11')) and (key > '0')) and (key < '400')) and (key <> '12')) and (key <> '4')) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join5.q.out b/ql/src/test/results/clientpositive/ppd_join5.q.out
index 02ea658..b68229e 100644
--- a/ql/src/test/results/clientpositive/ppd_join5.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join5.q.out
@@ -32,7 +32,7 @@ POSTHOOK: Lineage: t1.id1 SIMPLE []
 POSTHOOK: Lineage: t1.id2 SIMPLE []
 POSTHOOK: Lineage: t2.d SIMPLE []
 POSTHOOK: Lineage: t2.id SIMPLE []
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain
 select a.*,b.d d1,c.d d2 from
   t1 a join t2 b on (a.id1 = b.id)
@@ -148,7 +148,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain
 select * from (
 select a.*,b.d d1,c.d d2 from
@@ -271,7 +271,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[15][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: select * from (
 select a.*,b.d d1,c.d d2 from
   t1 a join t2 b on (a.id1 = b.id)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_join_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
index f5662c7..e3b19d4 100644
--- a/ql/src/test/results/clientpositive/ppd_join_filter.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
@@ -215,27 +215,23 @@ STAGE PLANS:
               expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) (type: double), (UDFToDouble(_col1) + 3.0) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-              Filter Operator
-                isSamplingPred: false
-                predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      properties:
-                        columns _col0,_col1,_col2
-                        columns.types string,double,double
-                        escape.delim \
-                        serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+#### A masked pattern was here ####
+                NumFilesPerFileSink: 1
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    properties:
+                      columns _col0,_col1,_col2
+                      columns.types string,double,double
+                      escape.delim \
+                      serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                TotalFiles: 1
+                GatherStats: false
+                MultiFileSpray: false
 
   Stage: Stage-1
     Map Reduce
@@ -252,17 +248,13 @@ STAGE PLANS:
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  isSamplingPred: false
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    tag: 0
-                    auto parallelism: false
+                  tag: 0
+                  auto parallelism: false
           TableScan
             GatherStats: false
             Reduce Output Operator
@@ -1051,27 +1043,23 @@ STAGE PLANS:
               expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) (type: double), (UDFToDouble(_col1) + 3.0) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-              Filter Operator
-                isSamplingPred: false
-                predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      properties:
-                        columns _col0,_col1,_col2
-                        columns.types string,double,double
-                        escape.delim \
-                        serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+#### A masked pattern was here ####
+                NumFilesPerFileSink: 1
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    properties:
+                      columns _col0,_col1,_col2
+                      columns.types string,double,double
+                      escape.delim \
+                      serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                TotalFiles: 1
+                GatherStats: false
+                MultiFileSpray: false
 
   Stage: Stage-1
     Map Reduce
@@ -1088,17 +1076,13 @@ STAGE PLANS:
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  isSamplingPred: false
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    tag: 0
-                    auto parallelism: false
+                  tag: 0
+                  auto parallelism: false
           TableScan
             GatherStats: false
             Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_outer_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_outer_join2.q.out b/ql/src/test/results/clientpositive/ppd_outer_join2.q.out
index c7ade80..82e4ef5 100644
--- a/ql/src/test/results/clientpositive/ppd_outer_join2.q.out
+++ b/ql/src/test/results/clientpositive/ppd_outer_join2.q.out
@@ -32,40 +32,34 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+              predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -265,7 +259,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+              predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -281,7 +275,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 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/ppd_outer_join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_outer_join3.q.out b/ql/src/test/results/clientpositive/ppd_outer_join3.q.out
index 5de6823..de82fe0 100644
--- a/ql/src/test/results/clientpositive/ppd_outer_join3.q.out
+++ b/ql/src/test/results/clientpositive/ppd_outer_join3.q.out
@@ -32,40 +32,34 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+              predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -265,7 +259,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and key is not null) (type: boolean)
+              predicate: ((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -281,7 +275,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 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/ppd_outer_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
index be47139..289798c 100644
--- a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
+++ b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
@@ -38,58 +38,49 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) and key is not null) (type: boolean)
+              predicate: (((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.0)) and key is not null) (type: boolean)
+              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.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)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -411,7 +402,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) and key is not null) (type: boolean)
+              predicate: (((((sqrt(key) <> 13.0) and (key < '25')) and (key > '15')) and (key < '20')) and (key > '10')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -426,7 +417,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.0)) and key is not null) (type: boolean)
+              predicate: (((((key > '10') and (key < '20')) and (key > '15')) and (key < '25')) and (sqrt(key) <> 13.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)
@@ -442,7 +433,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) and key is not null) (type: boolean)
+              predicate: ((((key > '15') and (key < '25')) and (key > '10')) and (key < '20')) (type: boolean)
               Statistics: Num rows: 6 Data size: 63 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/ppd_random.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_random.q.out b/ql/src/test/results/clientpositive/ppd_random.q.out
index 5f12432..5a890c5 100644
--- a/ql/src/test/results/clientpositive/ppd_random.q.out
+++ b/ql/src/test/results/clientpositive/ppd_random.q.out
@@ -34,14 +34,11 @@ STAGE PLANS:
                 expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -52,15 +49,12 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
index 573f595..9a21b5c 100644
--- a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
+++ b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
@@ -263,7 +263,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[18][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: -- Q4: here, the filter c.bar should be created under the first join but above the second
 explain select c.foo, d.bar from (select c.foo, b.bar, c.blah from pokes c left outer join pokes b on c.foo=b.foo) c left outer join pokes d where d.foo=1 and c.bar=2
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ppd_udf_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_udf_case.q.out b/ql/src/test/results/clientpositive/ppd_udf_case.q.out
index f466a29..2b407a6 100644
--- a/ql/src/test/results/clientpositive/ppd_udf_case.q.out
+++ b/ql/src/test/results/clientpositive/ppd_udf_case.q.out
@@ -43,15 +43,12 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string), hr (type: string)
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string), _col3 (type: string)
+                  value expressions: _col1 (type: string), _col3 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
@@ -62,15 +59,12 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string), hr (type: string)
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string), _col3 (type: string)
+                  value expressions: _col1 (type: string), _col3 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/ptfgroupbyjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ptfgroupbyjoin.q.out b/ql/src/test/results/clientpositive/ptfgroupbyjoin.q.out
index 46c154b..b726320 100644
--- a/ql/src/test/results/clientpositive/ptfgroupbyjoin.q.out
+++ b/ql/src/test/results/clientpositive/ptfgroupbyjoin.q.out
@@ -76,8 +76,9 @@ STAGE PLANS:
           TableScan
             alias: tlb1
             Statistics: Num rows: 2 Data size: 18 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: fkey is not null (type: boolean)
+            Select Operator
+              expressions: id (type: int), fkey (type: int)
+              outputColumnNames: id, fkey
               Statistics: Num rows: 2 Data size: 18 Basic stats: COMPLETE Column stats: NONE
               Group By Operator
                 keys: id (type: int), fkey (type: int)
@@ -95,12 +96,15 @@ STAGE PLANS:
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 9 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+          Filter Operator
+            predicate: _col1 is not null (type: boolean)
+            Statistics: Num rows: 1 Data size: 9 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-2
     Map Reduce
@@ -393,15 +397,12 @@ STAGE PLANS:
           Filter Operator
             predicate: _col1 is not null (type: boolean)
             Statistics: Num rows: 1 Data size: 9 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: _col1 is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 9 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator
-                compressed: false
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+            File Output Operator
+              compressed: false
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
   Stage: Stage-2
     Map Reduce
@@ -423,15 +424,12 @@ STAGE PLANS:
                 expressions: fid (type: int), name (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 6 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: _col0 is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 1 Data size: 6 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: int)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 1 Data size: 6 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string)
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/router_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/router_join_ppr.q.out b/ql/src/test/results/clientpositive/router_join_ppr.q.out
index 46cdb30..b486f21 100644
--- a/ql/src/test/results/clientpositive/router_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/router_join_ppr.q.out
@@ -1347,7 +1347,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: 12 Data size: 127 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -1367,7 +1367,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: 6 Data size: 63 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/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin.q.out b/ql/src/test/results/clientpositive/skewjoin.q.out
index 947e67a..4e98dfd 100644
--- a/ql/src/test/results/clientpositive/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin.q.out
@@ -768,7 +768,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and key is not null) and UDFToDouble(substring(value, 5)) is not null) (type: boolean)
+              predicate: (value is not null and key is not null) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -783,16 +783,16 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and key is not null) and (UDFToDouble(substring(value, 5)) + 1.0) is not null) (type: boolean)
+              predicate: (value is not null and key is not null) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                  key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                   sort order: ++
-                  Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                  Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -802,7 +802,7 @@ STAGE PLANS:
           handleSkewJoin: true
           keys:
             0 _col0 (type: string), UDFToDouble(substring(_col1, 5)) (type: double)
-            1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+            1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
           outputColumnNames: _col2, _col3
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -954,7 +954,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -969,7 +969,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+              predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/skewjoinopt18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt18.q.out b/ql/src/test/results/clientpositive/skewjoinopt18.q.out
index 925ebc5..9b98615 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt18.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt18.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int), val (type: string)
@@ -102,7 +102,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join12.q.out b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
index 3c7877f..158e535 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)


[27/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query21.q.out b/ql/src/test/results/clientpositive/perf/query21.q.out
index f4d9575..2634d3d 100644
--- a/ql/src/test/results/clientpositive/perf/query21.q.out
+++ b/ql/src/test/results/clientpositive/perf/query21.q.out
@@ -66,52 +66,52 @@ 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: 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_36]
+            Limit [LIM_30]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_35]
+               Select Operator [SEL_29]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 69877 Data size: 100362804 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), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 69877 Data size: 100362804 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: bigint), _col3 (type: bigint)
-                     Filter Operator [FIL_47]
+                     Filter Operator [FIL_26]
                         predicate:CASE WHEN ((_col2 > 0)) THEN ((UDFToDouble(_col3) / UDFToDouble(_col2))) ELSE (null) END BETWEEN 0.6666666666666666 AND 1.5 (type: boolean)
                         Statistics:Num rows: 69877 Data size: 100362804 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_31]
+                        Group By Operator [GBY_25]
                         |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                         |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 4 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_30]
+                           Reduce Output Operator [RS_24]
                               key expressions:_col0 (type: string), _col1 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                               sort order:++
                               Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col2 (type: bigint), _col3 (type: bigint)
-                              Group By Operator [GBY_29]
+                              Group By Operator [GBY_23]
                                  aggregations:["sum(_col2)","sum(_col3)"]
                                  keys:_col0 (type: string), _col1 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_27]
+                                 Select Operator [SEL_21]
                                     outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     Statistics:Num rows: 279510 Data size: 401454092 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:["_col3","_col5","_col7","_col10"]
                                     |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 9 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_25]
+                                    |  Reduce Output Operator [RS_19]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -120,26 +120,26 @@ Stage-0
                                     |     Select Operator [SEL_11]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_51]
+                                    |        Filter Operator [FIL_44]
                                     |           predicate:(d_date BETWEEN '1998-03-09' AND '1998-05-07' and d_date_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_9]
                                     |              alias:date_dim
                                     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 3 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_23]
+                                       Reduce Output Operator [RS_18]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: int), _col5 (type: string), _col7 (type: string)
-                                          Merge Join Operator [MERGEJOIN_53]
+                                          Merge Join Operator [MERGEJOIN_46]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col0","_col3","_col5","_col7"]
                                           |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 8 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_20]
+                                          |  Reduce Output Operator [RS_16]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
@@ -148,26 +148,26 @@ Stage-0
                                           |     Select Operator [SEL_8]
                                           |        outputColumnNames:["_col0","_col1"]
                                           |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_50]
+                                          |        Filter Operator [FIL_43]
                                           |           predicate:(i_current_price BETWEEN 0.99 AND 1.49 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_18]
+                                             Reduce Output Operator [RS_15]
                                                 key expressions:_col1 (type: int)
                                                 Map-reduce partition columns:_col1 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col0 (type: int), _col3 (type: int), _col5 (type: string)
-                                                Merge Join Operator [MERGEJOIN_52]
+                                                Merge Join Operator [MERGEJOIN_45]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col0","_col1","_col3","_col5"]
                                                 |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 1 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_13]
+                                                |  Reduce Output Operator [RS_12]
                                                 |     key expressions:_col2 (type: int)
                                                 |     Map-reduce partition columns:_col2 (type: int)
                                                 |     sort order:+
@@ -176,14 +176,14 @@ Stage-0
                                                 |     Select Operator [SEL_2]
                                                 |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                |        Filter Operator [FIL_48]
+                                                |        Filter Operator [FIL_41]
                                                 |           predicate:((inv_warehouse_sk is not null and inv_item_sk is not null) and inv_date_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |           TableScan [TS_0]
                                                 |              alias:inventory
                                                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |<-Map 7 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_15]
+                                                   Reduce Output Operator [RS_13]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
@@ -192,7 +192,7 @@ Stage-0
                                                       Select Operator [SEL_5]
                                                          outputColumnNames:["_col0","_col1"]
                                                          Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                                         Filter Operator [FIL_49]
+                                                         Filter Operator [FIL_42]
                                                             predicate:w_warehouse_sk is not null (type: boolean)
                                                             Statistics:Num rows: 27 Data size: 27802 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/query22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query22.q.out b/ql/src/test/results/clientpositive/perf/query22.q.out
index 9df8b68..72935ed 100644
--- a/ql/src/test/results/clientpositive/perf/query22.q.out
+++ b/ql/src/test/results/clientpositive/perf/query22.q.out
@@ -16,51 +16,51 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_36]
+         File Output Operator [FS_30]
             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_35]
+            Limit [LIM_29]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_34]
+               Select Operator [SEL_28]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 1397550 Data size: 2007270467 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_33]
+                  Reduce Output Operator [RS_27]
                      key expressions:_col4 (type: double), _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
                      sort order:+++++
                      Statistics:Num rows: 1397550 Data size: 2007270467 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [SEL_31]
+                     Select Operator [SEL_25]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                         Statistics:Num rows: 1397550 Data size: 2007270467 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_30]
+                        Group By Operator [GBY_24]
                         |  aggregations:["avg(VALUE._col0)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                         |  Statistics:Num rows: 1397550 Data size: 2007270467 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 4 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_29]
+                           Reduce Output Operator [RS_23]
                               key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
                               sort order:+++++
                               Statistics:Num rows: 2795100 Data size: 4014540935 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col5 (type: struct<count:bigint,sum:double,input:int>)
-                              Group By Operator [GBY_28]
+                              Group By Operator [GBY_22]
                                  aggregations:["avg(_col3)"]
                                  keys:_col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), '0' (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  Statistics:Num rows: 2795100 Data size: 4014540935 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_27]
+                                 Select Operator [SEL_21]
                                     outputColumnNames:["_col7","_col8","_col9","_col10","_col3"]
                                     Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_52]
+                                    Merge Join Operator [MERGEJOIN_46]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col3","_col7","_col8","_col9","_col10"]
                                     |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 9 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_25]
+                                    |  Reduce Output Operator [RS_19]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -68,26 +68,26 @@ Stage-0
                                     |     Select Operator [SEL_11]
                                     |        outputColumnNames:["_col0"]
                                     |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_49]
+                                    |        Filter Operator [FIL_43]
                                     |           predicate:w_warehouse_sk is not null (type: boolean)
                                     |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_9]
                                     |              alias:warehouse
                                     |              Statistics:Num rows: 27 Data size: 27802 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: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: int), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string)
-                                          Merge Join Operator [MERGEJOIN_51]
+                                          Merge Join Operator [MERGEJOIN_45]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col2","_col3","_col7","_col8","_col9","_col10"]
                                           |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 8 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_20]
+                                          |  Reduce Output Operator [RS_16]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
@@ -96,26 +96,26 @@ Stage-0
                                           |     Select Operator [SEL_8]
                                           |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                           |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_48]
+                                          |        Filter Operator [FIL_42]
                                           |           predicate:i_item_sk is not null (type: boolean)
                                           |           Statistics:Num rows: 462000 Data size: 663560457 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_18]
+                                             Reduce Output Operator [RS_15]
                                                 key expressions:_col1 (type: int)
                                                 Map-reduce partition columns:_col1 (type: int)
                                                 sort order:+
                                                 Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col2 (type: int), _col3 (type: int)
-                                                Merge Join Operator [MERGEJOIN_50]
+                                                Merge Join Operator [MERGEJOIN_44]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col1","_col2","_col3"]
                                                 |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 1 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_13]
+                                                |  Reduce Output Operator [RS_12]
                                                 |     key expressions:_col0 (type: int)
                                                 |     Map-reduce partition columns:_col0 (type: int)
                                                 |     sort order:+
@@ -124,14 +124,14 @@ Stage-0
                                                 |     Select Operator [SEL_2]
                                                 |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                |        Filter Operator [FIL_46]
+                                                |        Filter Operator [FIL_40]
                                                 |           predicate:((inv_date_sk is not null and inv_item_sk is not null) and inv_warehouse_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |           TableScan [TS_0]
                                                 |              alias:inventory
                                                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |<-Map 7 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_15]
+                                                   Reduce Output Operator [RS_13]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
@@ -139,7 +139,7 @@ Stage-0
                                                       Select Operator [SEL_5]
                                                          outputColumnNames:["_col0"]
                                                          Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                         Filter Operator [FIL_47]
+                                                         Filter Operator [FIL_41]
                                                             predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                             Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                             TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query25.q.out b/ql/src/test/results/clientpositive/perf/query25.q.out
index 4705659..dabc1c5 100644
--- a/ql/src/test/results/clientpositive/perf/query25.q.out
+++ b/ql/src/test/results/clientpositive/perf/query25.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: decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2))
-                     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: decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2))
-                              Group By Operator [GBY_60]
+                              Group By Operator [GBY_46]
                                  aggregations:["sum(_col5)","sum(_col10)","sum(_col14)"]
                                  keys:_col25 (type: string), _col26 (type: string), _col28 (type: string), _col29 (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:["_col25","_col26","_col28","_col29","_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","_col25","_col26","_col28","_col29"]
                                     |  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: 26735 Data size: 29919145 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col5 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: decimal(7,2)), _col25 (type: string), _col26 (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","_col25","_col26"]
                                           |  Statistics:Num rows: 26735 Data size: 29919145 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: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                                 value expressions:_col1 (type: int), _col5 (type: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                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: 24305 Data size: 27199223 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: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_108]
+                                                |        Filter Operator [FIL_94]
                                                 |           predicate:(((d_year = 1998) and d_moy BETWEEN 4 AND 10) and d_date_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 18262 Data size: 20435178 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: decimal(7,2)), _col10 (type: decimal(7,2)), _col14 (type: decimal(7,2))
-                                                      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_year = 1998) and d_moy BETWEEN 4 AND 10) 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: decimal(7,2)), _col10 (type: decimal(7,2)), _col11 (type: int), _col14 (type: decimal(7,2))
-                                                            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 = 1998) and (d_moy = 4)) 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: decimal(7,2)), _col6 (type: int), _col10 (type: decimal(7,2)), _col11 (type: int), _col14 (type: decimal(7,2))
-                                                                  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: decimal(7,2)), _col6 (type: int), _col10 (type: decimal(7,2))
-                                                                        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/query26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query26.q.out b/ql/src/test/results/clientpositive/perf/query26.q.out
index d364aec..84cc238 100644
--- a/ql/src/test/results/clientpositive/perf/query26.q.out
+++ b/ql/src/test/results/clientpositive/perf/query26.q.out
@@ -17,49 +17,49 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_43]
+         File Output Operator [FS_35]
             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_42]
+            Limit [LIM_34]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_41]
+               Select Operator [SEL_33]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_40]
+                  Reduce Output Operator [RS_32]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: double), _col2 (type: decimal(11,6)), _col3 (type: decimal(11,6)), _col4 (type: decimal(11,6))
-                     Group By Operator [GBY_38]
+                     Group By Operator [GBY_30]
                      |  aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)"]
                      |  keys:KEY._col0 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                      |  Statistics:Num rows: 279510 Data size: 401454093 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_37]
+                        Reduce Output Operator [RS_29]
                            key expressions:_col0 (type: string)
                            Map-reduce partition columns:_col0 (type: string)
                            sort order:+
                            Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: struct<count:bigint,sum:double,input:int>), _col2 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col3 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col4 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
-                           Group By Operator [GBY_36]
+                           Group By Operator [GBY_28]
                               aggregations:["avg(_col4)","avg(_col5)","avg(_col7)","avg(_col6)"]
                               keys:_col15 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                               Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_35]
+                              Select Operator [SEL_27]
                                  outputColumnNames:["_col15","_col4","_col5","_col7","_col6"]
                                  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_66]
+                                 Merge Join Operator [MERGEJOIN_58]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col4","_col5","_col6","_col7","_col15"]
                                  |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_33]
+                                 |  Reduce Output Operator [RS_25]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
@@ -67,26 +67,26 @@ Stage-0
                                  |     Select Operator [SEL_14]
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_62]
+                                 |        Filter Operator [FIL_54]
                                  |           predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_12]
                                  |              alias:promotion
                                  |              Statistics:Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_31]
+                                    Reduce Output Operator [RS_24]
                                        key expressions:_col3 (type: int)
                                        Map-reduce partition columns:_col3 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col15 (type: string)
-                                       Merge Join Operator [MERGEJOIN_65]
+                                       Merge Join Operator [MERGEJOIN_57]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col3","_col4","_col5","_col6","_col7","_col15"]
                                        |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_28]
+                                       |  Reduce Output Operator [RS_22]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
@@ -95,26 +95,26 @@ Stage-0
                                        |     Select Operator [SEL_11]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_61]
+                                       |        Filter Operator [FIL_53]
                                        |           predicate:i_item_sk is not null (type: boolean)
                                        |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_9]
                                        |              alias:item
                                        |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 3 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_26]
+                                          Reduce Output Operator [RS_21]
                                              key expressions:_col2 (type: int)
                                              Map-reduce partition columns:_col2 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                             Merge Join Operator [MERGEJOIN_64]
+                                             Merge Join Operator [MERGEJOIN_56]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col2","_col3","_col4","_col5","_col6","_col7"]
                                              |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 9 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_23]
+                                             |  Reduce Output Operator [RS_19]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
@@ -122,26 +122,26 @@ Stage-0
                                              |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_60]
+                                             |        Filter Operator [FIL_52]
                                              |           predicate:((d_year = 1998) and d_date_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_6]
                                              |              alias:date_dim
                                              |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_21]
+                                                Reduce Output Operator [RS_18]
                                                    key expressions:_col0 (type: int)
                                                    Map-reduce partition columns:_col0 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                   Merge Join Operator [MERGEJOIN_63]
+                                                   Merge Join Operator [MERGEJOIN_55]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                    |  Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_16]
+                                                   |  Reduce Output Operator [RS_15]
                                                    |     key expressions:_col1 (type: int)
                                                    |     Map-reduce partition columns:_col1 (type: int)
                                                    |     sort order:+
@@ -150,14 +150,14 @@ Stage-0
                                                    |     Select Operator [SEL_2]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_58]
+                                                   |        Filter Operator [FIL_50]
                                                    |           predicate:(((cs_bill_cdemo_sk is not null and cs_sold_date_sk is not null) and cs_item_sk is not null) and cs_promo_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 8 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_18]
+                                                      Reduce Output Operator [RS_16]
                                                          key expressions:_col0 (type: int)
                                                          Map-reduce partition columns:_col0 (type: int)
                                                          sort order:+
@@ -165,7 +165,7 @@ Stage-0
                                                          Select Operator [SEL_5]
                                                             outputColumnNames:["_col0"]
                                                             Statistics:Num rows: 2475 Data size: 896382 Basic stats: COMPLETE Column stats: NONE
-                                                            Filter Operator [FIL_59]
+                                                            Filter Operator [FIL_51]
                                                                predicate:((((cd_gender = 'F') and (cd_marital_status = 'W')) and (cd_education_status = 'Primary')) and cd_demo_sk is not null) (type: boolean)
                                                                Statistics:Num rows: 2475 Data size: 896382 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/query27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query27.q.out b/ql/src/test/results/clientpositive/perf/query27.q.out
index bf5d56e..ac38683 100644
--- a/ql/src/test/results/clientpositive/perf/query27.q.out
+++ b/ql/src/test/results/clientpositive/perf/query27.q.out
@@ -17,52 +17,52 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_43]
+         File Output Operator [FS_35]
             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_42]
+            Limit [LIM_34]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_41]
+               Select Operator [SEL_33]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 254100 Data size: 364958259 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_40]
+                  Reduce Output Operator [RS_32]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 254100 Data size: 364958259 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: double), _col3 (type: decimal(11,6)), _col4 (type: decimal(11,6)), _col5 (type: decimal(11,6))
-                     Select Operator [SEL_39]
+                     Select Operator [SEL_31]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Statistics:Num rows: 254100 Data size: 364958259 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [GBY_38]
+                        Group By Operator [GBY_30]
                         |  aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)"]
                         |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                         |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |  Statistics:Num rows: 254100 Data size: 364958259 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_37]
+                           Reduce Output Operator [RS_29]
                               key expressions:_col0 (type: string), _col1 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                               sort order:++
                               Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col2 (type: struct<count:bigint,sum:double,input:int>), _col3 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col4 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col5 (type: struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
-                              Group By Operator [GBY_36]
+                              Group By Operator [GBY_28]
                                  aggregations:["avg(_col4)","avg(_col5)","avg(_col7)","avg(_col6)"]
                                  keys:_col15 (type: string), _col17 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_35]
+                                 Select Operator [SEL_27]
                                     outputColumnNames:["_col15","_col17","_col4","_col5","_col7","_col6"]
                                     Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_66]
+                                    Merge Join Operator [MERGEJOIN_58]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col4","_col5","_col6","_col7","_col15","_col17"]
                                     |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 11 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_33]
+                                    |  Reduce Output Operator [RS_25]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -71,26 +71,26 @@ Stage-0
                                     |     Select Operator [SEL_14]
                                     |        outputColumnNames:["_col0","_col1"]
                                     |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_62]
+                                    |        Filter Operator [FIL_54]
                                     |           predicate:i_item_sk is not null (type: boolean)
                                     |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_12]
                                     |              alias:item
                                     |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_31]
+                                       Reduce Output Operator [RS_24]
                                           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:_col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col15 (type: string)
-                                          Merge Join Operator [MERGEJOIN_65]
+                                          Merge Join Operator [MERGEJOIN_57]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col1","_col4","_col5","_col6","_col7","_col15"]
                                           |  Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                           |<-Map 10 [SIMPLE_EDGE]
-                                          |  Reduce Output Operator [RS_28]
+                                          |  Reduce Output Operator [RS_22]
                                           |     key expressions:_col0 (type: int)
                                           |     Map-reduce partition columns:_col0 (type: int)
                                           |     sort order:+
@@ -99,26 +99,26 @@ Stage-0
                                           |     Select Operator [SEL_11]
                                           |        outputColumnNames:["_col0","_col1"]
                                           |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                          |        Filter Operator [FIL_61]
+                                          |        Filter Operator [FIL_53]
                                           |           predicate:((s_state) IN ('KS', 'AL', 'MN', 'AL', 'SC', 'VT') and s_store_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_9]
                                           |              alias:store
                                           |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                           |<-Reducer 3 [SIMPLE_EDGE]
-                                             Reduce Output Operator [RS_26]
+                                             Reduce Output Operator [RS_21]
                                                 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), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                Merge Join Operator [MERGEJOIN_64]
+                                                Merge Join Operator [MERGEJOIN_56]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col7"]
                                                 |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 9 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_23]
+                                                |  Reduce Output Operator [RS_19]
                                                 |     key expressions:_col0 (type: int)
                                                 |     Map-reduce partition columns:_col0 (type: int)
                                                 |     sort order:+
@@ -126,26 +126,26 @@ Stage-0
                                                 |     Select Operator [SEL_8]
                                                 |        outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                |        Filter Operator [FIL_60]
+                                                |        Filter Operator [FIL_52]
                                                 |           predicate:((d_year = 1998) and d_date_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_6]
                                                 |              alias:date_dim
                                                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_21]
+                                                   Reduce Output Operator [RS_18]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col1 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                      Merge Join Operator [MERGEJOIN_63]
+                                                      Merge Join Operator [MERGEJOIN_55]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col7"]
                                                       |  Statistics:Num rows: 2722 Data size: 986020 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 1 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_16]
+                                                      |  Reduce Output Operator [RS_15]
                                                       |     key expressions:_col2 (type: int)
                                                       |     Map-reduce partition columns:_col2 (type: int)
                                                       |     sort order:+
@@ -154,14 +154,14 @@ Stage-0
                                                       |     Select Operator [SEL_2]
                                                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                      |        Filter Operator [FIL_58]
+                                                      |        Filter Operator [FIL_50]
                                                       |           predicate:(((ss_cdemo_sk is not null and ss_sold_date_sk is not null) and ss_store_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_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_18]
+                                                         Reduce Output Operator [RS_16]
                                                             key expressions:_col0 (type: int)
                                                             Map-reduce partition columns:_col0 (type: int)
                                                             sort order:+
@@ -169,7 +169,7 @@ Stage-0
                                                             Select Operator [SEL_5]
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 2475 Data size: 896382 Basic stats: COMPLETE Column stats: NONE
-                                                               Filter Operator [FIL_59]
+                                                               Filter Operator [FIL_51]
                                                                   predicate:((((cd_gender = 'F') and (cd_marital_status = 'D')) and (cd_education_status = 'Unknown')) and cd_demo_sk is not null) (type: boolean)
                                                                   Statistics:Num rows: 2475 Data size: 896382 Basic stats: COMPLETE Column stats: NONE
                                                                   TableScan [TS_3]


[11/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query88.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query88.q.out b/ql/src/test/results/clientpositive/perf/query88.q.out
index f70bc7f..f139dd1 100644
--- a/ql/src/test/results/clientpositive/perf/query88.q.out
+++ b/ql/src/test/results/clientpositive/perf/query88.q.out
@@ -1,10 +1,10 @@
-Warning: Shuffle Join MERGEJOIN[421][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 6' is a cross product
-Warning: Shuffle Join MERGEJOIN[422][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 7' is a cross product
-Warning: Shuffle Join MERGEJOIN[423][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3]] in Stage 'Reducer 8' is a cross product
-Warning: Shuffle Join MERGEJOIN[424][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4]] in Stage 'Reducer 9' is a cross product
-Warning: Shuffle Join MERGEJOIN[425][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5]] in Stage 'Reducer 10' is a cross product
-Warning: Shuffle Join MERGEJOIN[426][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5, $hdt$_6]] in Stage 'Reducer 11' is a cross product
-Warning: Shuffle Join MERGEJOIN[427][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5, $hdt$_6, $hdt$_7]] in Stage 'Reducer 12' is a cross product
+Warning: Shuffle Join MERGEJOIN[366][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 6' is a cross product
+Warning: Shuffle Join MERGEJOIN[367][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 7' is a cross product
+Warning: Shuffle Join MERGEJOIN[368][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3]] in Stage 'Reducer 8' is a cross product
+Warning: Shuffle Join MERGEJOIN[369][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4]] in Stage 'Reducer 9' is a cross product
+Warning: Shuffle Join MERGEJOIN[370][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5]] in Stage 'Reducer 10' is a cross product
+Warning: Shuffle Join MERGEJOIN[371][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5, $hdt$_6]] in Stage 'Reducer 11' is a cross product
+Warning: Shuffle Join MERGEJOIN[372][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3, $hdt$_4, $hdt$_5, $hdt$_6, $hdt$_7]] in Stage 'Reducer 12' is a cross product
 PREHOOK: query: explain
 select  *
 from
@@ -237,629 +237,629 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 12
-         File Output Operator [FS_285]
+         File Output Operator [FS_237]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Merge Join Operator [MERGEJOIN_427]
+            Merge Join Operator [MERGEJOIN_372]
             |  condition map:[{"":"Inner Join 0 to 1"}]
             |  keys:{}
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 11 [SIMPLE_EDGE]
-            |  Reduce Output Operator [RS_281]
+            |  Reduce Output Operator [RS_233]
             |     sort order:
             |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: bigint), _col6 (type: bigint)
-            |     Merge Join Operator [MERGEJOIN_426]
+            |     Merge Join Operator [MERGEJOIN_371]
             |     |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |  keys:{}
             |     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
             |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |<-Reducer 10 [SIMPLE_EDGE]
-            |     |  Reduce Output Operator [RS_278]
+            |     |  Reduce Output Operator [RS_230]
             |     |     sort order:
             |     |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |     value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: bigint)
-            |     |     Merge Join Operator [MERGEJOIN_425]
+            |     |     Merge Join Operator [MERGEJOIN_370]
             |     |     |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |     |  keys:{}
             |     |     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |     |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |     |<-Reducer 52 [SIMPLE_EDGE]
-            |     |     |  Reduce Output Operator [RS_276]
+            |     |     |  Reduce Output Operator [RS_228]
             |     |     |     sort order:
             |     |     |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |     |     value expressions:_col0 (type: bigint)
-            |     |     |     Group By Operator [GBY_190]
+            |     |     |     Group By Operator [GBY_154]
             |     |     |     |  aggregations:["count(VALUE._col0)"]
             |     |     |     |  outputColumnNames:["_col0"]
             |     |     |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |     |     |<-Reducer 51 [SIMPLE_EDGE]
-            |     |     |        Reduce Output Operator [RS_189]
+            |     |     |        Reduce Output Operator [RS_153]
             |     |     |           sort order:
             |     |     |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |     |           value expressions:_col0 (type: bigint)
-            |     |     |           Group By Operator [GBY_188]
+            |     |     |           Group By Operator [GBY_152]
             |     |     |              aggregations:["count()"]
             |     |     |              outputColumnNames:["_col0"]
             |     |     |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |     |              Merge Join Operator [MERGEJOIN_414]
+            |     |     |              Merge Join Operator [MERGEJOIN_359]
             |     |     |              |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |     |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |     |              |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |     |              |<-Map 55 [SIMPLE_EDGE]
-            |     |     |              |  Reduce Output Operator [RS_185]
+            |     |     |              |  Reduce Output Operator [RS_149]
             |     |     |              |     key expressions:_col0 (type: int)
             |     |     |              |     Map-reduce partition columns:_col0 (type: int)
             |     |     |              |     sort order:+
             |     |     |              |     Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |     |              |     Select Operator [SEL_171]
+            |     |     |              |     Select Operator [SEL_141]
             |     |     |              |        outputColumnNames:["_col0"]
             |     |     |              |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |     |              |        Filter Operator [FIL_388]
+            |     |     |              |        Filter Operator [FIL_333]
             |     |     |              |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |     |              |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |     |              |           TableScan [TS_169]
+            |     |     |              |           TableScan [TS_139]
             |     |     |              |              alias:store
             |     |     |              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |     |              |<-Reducer 50 [SIMPLE_EDGE]
-            |     |     |                 Reduce Output Operator [RS_183]
+            |     |     |                 Reduce Output Operator [RS_148]
             |     |     |                    key expressions:_col2 (type: int)
             |     |     |                    Map-reduce partition columns:_col2 (type: int)
             |     |     |                    sort order:+
             |     |     |                    Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                    Merge Join Operator [MERGEJOIN_413]
+            |     |     |                    Merge Join Operator [MERGEJOIN_358]
             |     |     |                    |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |     |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |     |                    |  outputColumnNames:["_col2"]
             |     |     |                    |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |     |                    |<-Map 54 [SIMPLE_EDGE]
-            |     |     |                    |  Reduce Output Operator [RS_180]
+            |     |     |                    |  Reduce Output Operator [RS_146]
             |     |     |                    |     key expressions:_col0 (type: int)
             |     |     |                    |     Map-reduce partition columns:_col0 (type: int)
             |     |     |                    |     sort order:+
             |     |     |                    |     Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                    |     Select Operator [SEL_168]
+            |     |     |                    |     Select Operator [SEL_138]
             |     |     |                    |        outputColumnNames:["_col0"]
             |     |     |                    |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                    |        Filter Operator [FIL_387]
+            |     |     |                    |        Filter Operator [FIL_332]
             |     |     |                    |           predicate:(((t_hour = 11) and (t_minute < 30)) and t_time_sk is not null) (type: boolean)
             |     |     |                    |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                    |           TableScan [TS_166]
+            |     |     |                    |           TableScan [TS_136]
             |     |     |                    |              alias:time_dim
             |     |     |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |     |                    |<-Reducer 49 [SIMPLE_EDGE]
-            |     |     |                       Reduce Output Operator [RS_178]
+            |     |     |                       Reduce Output Operator [RS_145]
             |     |     |                          key expressions:_col0 (type: int)
             |     |     |                          Map-reduce partition columns:_col0 (type: int)
             |     |     |                          sort order:+
             |     |     |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |     |                          value expressions:_col2 (type: int)
-            |     |     |                          Merge Join Operator [MERGEJOIN_412]
+            |     |     |                          Merge Join Operator [MERGEJOIN_357]
             |     |     |                          |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |     |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |     |                          |  outputColumnNames:["_col0","_col2"]
             |     |     |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |     |                          |<-Map 48 [SIMPLE_EDGE]
-            |     |     |                          |  Reduce Output Operator [RS_173]
+            |     |     |                          |  Reduce Output Operator [RS_142]
             |     |     |                          |     key expressions:_col1 (type: int)
             |     |     |                          |     Map-reduce partition columns:_col1 (type: int)
             |     |     |                          |     sort order:+
             |     |     |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |     |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-            |     |     |                          |     Select Operator [SEL_162]
+            |     |     |                          |     Select Operator [SEL_132]
             |     |     |                          |        outputColumnNames:["_col0","_col1","_col2"]
             |     |     |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |     |                          |        Filter Operator [FIL_385]
+            |     |     |                          |        Filter Operator [FIL_330]
             |     |     |                          |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |     |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |     |                          |           TableScan [TS_160]
+            |     |     |                          |           TableScan [TS_130]
             |     |     |                          |              alias:store_sales
             |     |     |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |     |                          |<-Map 53 [SIMPLE_EDGE]
-            |     |     |                             Reduce Output Operator [RS_175]
+            |     |     |                             Reduce Output Operator [RS_143]
             |     |     |                                key expressions:_col0 (type: int)
             |     |     |                                Map-reduce partition columns:_col0 (type: int)
             |     |     |                                sort order:+
             |     |     |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                                Select Operator [SEL_165]
+            |     |     |                                Select Operator [SEL_135]
             |     |     |                                   outputColumnNames:["_col0"]
             |     |     |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                                   Filter Operator [FIL_386]
+            |     |     |                                   Filter Operator [FIL_331]
             |     |     |                                      predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean)
             |     |     |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |     |                                      TableScan [TS_163]
+            |     |     |                                      TableScan [TS_133]
             |     |     |                                         alias:household_demographics
             |     |     |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
             |     |     |<-Reducer 9 [SIMPLE_EDGE]
-            |     |        Reduce Output Operator [RS_275]
+            |     |        Reduce Output Operator [RS_227]
             |     |           sort order:
             |     |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |           value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: bigint)
-            |     |           Merge Join Operator [MERGEJOIN_424]
+            |     |           Merge Join Operator [MERGEJOIN_369]
             |     |           |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |           |  keys:{}
             |     |           |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
             |     |           |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |           |<-Reducer 44 [SIMPLE_EDGE]
-            |     |           |  Reduce Output Operator [RS_273]
+            |     |           |  Reduce Output Operator [RS_225]
             |     |           |     sort order:
             |     |           |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |           |     value expressions:_col0 (type: bigint)
-            |     |           |     Group By Operator [GBY_158]
+            |     |           |     Group By Operator [GBY_128]
             |     |           |     |  aggregations:["count(VALUE._col0)"]
             |     |           |     |  outputColumnNames:["_col0"]
             |     |           |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |           |     |<-Reducer 43 [SIMPLE_EDGE]
-            |     |           |        Reduce Output Operator [RS_157]
+            |     |           |        Reduce Output Operator [RS_127]
             |     |           |           sort order:
             |     |           |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |           |           value expressions:_col0 (type: bigint)
-            |     |           |           Group By Operator [GBY_156]
+            |     |           |           Group By Operator [GBY_126]
             |     |           |              aggregations:["count()"]
             |     |           |              outputColumnNames:["_col0"]
             |     |           |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |           |              Merge Join Operator [MERGEJOIN_411]
+            |     |           |              Merge Join Operator [MERGEJOIN_356]
             |     |           |              |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |           |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |           |              |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |           |              |<-Map 47 [SIMPLE_EDGE]
-            |     |           |              |  Reduce Output Operator [RS_153]
+            |     |           |              |  Reduce Output Operator [RS_123]
             |     |           |              |     key expressions:_col0 (type: int)
             |     |           |              |     Map-reduce partition columns:_col0 (type: int)
             |     |           |              |     sort order:+
             |     |           |              |     Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |           |              |     Select Operator [SEL_139]
+            |     |           |              |     Select Operator [SEL_115]
             |     |           |              |        outputColumnNames:["_col0"]
             |     |           |              |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |           |              |        Filter Operator [FIL_384]
+            |     |           |              |        Filter Operator [FIL_329]
             |     |           |              |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |           |              |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |           |              |           TableScan [TS_137]
+            |     |           |              |           TableScan [TS_113]
             |     |           |              |              alias:store
             |     |           |              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |           |              |<-Reducer 42 [SIMPLE_EDGE]
-            |     |           |                 Reduce Output Operator [RS_151]
+            |     |           |                 Reduce Output Operator [RS_122]
             |     |           |                    key expressions:_col2 (type: int)
             |     |           |                    Map-reduce partition columns:_col2 (type: int)
             |     |           |                    sort order:+
             |     |           |                    Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                    Merge Join Operator [MERGEJOIN_410]
+            |     |           |                    Merge Join Operator [MERGEJOIN_355]
             |     |           |                    |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |           |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |           |                    |  outputColumnNames:["_col2"]
             |     |           |                    |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |           |                    |<-Map 46 [SIMPLE_EDGE]
-            |     |           |                    |  Reduce Output Operator [RS_148]
+            |     |           |                    |  Reduce Output Operator [RS_120]
             |     |           |                    |     key expressions:_col0 (type: int)
             |     |           |                    |     Map-reduce partition columns:_col0 (type: int)
             |     |           |                    |     sort order:+
             |     |           |                    |     Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                    |     Select Operator [SEL_136]
+            |     |           |                    |     Select Operator [SEL_112]
             |     |           |                    |        outputColumnNames:["_col0"]
             |     |           |                    |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                    |        Filter Operator [FIL_383]
+            |     |           |                    |        Filter Operator [FIL_328]
             |     |           |                    |           predicate:(((t_hour = 10) and (t_minute >= 30)) and t_time_sk is not null) (type: boolean)
             |     |           |                    |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                    |           TableScan [TS_134]
+            |     |           |                    |           TableScan [TS_110]
             |     |           |                    |              alias:time_dim
             |     |           |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |           |                    |<-Reducer 41 [SIMPLE_EDGE]
-            |     |           |                       Reduce Output Operator [RS_146]
+            |     |           |                       Reduce Output Operator [RS_119]
             |     |           |                          key expressions:_col0 (type: int)
             |     |           |                          Map-reduce partition columns:_col0 (type: int)
             |     |           |                          sort order:+
             |     |           |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |           |                          value expressions:_col2 (type: int)
-            |     |           |                          Merge Join Operator [MERGEJOIN_409]
+            |     |           |                          Merge Join Operator [MERGEJOIN_354]
             |     |           |                          |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |           |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |           |                          |  outputColumnNames:["_col0","_col2"]
             |     |           |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |           |                          |<-Map 40 [SIMPLE_EDGE]
-            |     |           |                          |  Reduce Output Operator [RS_141]
+            |     |           |                          |  Reduce Output Operator [RS_116]
             |     |           |                          |     key expressions:_col1 (type: int)
             |     |           |                          |     Map-reduce partition columns:_col1 (type: int)
             |     |           |                          |     sort order:+
             |     |           |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |           |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-            |     |           |                          |     Select Operator [SEL_130]
+            |     |           |                          |     Select Operator [SEL_106]
             |     |           |                          |        outputColumnNames:["_col0","_col1","_col2"]
             |     |           |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |           |                          |        Filter Operator [FIL_381]
+            |     |           |                          |        Filter Operator [FIL_326]
             |     |           |                          |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |           |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |           |                          |           TableScan [TS_128]
+            |     |           |                          |           TableScan [TS_104]
             |     |           |                          |              alias:store_sales
             |     |           |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |           |                          |<-Map 45 [SIMPLE_EDGE]
-            |     |           |                             Reduce Output Operator [RS_143]
+            |     |           |                             Reduce Output Operator [RS_117]
             |     |           |                                key expressions:_col0 (type: int)
             |     |           |                                Map-reduce partition columns:_col0 (type: int)
             |     |           |                                sort order:+
             |     |           |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                                Select Operator [SEL_133]
+            |     |           |                                Select Operator [SEL_109]
             |     |           |                                   outputColumnNames:["_col0"]
             |     |           |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                                   Filter Operator [FIL_382]
+            |     |           |                                   Filter Operator [FIL_327]
             |     |           |                                      predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean)
             |     |           |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |           |                                      TableScan [TS_131]
+            |     |           |                                      TableScan [TS_107]
             |     |           |                                         alias:household_demographics
             |     |           |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
             |     |           |<-Reducer 8 [SIMPLE_EDGE]
-            |     |              Reduce Output Operator [RS_272]
+            |     |              Reduce Output Operator [RS_224]
             |     |                 sort order:
             |     |                 Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                 value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint), _col3 (type: bigint)
-            |     |                 Merge Join Operator [MERGEJOIN_423]
+            |     |                 Merge Join Operator [MERGEJOIN_368]
             |     |                 |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                 |  keys:{}
             |     |                 |  outputColumnNames:["_col0","_col1","_col2","_col3"]
             |     |                 |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                 |<-Reducer 36 [SIMPLE_EDGE]
-            |     |                 |  Reduce Output Operator [RS_270]
+            |     |                 |  Reduce Output Operator [RS_222]
             |     |                 |     sort order:
             |     |                 |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                 |     value expressions:_col0 (type: bigint)
-            |     |                 |     Group By Operator [GBY_126]
+            |     |                 |     Group By Operator [GBY_102]
             |     |                 |     |  aggregations:["count(VALUE._col0)"]
             |     |                 |     |  outputColumnNames:["_col0"]
             |     |                 |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                 |     |<-Reducer 35 [SIMPLE_EDGE]
-            |     |                 |        Reduce Output Operator [RS_125]
+            |     |                 |        Reduce Output Operator [RS_101]
             |     |                 |           sort order:
             |     |                 |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                 |           value expressions:_col0 (type: bigint)
-            |     |                 |           Group By Operator [GBY_124]
+            |     |                 |           Group By Operator [GBY_100]
             |     |                 |              aggregations:["count()"]
             |     |                 |              outputColumnNames:["_col0"]
             |     |                 |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |              Merge Join Operator [MERGEJOIN_408]
+            |     |                 |              Merge Join Operator [MERGEJOIN_353]
             |     |                 |              |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                 |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |                 |              |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |                 |              |<-Map 39 [SIMPLE_EDGE]
-            |     |                 |              |  Reduce Output Operator [RS_121]
+            |     |                 |              |  Reduce Output Operator [RS_97]
             |     |                 |              |     key expressions:_col0 (type: int)
             |     |                 |              |     Map-reduce partition columns:_col0 (type: int)
             |     |                 |              |     sort order:+
             |     |                 |              |     Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |              |     Select Operator [SEL_107]
+            |     |                 |              |     Select Operator [SEL_89]
             |     |                 |              |        outputColumnNames:["_col0"]
             |     |                 |              |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |              |        Filter Operator [FIL_380]
+            |     |                 |              |        Filter Operator [FIL_325]
             |     |                 |              |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |                 |              |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |              |           TableScan [TS_105]
+            |     |                 |              |           TableScan [TS_87]
             |     |                 |              |              alias:store
             |     |                 |              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |                 |              |<-Reducer 34 [SIMPLE_EDGE]
-            |     |                 |                 Reduce Output Operator [RS_119]
+            |     |                 |                 Reduce Output Operator [RS_96]
             |     |                 |                    key expressions:_col2 (type: int)
             |     |                 |                    Map-reduce partition columns:_col2 (type: int)
             |     |                 |                    sort order:+
             |     |                 |                    Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                    Merge Join Operator [MERGEJOIN_407]
+            |     |                 |                    Merge Join Operator [MERGEJOIN_352]
             |     |                 |                    |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                 |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |                 |                    |  outputColumnNames:["_col2"]
             |     |                 |                    |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |                 |                    |<-Map 38 [SIMPLE_EDGE]
-            |     |                 |                    |  Reduce Output Operator [RS_116]
+            |     |                 |                    |  Reduce Output Operator [RS_94]
             |     |                 |                    |     key expressions:_col0 (type: int)
             |     |                 |                    |     Map-reduce partition columns:_col0 (type: int)
             |     |                 |                    |     sort order:+
             |     |                 |                    |     Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                    |     Select Operator [SEL_104]
+            |     |                 |                    |     Select Operator [SEL_86]
             |     |                 |                    |        outputColumnNames:["_col0"]
             |     |                 |                    |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                    |        Filter Operator [FIL_379]
+            |     |                 |                    |        Filter Operator [FIL_324]
             |     |                 |                    |           predicate:(((t_hour = 10) and (t_minute < 30)) and t_time_sk is not null) (type: boolean)
             |     |                 |                    |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                    |           TableScan [TS_102]
+            |     |                 |                    |           TableScan [TS_84]
             |     |                 |                    |              alias:time_dim
             |     |                 |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |                 |                    |<-Reducer 33 [SIMPLE_EDGE]
-            |     |                 |                       Reduce Output Operator [RS_114]
+            |     |                 |                       Reduce Output Operator [RS_93]
             |     |                 |                          key expressions:_col0 (type: int)
             |     |                 |                          Map-reduce partition columns:_col0 (type: int)
             |     |                 |                          sort order:+
             |     |                 |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                 |                          value expressions:_col2 (type: int)
-            |     |                 |                          Merge Join Operator [MERGEJOIN_406]
+            |     |                 |                          Merge Join Operator [MERGEJOIN_351]
             |     |                 |                          |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                 |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |                 |                          |  outputColumnNames:["_col0","_col2"]
             |     |                 |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                 |                          |<-Map 32 [SIMPLE_EDGE]
-            |     |                 |                          |  Reduce Output Operator [RS_109]
+            |     |                 |                          |  Reduce Output Operator [RS_90]
             |     |                 |                          |     key expressions:_col1 (type: int)
             |     |                 |                          |     Map-reduce partition columns:_col1 (type: int)
             |     |                 |                          |     sort order:+
             |     |                 |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                 |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-            |     |                 |                          |     Select Operator [SEL_98]
+            |     |                 |                          |     Select Operator [SEL_80]
             |     |                 |                          |        outputColumnNames:["_col0","_col1","_col2"]
             |     |                 |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                 |                          |        Filter Operator [FIL_377]
+            |     |                 |                          |        Filter Operator [FIL_322]
             |     |                 |                          |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |                 |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                 |                          |           TableScan [TS_96]
+            |     |                 |                          |           TableScan [TS_78]
             |     |                 |                          |              alias:store_sales
             |     |                 |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                 |                          |<-Map 37 [SIMPLE_EDGE]
-            |     |                 |                             Reduce Output Operator [RS_111]
+            |     |                 |                             Reduce Output Operator [RS_91]
             |     |                 |                                key expressions:_col0 (type: int)
             |     |                 |                                Map-reduce partition columns:_col0 (type: int)
             |     |                 |                                sort order:+
             |     |                 |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                                Select Operator [SEL_101]
+            |     |                 |                                Select Operator [SEL_83]
             |     |                 |                                   outputColumnNames:["_col0"]
             |     |                 |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                                   Filter Operator [FIL_378]
+            |     |                 |                                   Filter Operator [FIL_323]
             |     |                 |                                      predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean)
             |     |                 |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                 |                                      TableScan [TS_99]
+            |     |                 |                                      TableScan [TS_81]
             |     |                 |                                         alias:household_demographics
             |     |                 |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
             |     |                 |<-Reducer 7 [SIMPLE_EDGE]
-            |     |                    Reduce Output Operator [RS_269]
+            |     |                    Reduce Output Operator [RS_221]
             |     |                       sort order:
             |     |                       Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                       value expressions:_col0 (type: bigint), _col1 (type: bigint), _col2 (type: bigint)
-            |     |                       Merge Join Operator [MERGEJOIN_422]
+            |     |                       Merge Join Operator [MERGEJOIN_367]
             |     |                       |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                       |  keys:{}
             |     |                       |  outputColumnNames:["_col0","_col1","_col2"]
             |     |                       |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                       |<-Reducer 28 [SIMPLE_EDGE]
-            |     |                       |  Reduce Output Operator [RS_267]
+            |     |                       |  Reduce Output Operator [RS_219]
             |     |                       |     sort order:
             |     |                       |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                       |     value expressions:_col0 (type: bigint)
-            |     |                       |     Group By Operator [GBY_94]
+            |     |                       |     Group By Operator [GBY_76]
             |     |                       |     |  aggregations:["count(VALUE._col0)"]
             |     |                       |     |  outputColumnNames:["_col0"]
             |     |                       |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                       |     |<-Reducer 27 [SIMPLE_EDGE]
-            |     |                       |        Reduce Output Operator [RS_93]
+            |     |                       |        Reduce Output Operator [RS_75]
             |     |                       |           sort order:
             |     |                       |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                       |           value expressions:_col0 (type: bigint)
-            |     |                       |           Group By Operator [GBY_92]
+            |     |                       |           Group By Operator [GBY_74]
             |     |                       |              aggregations:["count()"]
             |     |                       |              outputColumnNames:["_col0"]
             |     |                       |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |              Merge Join Operator [MERGEJOIN_405]
+            |     |                       |              Merge Join Operator [MERGEJOIN_350]
             |     |                       |              |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                       |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |                       |              |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |                       |              |<-Map 31 [SIMPLE_EDGE]
-            |     |                       |              |  Reduce Output Operator [RS_89]
+            |     |                       |              |  Reduce Output Operator [RS_71]
             |     |                       |              |     key expressions:_col0 (type: int)
             |     |                       |              |     Map-reduce partition columns:_col0 (type: int)
             |     |                       |              |     sort order:+
             |     |                       |              |     Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |              |     Select Operator [SEL_75]
+            |     |                       |              |     Select Operator [SEL_63]
             |     |                       |              |        outputColumnNames:["_col0"]
             |     |                       |              |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |              |        Filter Operator [FIL_376]
+            |     |                       |              |        Filter Operator [FIL_321]
             |     |                       |              |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |                       |              |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |              |           TableScan [TS_73]
+            |     |                       |              |           TableScan [TS_61]
             |     |                       |              |              alias:store
             |     |                       |              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |                       |              |<-Reducer 26 [SIMPLE_EDGE]
-            |     |                       |                 Reduce Output Operator [RS_87]
+            |     |                       |                 Reduce Output Operator [RS_70]
             |     |                       |                    key expressions:_col2 (type: int)
             |     |                       |                    Map-reduce partition columns:_col2 (type: int)
             |     |                       |                    sort order:+
             |     |                       |                    Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                    Merge Join Operator [MERGEJOIN_404]
+            |     |                       |                    Merge Join Operator [MERGEJOIN_349]
             |     |                       |                    |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                       |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |                       |                    |  outputColumnNames:["_col2"]
             |     |                       |                    |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |                       |                    |<-Map 30 [SIMPLE_EDGE]
-            |     |                       |                    |  Reduce Output Operator [RS_84]
+            |     |                       |                    |  Reduce Output Operator [RS_68]
             |     |                       |                    |     key expressions:_col0 (type: int)
             |     |                       |                    |     Map-reduce partition columns:_col0 (type: int)
             |     |                       |                    |     sort order:+
             |     |                       |                    |     Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                    |     Select Operator [SEL_72]
+            |     |                       |                    |     Select Operator [SEL_60]
             |     |                       |                    |        outputColumnNames:["_col0"]
             |     |                       |                    |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                    |        Filter Operator [FIL_375]
+            |     |                       |                    |        Filter Operator [FIL_320]
             |     |                       |                    |           predicate:(((t_minute >= 30) and (t_hour = 9)) and t_time_sk is not null) (type: boolean)
             |     |                       |                    |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                    |           TableScan [TS_70]
+            |     |                       |                    |           TableScan [TS_58]
             |     |                       |                    |              alias:time_dim
             |     |                       |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |                       |                    |<-Reducer 25 [SIMPLE_EDGE]
-            |     |                       |                       Reduce Output Operator [RS_82]
+            |     |                       |                       Reduce Output Operator [RS_67]
             |     |                       |                          key expressions:_col0 (type: int)
             |     |                       |                          Map-reduce partition columns:_col0 (type: int)
             |     |                       |                          sort order:+
             |     |                       |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                       |                          value expressions:_col2 (type: int)
-            |     |                       |                          Merge Join Operator [MERGEJOIN_403]
+            |     |                       |                          Merge Join Operator [MERGEJOIN_348]
             |     |                       |                          |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                       |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |                       |                          |  outputColumnNames:["_col0","_col2"]
             |     |                       |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                       |                          |<-Map 24 [SIMPLE_EDGE]
-            |     |                       |                          |  Reduce Output Operator [RS_77]
+            |     |                       |                          |  Reduce Output Operator [RS_64]
             |     |                       |                          |     key expressions:_col1 (type: int)
             |     |                       |                          |     Map-reduce partition columns:_col1 (type: int)
             |     |                       |                          |     sort order:+
             |     |                       |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                       |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-            |     |                       |                          |     Select Operator [SEL_66]
+            |     |                       |                          |     Select Operator [SEL_54]
             |     |                       |                          |        outputColumnNames:["_col0","_col1","_col2"]
             |     |                       |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                       |                          |        Filter Operator [FIL_373]
+            |     |                       |                          |        Filter Operator [FIL_318]
             |     |                       |                          |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |                       |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                       |                          |           TableScan [TS_64]
+            |     |                       |                          |           TableScan [TS_52]
             |     |                       |                          |              alias:store_sales
             |     |                       |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                       |                          |<-Map 29 [SIMPLE_EDGE]
-            |     |                       |                             Reduce Output Operator [RS_79]
+            |     |                       |                             Reduce Output Operator [RS_65]
             |     |                       |                                key expressions:_col0 (type: int)
             |     |                       |                                Map-reduce partition columns:_col0 (type: int)
             |     |                       |                                sort order:+
             |     |                       |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                                Select Operator [SEL_69]
+            |     |                       |                                Select Operator [SEL_57]
             |     |                       |                                   outputColumnNames:["_col0"]
             |     |                       |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                                   Filter Operator [FIL_374]
+            |     |                       |                                   Filter Operator [FIL_319]
             |     |                       |                                      predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean)
             |     |                       |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                       |                                      TableScan [TS_67]
+            |     |                       |                                      TableScan [TS_55]
             |     |                       |                                         alias:household_demographics
             |     |                       |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
             |     |                       |<-Reducer 6 [SIMPLE_EDGE]
-            |     |                          Reduce Output Operator [RS_266]
+            |     |                          Reduce Output Operator [RS_218]
             |     |                             sort order:
             |     |                             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                             value expressions:_col0 (type: bigint), _col1 (type: bigint)
-            |     |                             Merge Join Operator [MERGEJOIN_421]
+            |     |                             Merge Join Operator [MERGEJOIN_366]
             |     |                             |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                             |  keys:{}
             |     |                             |  outputColumnNames:["_col0","_col1"]
             |     |                             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                             |<-Reducer 20 [SIMPLE_EDGE]
-            |     |                             |  Reduce Output Operator [RS_264]
+            |     |                             |  Reduce Output Operator [RS_216]
             |     |                             |     sort order:
             |     |                             |     Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                             |     value expressions:_col0 (type: bigint)
-            |     |                             |     Group By Operator [GBY_62]
+            |     |                             |     Group By Operator [GBY_50]
             |     |                             |     |  aggregations:["count(VALUE._col0)"]
             |     |                             |     |  outputColumnNames:["_col0"]
             |     |                             |     |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                             |     |<-Reducer 19 [SIMPLE_EDGE]
-            |     |                             |        Reduce Output Operator [RS_61]
+            |     |                             |        Reduce Output Operator [RS_49]
             |     |                             |           sort order:
             |     |                             |           Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                             |           value expressions:_col0 (type: bigint)
-            |     |                             |           Group By Operator [GBY_60]
+            |     |                             |           Group By Operator [GBY_48]
             |     |                             |              aggregations:["count()"]
             |     |                             |              outputColumnNames:["_col0"]
             |     |                             |              Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |              Merge Join Operator [MERGEJOIN_402]
+            |     |                             |              Merge Join Operator [MERGEJOIN_347]
             |     |                             |              |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                             |              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |                             |              |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |                             |              |<-Map 23 [SIMPLE_EDGE]
-            |     |                             |              |  Reduce Output Operator [RS_57]
+            |     |                             |              |  Reduce Output Operator [RS_45]
             |     |                             |              |     key expressions:_col0 (type: int)
             |     |                             |              |     Map-reduce partition columns:_col0 (type: int)
             |     |                             |              |     sort order:+
             |     |                             |              |     Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |              |     Select Operator [SEL_43]
+            |     |                             |              |     Select Operator [SEL_37]
             |     |                             |              |        outputColumnNames:["_col0"]
             |     |                             |              |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |              |        Filter Operator [FIL_372]
+            |     |                             |              |        Filter Operator [FIL_317]
             |     |                             |              |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |                             |              |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |              |           TableScan [TS_41]
+            |     |                             |              |           TableScan [TS_35]
             |     |                             |              |              alias:store
             |     |                             |              |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |                             |              |<-Reducer 18 [SIMPLE_EDGE]
-            |     |                             |                 Reduce Output Operator [RS_55]
+            |     |                             |                 Reduce Output Operator [RS_44]
             |     |                             |                    key expressions:_col2 (type: int)
             |     |                             |                    Map-reduce partition columns:_col2 (type: int)
             |     |                             |                    sort order:+
             |     |                             |                    Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                    Merge Join Operator [MERGEJOIN_401]
+            |     |                             |                    Merge Join Operator [MERGEJOIN_346]
             |     |                             |                    |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                             |                    |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |                             |                    |  outputColumnNames:["_col2"]
             |     |                             |                    |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |                             |                    |<-Map 22 [SIMPLE_EDGE]
-            |     |                             |                    |  Reduce Output Operator [RS_52]
+            |     |                             |                    |  Reduce Output Operator [RS_42]
             |     |                             |                    |     key expressions:_col0 (type: int)
             |     |                             |                    |     Map-reduce partition columns:_col0 (type: int)
             |     |                             |                    |     sort order:+
             |     |                             |                    |     Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                    |     Select Operator [SEL_40]
+            |     |                             |                    |     Select Operator [SEL_34]
             |     |                             |                    |        outputColumnNames:["_col0"]
             |     |                             |                    |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                    |        Filter Operator [FIL_371]
+            |     |                             |                    |        Filter Operator [FIL_316]
             |     |                             |                    |           predicate:(((t_hour = 9) and (t_minute < 30)) and t_time_sk is not null) (type: boolean)
             |     |                             |                    |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                    |           TableScan [TS_38]
+            |     |                             |                    |           TableScan [TS_32]
             |     |                             |                    |              alias:time_dim
             |     |                             |                    |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |                             |                    |<-Reducer 17 [SIMPLE_EDGE]
-            |     |                             |                       Reduce Output Operator [RS_50]
+            |     |                             |                       Reduce Output Operator [RS_41]
             |     |                             |                          key expressions:_col0 (type: int)
             |     |                             |                          Map-reduce partition columns:_col0 (type: int)
             |     |                             |                          sort order:+
             |     |                             |                          Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                             |                          value expressions:_col2 (type: int)
-            |     |                             |                          Merge Join Operator [MERGEJOIN_400]
+            |     |                             |                          Merge Join Operator [MERGEJOIN_345]
             |     |                             |                          |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                             |                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |                             |                          |  outputColumnNames:["_col0","_col2"]
             |     |                             |                          |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                             |                          |<-Map 16 [SIMPLE_EDGE]
-            |     |                             |                          |  Reduce Output Operator [RS_45]
+            |     |                             |                          |  Reduce Output Operator [RS_38]
             |     |                             |                          |     key expressions:_col1 (type: int)
             |     |                             |                          |     Map-reduce partition columns:_col1 (type: int)
             |     |                             |                          |     sort order:+
             |     |                             |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                             |                          |     value expressions:_col0 (type: int), _col2 (type: int)
-            |     |                             |                          |     Select Operator [SEL_34]
+            |     |                             |                          |     Select Operator [SEL_28]
             |     |                             |                          |        outputColumnNames:["_col0","_col1","_col2"]
             |     |                             |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                             |                          |        Filter Operator [FIL_369]
+            |     |                             |                          |        Filter Operator [FIL_314]
             |     |                             |                          |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |                             |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            |     |                             |                          |           TableScan [TS_32]
+            |     |                             |                          |           TableScan [TS_26]
             |     |                             |                          |              alias:store_sales
             |     |                             |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                             |                          |<-Map 21 [SIMPLE_EDGE]
-            |     |                             |                             Reduce Output Operator [RS_47]
+            |     |                             |                             Reduce Output Operator [RS_39]
             |     |                             |                                key expressions:_col0 (type: int)
             |     |                             |                                Map-reduce partition columns:_col0 (type: int)
             |     |                             |                                sort order:+
             |     |                             |                                Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                                Select Operator [SEL_37]
+            |     |                             |                                Select Operator [SEL_31]
             |     |                             |                                   outputColumnNames:["_col0"]
             |     |                             |                                   Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                                   Filter Operator [FIL_370]
+            |     |                             |                                   Filter Operator [FIL_315]
             |     |                             |                                      predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean)
             |     |                             |                                      Statistics:Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE
-            |     |                             |                                      TableScan [TS_35]
+            |     |                             |                                      TableScan [TS_29]
             |     |                             |                                         alias:household_demographics
             |     |                             |                                         Statistics:Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE
             |     |                             |<-Reducer 5 [SIMPLE_EDGE]
-            |     |                                Reduce Output Operator [RS_263]
+            |     |                                Reduce Output Operator [RS_215]
             |     |                                   sort order:
             |     |                                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                                   value expressions:_col0 (type: bigint)
-            |     |                                   Group By Operator [GBY_30]
+            |     |                                   Group By Operator [GBY_24]
             |     |                                   |  aggregations:["count(VALUE._col0)"]
             |     |                                   |  outputColumnNames:["_col0"]
             |     |                                   |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                                   |<-Reducer 4 [SIMPLE_EDGE]
-            |     |                                      Reduce Output Operator [RS_29]
+            |     |                                      Reduce Output Operator [RS_23]
             |     |                                         sort order:
             |     |                                         Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |     |                                         value expressions:_col0 (type: bigint)
-            |     |                                         Group By Operator [GBY_28]
+            |     |                                         Group By Operator [GBY_22]
             |     |                                            aggregations:["count()"]
             |     |                                            outputColumnNames:["_col0"]
             |     |                                            Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-            |     |                                            Merge Join Operator [MERGEJOIN_399]
+            |     |                                            Merge Join Operator [MERGEJOIN_344]
             |     |                                            |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                                            |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
             |     |                                            |  Statistics:Num rows: 17424 Data size: 8206704 Basic stats: COMPLETE Column stats: NONE
             |     |                                            |<-Map 15 [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:+
@@ -867,25 +867,25 @@ Stage-0
             |     |                                            |     Select Operator [SEL_11]
             |     |                                            |        outputColumnNames:["_col0"]
             |     |                                            |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-            |     |                                            |        Filter Operator [FIL_368]
+            |     |                                            |        Filter Operator [FIL_313]
             |     |                                            |           predicate:((s_store_name = 'ese') and s_store_sk is not null) (type: boolean)
             |     |                                            |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
             |     |                                            |           TableScan [TS_9]
             |     |                                            |              alias:store
             |     |                                            |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
             |     |                                            |<-Reducer 3 [SIMPLE_EDGE]
-            |     |                                               Reduce Output Operator [RS_23]
+            |     |                                               Reduce Output Operator [RS_18]
             |     |                                                  key expressions:_col2 (type: int)
             |     |                                                  Map-reduce partition columns:_col2 (type: int)
             |     |                                                  sort order:+
             |     |                                                  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
-            |     |                                                  Merge Join Operator [MERGEJOIN_398]
+            |     |                                                  Merge Join Operator [MERGEJOIN_343]
             |     |                                                  |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
             |     |                                                  |  outputColumnNames:["_col2"]
             |     |                                                  |  Statistics:Num rows: 15840 Data size: 7460640 Basic stats: COMPLETE Column stats: NONE
             |     |                                                  |<-Map 14 [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:+
@@ -893,26 +893,26 @@ Stage-0
             |     |                                                  |     Select Operator [SEL_8]
             |     |                                                  |        outputColumnNames:["_col0"]
             |     |                                                  |        Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
-            |     |                                                  |        Filter Operator [FIL_367]
+            |     |                                                  |        Filter Operator [FIL_312]
             |     |                                                  |           predicate:(((t_minute >= 30) and (t_hour = 8)) and t_time_sk is not null) (type: boolean)
             |     |                                                  |           Statistics:Num rows: 14400 Data size: 6782400 Basic stats: COMPLETE Column stats: NONE
             |     |                                                  |           TableScan [TS_6]
             |     |                                                  |              alias:time_dim
             |     |                                                  |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
             |     |                                                  |<-Reducer 2 [SIMPLE_EDGE]
-            |     |                                                     Reduce Output Operator [RS_18]
+            |     |                                                     Reduce Output Operator [RS_15]
             |     |                                                        key expressions:_col0 (type: int)
             |     |                                                        Map-reduce partition columns:_col0 (type: int)
             |     |                                                        sort order:+
             |     |                                                        Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                                                        value expressions:_col2 (type: int)
-            |     |                                                        Merge Join Operator [MERGEJOIN_397]
+            |     |                                                        Merge Join Operator [MERGEJOIN_342]
             |     |                                                        |  condition map:[{"":"Inner Join 0 to 1"}]
             |     |                                                        |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
             |     |                                                        |  outputColumnNames:["_col0","_col2"]
             |     |                                                        |  Statistics:Num rows: 3960 Data size: 423720 Basic stats: COMPLETE Column stats: NONE
             |     |                                                        |<-Map 1 [SIMPLE_EDGE]
-            |     |                                                        |  Reduce Output Operator [RS_13]
+            |     |                                                        |  Reduce Output Operator [RS_12]
             |     |                                                        |     key expressions:_col1 (type: int)
             |     |                                                        |     Map-reduce partition columns:_col1 (type: int)
             |     |                                                        |     sort order:+
@@ -921,14 +921,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_365]
+            |     |                                                        |        Filter Operator [FIL_310]
             |     |                                                        |           predicate:((ss_hdemo_sk is not null and ss_sold_time_sk is not null) and ss_store_sk is not null) (type: boolean)
             |     |                                                        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                                                        |           TableScan [TS_0]
             |     |                                                        |              alias:store_sales
             |     |                                                        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             |     |                                                        |<-Map 13 [SIMPLE_EDGE]
-            |     |                                                    

<TRUNCATED>

[15/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query75.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query75.q.out b/ql/src/test/results/clientpositive/perf/query75.q.out
index 70a1649..d54000b 100644
--- a/ql/src/test/results/clientpositive/perf/query75.q.out
+++ b/ql/src/test/results/clientpositive/perf/query75.q.out
@@ -33,606 +33,606 @@ Stage-0
       limit:100
       Stage-1
          Reducer 8
-         File Output Operator [FS_176]
+         File Output Operator [FS_150]
             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_175]
+            Limit [LIM_149]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_174]
+               Select Operator [SEL_148]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                |  Statistics:Num rows: 169103 Data size: 242878993 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 7 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_173]
+                  Reduce Output Operator [RS_147]
                      key expressions:_col8 (type: bigint)
                      sort order:+
                      Statistics:Num rows: 169103 Data size: 242878993 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: bigint), _col7 (type: bigint), _col9 (type: double)
-                     Select Operator [SEL_172]
+                     Select Operator [SEL_146]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                         Statistics:Num rows: 169103 Data size: 242878993 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_237]
+                        Filter Operator [FIL_145]
                            predicate:((CAST( _col5 AS decimal(17,2)) / CAST( _col12 AS decimal(17,2))) < 0.9) (type: boolean)
                            Statistics:Num rows: 169103 Data size: 242878993 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_280]
+                           Merge Join Operator [MERGEJOIN_253]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)","1":"_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)"}
                            |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col12","_col13"]
                            |  Statistics:Num rows: 507310 Data size: 728638416 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 31 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_169]
+                           |  Reduce Output Operator [RS_143]
                            |     key expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |     Map-reduce partition columns:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |     sort order:++++
                            |     Statistics:Num rows: 461191 Data size: 662398546 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col0 (type: int), _col5 (type: bigint), _col6 (type: double)
-                           |     Group By Operator [GBY_164]
+                           |     Group By Operator [GBY_140]
                            |     |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                            |     |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: int), KEY._col4 (type: int)
                            |     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |     |  Statistics:Num rows: 461191 Data size: 662398546 Basic stats: COMPLETE Column stats: NONE
                            |     |<-Union 30 [SIMPLE_EDGE]
                            |        |<-Reducer 29 [CONTAINS]
-                           |        |  Reduce Output Operator [RS_163]
+                           |        |  Reduce Output Operator [RS_139]
                            |        |     key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |     sort order:+++++
                            |        |     Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                            |        |     value expressions:_col5 (type: bigint), _col6 (type: double)
-                           |        |     Group By Operator [GBY_162]
+                           |        |     Group By Operator [GBY_138]
                            |        |        aggregations:["sum(_col5)","sum(_col6)"]
                            |        |        keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |        |        Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                           |        |        Select Operator [SEL_107]
+                           |        |        Select Operator [SEL_91]
                            |        |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |        |           Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                           |        |           Merge Join Operator [MERGEJOIN_273]
+                           |        |           Merge Join Operator [MERGEJOIN_246]
                            |        |           |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |        |           |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                            |        |           |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                            |        |           |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                            |        |           |<-Map 34 [SIMPLE_EDGE]
-                           |        |           |  Reduce Output Operator [RS_105]
+                           |        |           |  Reduce Output Operator [RS_89]
                            |        |           |     key expressions:_col1 (type: int), _col0 (type: int)
                            |        |           |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                            |        |           |     sort order:++
                            |        |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |           |     value expressions:_col2 (type: int), _col3 (type: decimal(7,2))
-                           |        |           |     Select Operator [SEL_93]
+                           |        |           |     Select Operator [SEL_81]
                            |        |           |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |        |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |        |           |        TableScan [TS_92]
+                           |        |           |        TableScan [TS_80]
                            |        |           |           alias:catalog_returns
                            |        |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |           |<-Reducer 28 [SIMPLE_EDGE]
-                           |        |              Reduce Output Operator [RS_104]
+                           |        |              Reduce Output Operator [RS_88]
                            |        |                 key expressions:_col2 (type: int), _col1 (type: int)
                            |        |                 Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                            |        |                 sort order:++
                            |        |                 Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |        |                 value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                           |        |                 Merge Join Operator [MERGEJOIN_272]
+                           |        |                 Merge Join Operator [MERGEJOIN_245]
                            |        |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |        |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |        |                 |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                            |        |                 |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |        |                 |<-Map 33 [SIMPLE_EDGE]
-                           |        |                 |  Reduce Output Operator [RS_102]
+                           |        |                 |  Reduce Output Operator [RS_86]
                            |        |                 |     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
                            |        |                 |     value expressions:2001 (type: int)
-                           |        |                 |     Select Operator [SEL_91]
+                           |        |                 |     Select Operator [SEL_79]
                            |        |                 |        outputColumnNames:["_col0"]
                            |        |                 |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |        |                 |        Filter Operator [FIL_252]
+                           |        |                 |        Filter Operator [FIL_225]
                            |        |                 |           predicate:((d_year = 2001) and d_date_sk is not null) (type: boolean)
                            |        |                 |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |        |                 |           TableScan [TS_89]
+                           |        |                 |           TableScan [TS_77]
                            |        |                 |              alias:date_dim
                            |        |                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |        |                 |<-Reducer 27 [SIMPLE_EDGE]
-                           |        |                    Reduce Output Operator [RS_100]
+                           |        |                    Reduce Output Operator [RS_85]
                            |        |                       key expressions:_col0 (type: int)
                            |        |                       Map-reduce partition columns:_col0 (type: int)
                            |        |                       sort order:+
                            |        |                       Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |        |                       value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                           |        |                       Merge Join Operator [MERGEJOIN_271]
+                           |        |                       Merge Join Operator [MERGEJOIN_244]
                            |        |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |        |                       |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |        |                       |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                            |        |                       |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |        |                       |<-Map 26 [SIMPLE_EDGE]
-                           |        |                       |  Reduce Output Operator [RS_95]
+                           |        |                       |  Reduce Output Operator [RS_82]
                            |        |                       |     key expressions:_col1 (type: int)
                            |        |                       |     Map-reduce partition columns:_col1 (type: int)
                            |        |                       |     sort order:+
                            |        |                       |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |                       |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2))
-                           |        |                       |     Select Operator [SEL_85]
+                           |        |                       |     Select Operator [SEL_73]
                            |        |                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            |        |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |        |                       |        Filter Operator [FIL_250]
+                           |        |                       |        Filter Operator [FIL_223]
                            |        |                       |           predicate:(cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean)
                            |        |                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |        |                       |           TableScan [TS_83]
+                           |        |                       |           TableScan [TS_71]
                            |        |                       |              alias:catalog_sales
                            |        |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |                       |<-Map 32 [SIMPLE_EDGE]
-                           |        |                          Reduce Output Operator [RS_97]
+                           |        |                          Reduce Output Operator [RS_83]
                            |        |                             key expressions:_col0 (type: int)
                            |        |                             Map-reduce partition columns:_col0 (type: int)
                            |        |                             sort order:+
                            |        |                             Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                            |        |                             value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int)
-                           |        |                             Select Operator [SEL_88]
+                           |        |                             Select Operator [SEL_76]
                            |        |                                outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                            |        |                                Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |        |                                Filter Operator [FIL_251]
+                           |        |                                Filter Operator [FIL_224]
                            |        |                                   predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                            |        |                                   Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |        |                                   TableScan [TS_86]
+                           |        |                                   TableScan [TS_74]
                            |        |                                      alias:item
                            |        |                                      Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 38 [CONTAINS]
-                           |        |  Reduce Output Operator [RS_163]
+                           |        |  Reduce Output Operator [RS_139]
                            |        |     key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |     sort order:+++++
                            |        |     Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                            |        |     value expressions:_col5 (type: bigint), _col6 (type: double)
-                           |        |     Group By Operator [GBY_162]
+                           |        |     Group By Operator [GBY_138]
                            |        |        aggregations:["sum(_col5)","sum(_col6)"]
                            |        |        keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |        |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |        |        Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                           |        |        Select Operator [SEL_132]
+                           |        |        Select Operator [SEL_112]
                            |        |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |        |           Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                           |        |           Merge Join Operator [MERGEJOIN_276]
+                           |        |           Merge Join Operator [MERGEJOIN_249]
                            |        |           |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |        |           |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                            |        |           |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                            |        |           |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                            |        |           |<-Map 41 [SIMPLE_EDGE]
-                           |        |           |  Reduce Output Operator [RS_130]
+                           |        |           |  Reduce Output Operator [RS_110]
                            |        |           |     key expressions:_col1 (type: int), _col0 (type: int)
                            |        |           |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                            |        |           |     sort order:++
                            |        |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |           |     value expressions:_col2 (type: int), _col3 (type: decimal(7,2))
-                           |        |           |     Select Operator [SEL_118]
+                           |        |           |     Select Operator [SEL_102]
                            |        |           |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |        |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |        |           |        TableScan [TS_117]
+                           |        |           |        TableScan [TS_101]
                            |        |           |           alias:store_returns
                            |        |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |           |<-Reducer 37 [SIMPLE_EDGE]
-                           |        |              Reduce Output Operator [RS_129]
+                           |        |              Reduce Output Operator [RS_109]
                            |        |                 key expressions:_col2 (type: int), _col1 (type: int)
                            |        |                 Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                            |        |                 sort order:++
                            |        |                 Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |        |                 value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                           |        |                 Merge Join Operator [MERGEJOIN_275]
+                           |        |                 Merge Join Operator [MERGEJOIN_248]
                            |        |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |        |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |        |                 |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                            |        |                 |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |        |                 |<-Map 40 [SIMPLE_EDGE]
-                           |        |                 |  Reduce Output Operator [RS_127]
+                           |        |                 |  Reduce Output Operator [RS_107]
                            |        |                 |     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
                            |        |                 |     value expressions:2001 (type: int)
-                           |        |                 |     Select Operator [SEL_116]
+                           |        |                 |     Select Operator [SEL_100]
                            |        |                 |        outputColumnNames:["_col0"]
                            |        |                 |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |        |                 |        Filter Operator [FIL_256]
+                           |        |                 |        Filter Operator [FIL_229]
                            |        |                 |           predicate:((d_year = 2001) and d_date_sk is not null) (type: boolean)
                            |        |                 |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |        |                 |           TableScan [TS_114]
+                           |        |                 |           TableScan [TS_98]
                            |        |                 |              alias:date_dim
                            |        |                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |        |                 |<-Reducer 36 [SIMPLE_EDGE]
-                           |        |                    Reduce Output Operator [RS_125]
+                           |        |                    Reduce Output Operator [RS_106]
                            |        |                       key expressions:_col0 (type: int)
                            |        |                       Map-reduce partition columns:_col0 (type: int)
                            |        |                       sort order:+
                            |        |                       Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |        |                       value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                           |        |                       Merge Join Operator [MERGEJOIN_274]
+                           |        |                       Merge Join Operator [MERGEJOIN_247]
                            |        |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                            |        |                       |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |        |                       |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                            |        |                       |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |        |                       |<-Map 35 [SIMPLE_EDGE]
-                           |        |                       |  Reduce Output Operator [RS_120]
+                           |        |                       |  Reduce Output Operator [RS_103]
                            |        |                       |     key expressions:_col1 (type: int)
                            |        |                       |     Map-reduce partition columns:_col1 (type: int)
                            |        |                       |     sort order:+
                            |        |                       |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |                       |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2))
-                           |        |                       |     Select Operator [SEL_110]
+                           |        |                       |     Select Operator [SEL_94]
                            |        |                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            |        |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |        |                       |        Filter Operator [FIL_254]
+                           |        |                       |        Filter Operator [FIL_227]
                            |        |                       |           predicate:(ss_item_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_108]
+                           |        |                       |           TableScan [TS_92]
                            |        |                       |              alias:store_sales
                            |        |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |        |                       |<-Map 39 [SIMPLE_EDGE]
-                           |        |                          Reduce Output Operator [RS_122]
+                           |        |                          Reduce Output Operator [RS_104]
                            |        |                             key expressions:_col0 (type: int)
                            |        |                             Map-reduce partition columns:_col0 (type: int)
                            |        |                             sort order:+
                            |        |                             Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                            |        |                             value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int)
-                           |        |                             Select Operator [SEL_113]
+                           |        |                             Select Operator [SEL_97]
                            |        |                                outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                            |        |                                Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |        |                                Filter Operator [FIL_255]
+                           |        |                                Filter Operator [FIL_228]
                            |        |                                   predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                            |        |                                   Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |        |                                   TableScan [TS_111]
+                           |        |                                   TableScan [TS_95]
                            |        |                                      alias:item
                            |        |                                      Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 45 [CONTAINS]
-                           |           Reduce Output Operator [RS_163]
+                           |           Reduce Output Operator [RS_139]
                            |              key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |              Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |              sort order:+++++
                            |              Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                            |              value expressions:_col5 (type: bigint), _col6 (type: double)
-                           |              Group By Operator [GBY_162]
+                           |              Group By Operator [GBY_138]
                            |                 aggregations:["sum(_col5)","sum(_col6)"]
                            |                 keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                            |                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |                 Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                           |                 Select Operator [SEL_159]
+                           |                 Select Operator [SEL_135]
                            |                    outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                            |                    Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                           |                    Merge Join Operator [MERGEJOIN_279]
+                           |                    Merge Join Operator [MERGEJOIN_252]
                            |                    |  condition map:[{"":"Left Outer Join0 to 1"}]
                            |                    |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                            |                    |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                            |                    |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                            |                    |<-Map 48 [SIMPLE_EDGE]
-                           |                    |  Reduce Output Operator [RS_157]
+                           |                    |  Reduce Output Operator [RS_133]
                            |                    |     key expressions:_col1 (type: int), _col0 (type: int)
                            |                    |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                            |                    |     sort order:++
                            |                    |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                    |     value expressions:_col2 (type: int), _col3 (type: decimal(7,2))
-                           |                    |     Select Operator [SEL_145]
+                           |                    |     Select Operator [SEL_125]
                            |                    |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                    |        TableScan [TS_144]
+                           |                    |        TableScan [TS_124]
                            |                    |           alias:web_returns
                            |                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                    |<-Reducer 44 [SIMPLE_EDGE]
-                           |                       Reduce Output Operator [RS_156]
+                           |                       Reduce Output Operator [RS_132]
                            |                          key expressions:_col2 (type: int), _col1 (type: int)
                            |                          Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                            |                          sort order:++
                            |                          Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |                          value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                           |                          Merge Join Operator [MERGEJOIN_278]
+                           |                          Merge Join Operator [MERGEJOIN_251]
                            |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                          |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                            |                          |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            |                          |<-Map 47 [SIMPLE_EDGE]
-                           |                          |  Reduce Output Operator [RS_154]
+                           |                          |  Reduce Output Operator [RS_130]
                            |                          |     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
                            |                          |     value expressions:2001 (type: int)
-                           |                          |     Select Operator [SEL_143]
+                           |                          |     Select Operator [SEL_123]
                            |                          |        outputColumnNames:["_col0"]
                            |                          |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                          |        Filter Operator [FIL_260]
+                           |                          |        Filter Operator [FIL_233]
                            |                          |           predicate:((d_year = 2001) and d_date_sk is not null) (type: boolean)
                            |                          |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                          |           TableScan [TS_141]
+                           |                          |           TableScan [TS_121]
                            |                          |              alias:date_dim
                            |                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |                          |<-Reducer 43 [SIMPLE_EDGE]
-                           |                             Reduce Output Operator [RS_152]
+                           |                             Reduce Output Operator [RS_129]
                            |                                key expressions:_col0 (type: int)
                            |                                Map-reduce partition columns:_col0 (type: int)
                            |                                sort order:+
                            |                                Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |                                value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                           |                                Merge Join Operator [MERGEJOIN_277]
+                           |                                Merge Join Operator [MERGEJOIN_250]
                            |                                |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                                |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                            |                                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                            |                                |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                            |                                |<-Map 42 [SIMPLE_EDGE]
-                           |                                |  Reduce Output Operator [RS_147]
+                           |                                |  Reduce Output Operator [RS_126]
                            |                                |     key expressions:_col1 (type: int)
                            |                                |     Map-reduce partition columns:_col1 (type: int)
                            |                                |     sort order:+
                            |                                |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2))
-                           |                                |     Select Operator [SEL_137]
+                           |                                |     Select Operator [SEL_117]
                            |                                |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            |                                |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                |        Filter Operator [FIL_258]
+                           |                                |        Filter Operator [FIL_231]
                            |                                |           predicate:(ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean)
                            |                                |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                                |           TableScan [TS_135]
+                           |                                |           TableScan [TS_115]
                            |                                |              alias:web_sales
                            |                                |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                                |<-Map 46 [SIMPLE_EDGE]
-                           |                                   Reduce Output Operator [RS_149]
+                           |                                   Reduce Output Operator [RS_127]
                            |                                      key expressions:_col0 (type: int)
                            |                                      Map-reduce partition columns:_col0 (type: int)
                            |                                      sort order:+
                            |                                      Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                            |                                      value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int)
-                           |                                      Select Operator [SEL_140]
+                           |                                      Select Operator [SEL_120]
                            |                                         outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                            |                                         Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |                                         Filter Operator [FIL_259]
+                           |                                         Filter Operator [FIL_232]
                            |                                            predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                            |                                            Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                           |                                            TableScan [TS_138]
+                           |                                            TableScan [TS_118]
                            |                                               alias:item
                            |                                               Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 6 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_167]
+                              Reduce Output Operator [RS_142]
                                  key expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                  Map-reduce partition columns:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                  sort order:++++
                                  Statistics:Num rows: 461191 Data size: 662398546 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: int), _col5 (type: bigint), _col6 (type: double)
-                                 Group By Operator [GBY_81]
+                                 Group By Operator [GBY_69]
                                  |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                                  |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: int), KEY._col4 (type: int)
                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                  |  Statistics:Num rows: 461191 Data size: 662398546 Basic stats: COMPLETE Column stats: NONE
                                  |<-Union 5 [SIMPLE_EDGE]
                                     |<-Reducer 15 [CONTAINS]
-                                    |  Reduce Output Operator [RS_80]
+                                    |  Reduce Output Operator [RS_68]
                                     |     key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |     sort order:+++++
                                     |     Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col5 (type: bigint), _col6 (type: double)
-                                    |     Group By Operator [GBY_79]
+                                    |     Group By Operator [GBY_67]
                                     |        aggregations:["sum(_col5)","sum(_col6)"]
                                     |        keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                     |        Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                                    |        Select Operator [SEL_49]
+                                    |        Select Operator [SEL_41]
                                     |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                     |           Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                                    |           Merge Join Operator [MERGEJOIN_267]
+                                    |           Merge Join Operator [MERGEJOIN_240]
                                     |           |  condition map:[{"":"Left Outer Join0 to 1"}]
                                     |           |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                                     |           |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                                     |           |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                                     |           |<-Map 18 [SIMPLE_EDGE]
-                                    |           |  Reduce Output Operator [RS_47]
+                                    |           |  Reduce Output Operator [RS_39]
                                     |           |     key expressions:_col1 (type: int), _col0 (type: int)
                                     |           |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                                     |           |     sort order:++
                                     |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           |     value expressions:_col2 (type: int), _col3 (type: decimal(7,2))
-                                    |           |     Select Operator [SEL_35]
+                                    |           |     Select Operator [SEL_31]
                                     |           |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |           |        TableScan [TS_34]
+                                    |           |        TableScan [TS_30]
                                     |           |           alias:store_returns
                                     |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           |<-Reducer 14 [SIMPLE_EDGE]
-                                    |              Reduce Output Operator [RS_46]
+                                    |              Reduce Output Operator [RS_38]
                                     |                 key expressions:_col2 (type: int), _col1 (type: int)
                                     |                 Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                                     |                 sort order:++
                                     |                 Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                     |                 value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                                    |                 Merge Join Operator [MERGEJOIN_266]
+                                    |                 Merge Join Operator [MERGEJOIN_239]
                                     |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                 |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                                     |                 |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Map 17 [SIMPLE_EDGE]
-                                    |                 |  Reduce Output Operator [RS_44]
+                                    |                 |  Reduce Output Operator [RS_36]
                                     |                 |     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
                                     |                 |     value expressions:2002 (type: int)
-                                    |                 |     Select Operator [SEL_33]
+                                    |                 |     Select Operator [SEL_29]
                                     |                 |        outputColumnNames:["_col0"]
                                     |                 |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |        Filter Operator [FIL_244]
+                                    |                 |        Filter Operator [FIL_217]
                                     |                 |           predicate:((d_year = 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_31]
+                                    |                 |           TableScan [TS_27]
                                     |                 |              alias:date_dim
                                     |                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Reducer 13 [SIMPLE_EDGE]
-                                    |                    Reduce Output Operator [RS_42]
+                                    |                    Reduce Output Operator [RS_35]
                                     |                       key expressions:_col0 (type: int)
                                     |                       Map-reduce partition columns:_col0 (type: int)
                                     |                       sort order:+
                                     |                       Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |                       value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                                    |                       Merge Join Operator [MERGEJOIN_265]
+                                    |                       Merge Join Operator [MERGEJOIN_238]
                                     |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                       |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                       |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                                     |                       |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 12 [SIMPLE_EDGE]
-                                    |                       |  Reduce Output Operator [RS_37]
+                                    |                       |  Reduce Output Operator [RS_32]
                                     |                       |     key expressions:_col1 (type: int)
                                     |                       |     Map-reduce partition columns:_col1 (type: int)
                                     |                       |     sort order:+
                                     |                       |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                       |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2))
-                                    |                       |     Select Operator [SEL_27]
+                                    |                       |     Select Operator [SEL_23]
                                     |                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                     |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                       |        Filter Operator [FIL_242]
+                                    |                       |        Filter Operator [FIL_215]
                                     |                       |           predicate:(ss_item_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_25]
+                                    |                       |           TableScan [TS_21]
                                     |                       |              alias:store_sales
                                     |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                       |<-Map 16 [SIMPLE_EDGE]
-                                    |                          Reduce Output Operator [RS_39]
+                                    |                          Reduce Output Operator [RS_33]
                                     |                             key expressions:_col0 (type: int)
                                     |                             Map-reduce partition columns:_col0 (type: int)
                                     |                             sort order:+
                                     |                             Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                     |                             value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int)
-                                    |                             Select Operator [SEL_30]
+                                    |                             Select Operator [SEL_26]
                                     |                                outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                                     |                                Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |                                Filter Operator [FIL_243]
+                                    |                                Filter Operator [FIL_216]
                                     |                                   predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                                     |                                   Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   TableScan [TS_28]
+                                    |                                   TableScan [TS_24]
                                     |                                      alias:item
                                     |                                      Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 22 [CONTAINS]
-                                    |  Reduce Output Operator [RS_80]
+                                    |  Reduce Output Operator [RS_68]
                                     |     key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |     sort order:+++++
                                     |     Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col5 (type: bigint), _col6 (type: double)
-                                    |     Group By Operator [GBY_79]
+                                    |     Group By Operator [GBY_67]
                                     |        aggregations:["sum(_col5)","sum(_col6)"]
                                     |        keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                     |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                     |        Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                                    |        Select Operator [SEL_76]
+                                    |        Select Operator [SEL_64]
                                     |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                     |           Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                                    |           Merge Join Operator [MERGEJOIN_270]
+                                    |           Merge Join Operator [MERGEJOIN_243]
                                     |           |  condition map:[{"":"Left Outer Join0 to 1"}]
                                     |           |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                                     |           |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                                     |           |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                                     |           |<-Map 25 [SIMPLE_EDGE]
-                                    |           |  Reduce Output Operator [RS_74]
+                                    |           |  Reduce Output Operator [RS_62]
                                     |           |     key expressions:_col1 (type: int), _col0 (type: int)
                                     |           |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                                     |           |     sort order:++
                                     |           |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           |     value expressions:_col2 (type: int), _col3 (type: decimal(7,2))
-                                    |           |     Select Operator [SEL_62]
+                                    |           |     Select Operator [SEL_54]
                                     |           |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |           |        TableScan [TS_61]
+                                    |           |        TableScan [TS_53]
                                     |           |           alias:web_returns
                                     |           |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |           |<-Reducer 21 [SIMPLE_EDGE]
-                                    |              Reduce Output Operator [RS_73]
+                                    |              Reduce Output Operator [RS_61]
                                     |                 key expressions:_col2 (type: int), _col1 (type: int)
                                     |                 Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                                     |                 sort order:++
                                     |                 Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                     |                 value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                                    |                 Merge Join Operator [MERGEJOIN_269]
+                                    |                 Merge Join Operator [MERGEJOIN_242]
                                     |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                 |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                                     |                 |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Map 24 [SIMPLE_EDGE]
-                                    |                 |  Reduce Output Operator [RS_71]
+                                    |                 |  Reduce Output Operator [RS_59]
                                     |                 |     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
                                     |                 |     value expressions:2002 (type: int)
-                                    |                 |     Select Operator [SEL_60]
+                                    |                 |     Select Operator [SEL_52]
                                     |                 |        outputColumnNames:["_col0"]
                                     |                 |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                    |                 |        Filter Operator [FIL_248]
+                                    |                 |        Filter Operator [FIL_221]
                                     |                 |           predicate:((d_year = 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_58]
+                                    |                 |           TableScan [TS_50]
                                     |                 |              alias:date_dim
                                     |                 |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |                 |<-Reducer 20 [SIMPLE_EDGE]
-                                    |                    Reduce Output Operator [RS_69]
+                                    |                    Reduce Output Operator [RS_58]
                                     |                       key expressions:_col0 (type: int)
                                     |                       Map-reduce partition columns:_col0 (type: int)
                                     |                       sort order:+
                                     |                       Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |                       value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                                    |                       Merge Join Operator [MERGEJOIN_268]
+                                    |                       Merge Join Operator [MERGEJOIN_241]
                                     |                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                       |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                       |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                                     |                       |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |                       |<-Map 19 [SIMPLE_EDGE]
-                                    |                       |  Reduce Output Operator [RS_64]
+                                    |                       |  Reduce Output Operator [RS_55]
                                     |                       |     key expressions:_col1 (type: int)
                                     |                       |     Map-reduce partition columns:_col1 (type: int)
                                     |                       |     sort order:+
                                     |                       |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                       |     value expressions:_col0 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2))
-                                    |                       |     Select Operator [SEL_54]
+                                    |                       |     Select Operator [SEL_46]
                                     |                       |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                     |                       |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                       |        Filter Operator [FIL_246]
+                                    |                       |        Filter Operator [FIL_219]
                                     |                       |           predicate:(ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean)
                                     |                       |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                       |           TableScan [TS_52]
+                                    |                       |           TableScan [TS_44]
                                     |                       |              alias:web_sales
                                     |                       |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                       |<-Map 23 [SIMPLE_EDGE]
-                                    |                          Reduce Output Operator [RS_66]
+                                    |                          Reduce Output Operator [RS_56]
                                     |                             key expressions:_col0 (type: int)
                                     |                             Map-reduce partition columns:_col0 (type: int)
                                     |                             sort order:+
                                     |                             Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                     |                             value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int)
-                                    |                             Select Operator [SEL_57]
+                                    |                             Select Operator [SEL_49]
                                     |                                outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                                     |                                Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |                                Filter Operator [FIL_247]
+                                    |                                Filter Operator [FIL_220]
                                     |                                   predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                                     |                                   Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   TableScan [TS_55]
+                                    |                                   TableScan [TS_47]
                                     |                                      alias:item
                                     |                                      Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [CONTAINS]
-                                       Reduce Output Operator [RS_80]
+                                       Reduce Output Operator [RS_68]
                                           key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                           Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                           sort order:+++++
                                           Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col5 (type: bigint), _col6 (type: double)
-                                          Group By Operator [GBY_79]
+                                          Group By Operator [GBY_67]
                                              aggregations:["sum(_col5)","sum(_col6)"]
                                              keys:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int)
                                              outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                              Statistics:Num rows: 922383 Data size: 1324798530 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_24]
+                                             Select Operator [SEL_20]
                                                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                 Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_264]
+                                                Merge Join Operator [MERGEJOIN_237]
                                                 |  condition map:[{"":"Left Outer Join0 to 1"}]
                                                 |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                                                 |  outputColumnNames:["_col3","_col4","_col6","_col7","_col8","_col10","_col12","_col15","_col16"]
                                                 |  Statistics:Num rows: 307461 Data size: 441599510 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 11 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_22]
+                                                |  Reduce Output Operator [RS_18]
                                                 |     key expressions:_col1 (type: int), _col0 (type: int)
                                                 |     Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                                                 |     sort order:++
@@ -645,19 +645,19 @@ Stage-0
                                                 |           alias:catalog_returns
                                                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |<-Reducer 3 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_21]
+                                                   Reduce Output Operator [RS_17]
                                                       key expressions:_col2 (type: int), _col1 (type: int)
                                                       Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                                                       sort order:++
                                                       Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int), _col12 (type: int)
-                                                      Merge Join Operator [MERGEJOIN_263]
+                                                      Merge Join Operator [MERGEJOIN_236]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10","_col12"]
                                                       |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 10 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_19]
+                                                      |  Reduce Output Operator [RS_15]
                                                       |     key expressions:_col0 (type: int)
                                                       |     Map-reduce partition columns:_col0 (type: int)
                                                       |     sort order:+
@@ -666,26 +666,26 @@ Stage-0
                                                       |     Select Operator [SEL_8]
                                                       |        outputColumnNames:["_col0"]
                                                       |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_240]
+                                                      |        Filter Operator [FIL_213]
                                                       |           predicate:((d_year = 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_6]
                                                       |              alias:date_dim
                                                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 2 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_17]
+                                                         Reduce Output Operator [RS_14]
                                                             key expressions:_col0 (type: int)
                                                             Map-reduce partition columns:_col0 (type: int)
                                                             sort order:+
                                                             Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: decimal(7,2)), _col6 (type: int), _col7 (type: int), _col8 (type: int), _col10 (type: int)
-                                                            Merge Join Operator [MERGEJOIN_262]
+                                                            Merge Join Operator [MERGEJOIN_235]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
                                                             |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                                             |<-Map 1 [SIMPLE_EDGE]
-                                                            |  Reduce Output Operator [RS_12]
+                                                            |  Reduce Output Operator [RS_11]
                                                             |     key expressions:_col1 (type: int)
                                                             |     Map-reduce partition columns:_col1 (type: int)
                                                             |     sort order:+
@@ -694,14 +694,14 @@ Stage-0
                                                             |     Select Operator [SEL_2]
                                                             |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                             |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            |        Filter Operator [FIL_238]
+                                                            |        Filter Operator [FIL_211]
                                                             |           predicate:(cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean)
                                                             |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                             |           TableScan [TS_0]
                                                             |              alias:catalog_sales
                                                             |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                             |<-Map 9 [SIMPLE_EDGE]
-                                                               Reduce Output Operator [RS_14]
+                                                               Reduce Output Operator [RS_12]
                                                                   key expressions:_col0 (type: int)
                                                                   Map-reduce partition columns:_col0 (type: int)
                                                                   sort order:+
@@ -710,7 +710,7 @@ Stage-0
                                                                   Select Operator [SEL_5]
                                                                      outputColumnNames:["_col0","_col1","_col2","_col3","_col5"]
                                                                      Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                                                     Filter Operator [FIL_239]
+                                                                     Filter Operator [FIL_212]
                                                                         predicate:((((((i_category = 'Sports') and i_item_sk is not null) and i_category_id is not null) and i_manufact_id is not null) and i_class_id is not null) and i_brand_id is not null) (type: boolean)
                                                                         Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                                                         TableScan [TS_3]


[14/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query76.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query76.q.out b/ql/src/test/results/clientpositive/perf/query76.q.out
index 0b974ef..e540ee7 100644
--- a/ql/src/test/results/clientpositive/perf/query76.q.out
+++ b/ql/src/test/results/clientpositive/perf/query76.q.out
@@ -19,210 +19,210 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_71]
+         File Output Operator [FS_59]
             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_70]
+            Limit [LIM_58]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_69]
+               Select Operator [SEL_57]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                |  Statistics:Num rows: 838530 Data size: 1204362280 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_68]
+                  Reduce Output Operator [RS_56]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                      sort order:+++++
                      Statistics:Num rows: 838530 Data size: 1204362280 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col5 (type: bigint), _col6 (type: decimal(17,2))
-                     Group By Operator [GBY_66]
+                     Group By Operator [GBY_54]
                      |  aggregations:["count(VALUE._col0)","sum(VALUE._col1)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: int), KEY._col3 (type: int), KEY._col4 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                      |  Statistics:Num rows: 838530 Data size: 1204362280 Basic stats: COMPLETE Column stats: NONE
                      |<-Union 4 [SIMPLE_EDGE]
                         |<-Reducer 11 [CONTAINS]
-                        |  Reduce Output Operator [RS_65]
+                        |  Reduce Output Operator [RS_53]
                         |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |     sort order:+++++
                         |     Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col5 (type: bigint), _col6 (type: decimal(17,2))
-                        |     Group By Operator [GBY_64]
+                        |     Group By Operator [GBY_52]
                         |        aggregations:["count()","sum(_col5)"]
                         |        keys:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         |        Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
-                        |        Select Operator [SEL_39]
+                        |        Select Operator [SEL_31]
                         |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |           Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                        |           Merge Join Operator [MERGEJOIN_99]
+                        |           Merge Join Operator [MERGEJOIN_87]
                         |           |  condition map:[{"":"Inner Join 0 to 1"}]
                         |           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |           |  outputColumnNames:["_col3","_col5","_col7","_col8"]
                         |           |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                         |           |<-Map 13 [SIMPLE_EDGE]
-                        |           |  Reduce Output Operator [RS_37]
+                        |           |  Reduce Output Operator [RS_29]
                         |           |     key expressions:_col0 (type: int)
                         |           |     Map-reduce partition columns:_col0 (type: int)
                         |           |     sort order:+
                         |           |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |           |     value expressions:_col1 (type: int), _col2 (type: int)
-                        |           |     Select Operator [SEL_28]
+                        |           |     Select Operator [SEL_24]
                         |           |        outputColumnNames:["_col0","_col1","_col2"]
                         |           |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |           |        Filter Operator [FIL_92]
+                        |           |        Filter Operator [FIL_80]
                         |           |           predicate:d_date_sk is not null (type: boolean)
                         |           |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |           |           TableScan [TS_26]
+                        |           |           TableScan [TS_22]
                         |           |              alias:date_dim
                         |           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |           |<-Reducer 10 [SIMPLE_EDGE]
-                        |              Reduce Output Operator [RS_35]
+                        |              Reduce Output Operator [RS_28]
                         |                 key expressions:_col0 (type: int)
                         |                 Map-reduce partition columns:_col0 (type: int)
                         |                 sort order:+
                         |                 Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                         |                 value expressions:_col3 (type: decimal(7,2)), _col5 (type: string)
-                        |                 Merge Join Operator [MERGEJOIN_98]
+                        |                 Merge Join Operator [MERGEJOIN_86]
                         |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                         |                 |  outputColumnNames:["_col0","_col3","_col5"]
                         |                 |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                         |                 |<-Map 12 [SIMPLE_EDGE]
-                        |                 |  Reduce Output Operator [RS_32]
+                        |                 |  Reduce Output Operator [RS_26]
                         |                 |     key expressions:_col0 (type: int)
                         |                 |     Map-reduce partition columns:_col0 (type: int)
                         |                 |     sort order:+
                         |                 |     Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                         |                 |     value expressions:_col1 (type: string)
-                        |                 |     Select Operator [SEL_25]
+                        |                 |     Select Operator [SEL_21]
                         |                 |        outputColumnNames:["_col0","_col1"]
                         |                 |        Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                        |                 |        Filter Operator [FIL_91]
+                        |                 |        Filter Operator [FIL_79]
                         |                 |           predicate:i_item_sk is not null (type: boolean)
                         |                 |           Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                        |                 |           TableScan [TS_23]
+                        |                 |           TableScan [TS_19]
                         |                 |              alias:item
                         |                 |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                         |                 |<-Map 9 [SIMPLE_EDGE]
-                        |                    Reduce Output Operator [RS_30]
+                        |                    Reduce Output Operator [RS_25]
                         |                       key expressions:_col1 (type: int)
                         |                       Map-reduce partition columns:_col1 (type: int)
                         |                       sort order:+
                         |                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                       value expressions:_col0 (type: int), _col3 (type: decimal(7,2))
-                        |                       Select Operator [SEL_22]
+                        |                       Select Operator [SEL_18]
                         |                          outputColumnNames:["_col0","_col1","_col3"]
                         |                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          Filter Operator [FIL_90]
+                        |                          Filter Operator [FIL_78]
                         |                             predicate:((ws_item_sk is not null and ws_web_page_sk is null) and ws_sold_date_sk is not null) (type: boolean)
                         |                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                             TableScan [TS_20]
+                        |                             TableScan [TS_16]
                         |                                alias:web_sales
                         |                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |<-Reducer 16 [CONTAINS]
-                        |  Reduce Output Operator [RS_65]
+                        |  Reduce Output Operator [RS_53]
                         |     key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |     Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |     sort order:+++++
                         |     Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col5 (type: bigint), _col6 (type: decimal(17,2))
-                        |     Group By Operator [GBY_64]
+                        |     Group By Operator [GBY_52]
                         |        aggregations:["count()","sum(_col5)"]
                         |        keys:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         |        Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
-                        |        Select Operator [SEL_61]
+                        |        Select Operator [SEL_49]
                         |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         |           Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                        |           Merge Join Operator [MERGEJOIN_101]
+                        |           Merge Join Operator [MERGEJOIN_89]
                         |           |  condition map:[{"":"Inner Join 0 to 1"}]
                         |           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |           |  outputColumnNames:["_col3","_col5","_col7","_col8"]
                         |           |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                         |           |<-Map 18 [SIMPLE_EDGE]
-                        |           |  Reduce Output Operator [RS_59]
+                        |           |  Reduce Output Operator [RS_47]
                         |           |     key expressions:_col0 (type: int)
                         |           |     Map-reduce partition columns:_col0 (type: int)
                         |           |     sort order:+
                         |           |     Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |           |     value expressions:_col1 (type: int), _col2 (type: int)
-                        |           |     Select Operator [SEL_50]
+                        |           |     Select Operator [SEL_42]
                         |           |        outputColumnNames:["_col0","_col1","_col2"]
                         |           |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |           |        Filter Operator [FIL_95]
+                        |           |        Filter Operator [FIL_83]
                         |           |           predicate:d_date_sk is not null (type: boolean)
                         |           |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                        |           |           TableScan [TS_48]
+                        |           |           TableScan [TS_40]
                         |           |              alias:date_dim
                         |           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |           |<-Reducer 15 [SIMPLE_EDGE]
-                        |              Reduce Output Operator [RS_57]
+                        |              Reduce Output Operator [RS_46]
                         |                 key expressions:_col0 (type: int)
                         |                 Map-reduce partition columns:_col0 (type: int)
                         |                 sort order:+
                         |                 Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                         |                 value expressions:_col3 (type: decimal(7,2)), _col5 (type: string)
-                        |                 Merge Join Operator [MERGEJOIN_100]
+                        |                 Merge Join Operator [MERGEJOIN_88]
                         |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                 |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                         |                 |  outputColumnNames:["_col0","_col3","_col5"]
                         |                 |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                         |                 |<-Map 14 [SIMPLE_EDGE]
-                        |                 |  Reduce Output Operator [RS_52]
+                        |                 |  Reduce Output Operator [RS_43]
                         |                 |     key expressions:_col2 (type: int)
                         |                 |     Map-reduce partition columns:_col2 (type: int)
                         |                 |     sort order:+
                         |                 |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                 |     value expressions:_col0 (type: int), _col3 (type: decimal(7,2))
-                        |                 |     Select Operator [SEL_44]
+                        |                 |     Select Operator [SEL_36]
                         |                 |        outputColumnNames:["_col0","_col2","_col3"]
                         |                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                 |        Filter Operator [FIL_93]
+                        |                 |        Filter Operator [FIL_81]
                         |                 |           predicate:((cs_item_sk is not null and cs_warehouse_sk is 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_42]
+                        |                 |           TableScan [TS_34]
                         |                 |              alias:catalog_sales
                         |                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                 |<-Map 17 [SIMPLE_EDGE]
-                        |                    Reduce Output Operator [RS_54]
+                        |                    Reduce Output Operator [RS_44]
                         |                       key expressions:_col0 (type: int)
                         |                       Map-reduce partition columns:_col0 (type: int)
                         |                       sort order:+
                         |                       Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                         |                       value expressions:_col1 (type: string)
-                        |                       Select Operator [SEL_47]
+                        |                       Select Operator [SEL_39]
                         |                          outputColumnNames:["_col0","_col1"]
                         |                          Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                        |                          Filter Operator [FIL_94]
+                        |                          Filter Operator [FIL_82]
                         |                             predicate:i_item_sk is not null (type: boolean)
                         |                             Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                        |                             TableScan [TS_45]
+                        |                             TableScan [TS_37]
                         |                                alias:item
                         |                                Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 3 [CONTAINS]
-                           Reduce Output Operator [RS_65]
+                           Reduce Output Operator [RS_53]
                               key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                               sort order:+++++
                               Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col5 (type: bigint), _col6 (type: decimal(17,2))
-                              Group By Operator [GBY_64]
+                              Group By Operator [GBY_52]
                                  aggregations:["count()","sum(_col5)"]
                                  keys:_col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: string)
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                  Statistics:Num rows: 1677060 Data size: 2408724561 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_19]
+                                 Select Operator [SEL_15]
                                     outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_97]
+                                    Merge Join Operator [MERGEJOIN_85]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |  outputColumnNames:["_col3","_col5","_col7","_col8"]
                                     |  Statistics:Num rows: 559020 Data size: 802908187 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:+
@@ -231,26 +231,26 @@ Stage-0
                                     |     Select Operator [SEL_8]
                                     |        outputColumnNames:["_col0","_col1","_col2"]
                                     |        Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_89]
+                                    |        Filter Operator [FIL_77]
                                     |           predicate:d_date_sk is not null (type: boolean)
                                     |           Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_6]
                                     |              alias:date_dim
                                     |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 2 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_15]
+                                       Reduce Output Operator [RS_12]
                                           key expressions:_col0 (type: int)
                                           Map-reduce partition columns:_col0 (type: int)
                                           sort order:+
                                           Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: decimal(7,2)), _col5 (type: string)
-                                          Merge Join Operator [MERGEJOIN_96]
+                                          Merge Join Operator [MERGEJOIN_84]
                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                           |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                           |  outputColumnNames:["_col0","_col3","_col5"]
                                           |  Statistics:Num rows: 508200 Data size: 729916518 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:+
@@ -259,14 +259,14 @@ Stage-0
                                           |     Select Operator [SEL_2]
                                           |        outputColumnNames:["_col0","_col1","_col3"]
                                           |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                          |        Filter Operator [FIL_87]
+                                          |        Filter Operator [FIL_75]
                                           |           predicate:((ss_addr_sk is null and ss_item_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 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:+
@@ -275,7 +275,7 @@ Stage-0
                                                 Select Operator [SEL_5]
                                                    outputColumnNames:["_col0","_col1"]
                                                    Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                   Filter Operator [FIL_88]
+                                                   Filter Operator [FIL_76]
                                                       predicate:i_item_sk is not null (type: boolean)
                                                       Statistics:Num rows: 462000 Data size: 663560457 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/query79.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query79.q.out b/ql/src/test/results/clientpositive/perf/query79.q.out
index a69f717..a0d5a51 100644
--- a/ql/src/test/results/clientpositive/perf/query79.q.out
+++ b/ql/src/test/results/clientpositive/perf/query79.q.out
@@ -17,83 +17,83 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_45]
+         File Output Operator [FS_37]
             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_44]
+            Limit [LIM_36]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 86000 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_43]
+               Select Operator [SEL_35]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_42]
+                  Reduce Output Operator [RS_34]
                      key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string), _col5 (type: decimal(17,2))
                      sort order:++++
                      Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col3 (type: int), _col4 (type: decimal(17,2))
-                     Select Operator [SEL_41]
+                     Select Operator [SEL_33]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_68]
+                        Merge Join Operator [MERGEJOIN_60]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                         |  outputColumnNames:["_col0","_col2","_col3","_col4","_col6","_col7"]
                         |  Statistics:Num rows: 88000001 Data size: 75681779077 Basic stats: COMPLETE Column stats: NONE
                         |<-Map 11 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_39]
+                        |  Reduce Output Operator [RS_31]
                         |     key expressions:_col0 (type: int)
                         |     Map-reduce partition columns:_col0 (type: int)
                         |     sort order:+
                         |     Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col1 (type: string), _col2 (type: string)
-                        |     Select Operator [SEL_35]
+                        |     Select Operator [SEL_29]
                         |        outputColumnNames:["_col0","_col1","_col2"]
                         |        Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                        |        Filter Operator [FIL_64]
+                        |        Filter Operator [FIL_56]
                         |           predicate:c_customer_sk is not null (type: boolean)
                         |           Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
-                        |           TableScan [TS_33]
+                        |           TableScan [TS_27]
                         |              alias:customer
                         |              Statistics:Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_37]
+                           Reduce Output Operator [RS_30]
                               key expressions:_col1 (type: int)
                               Map-reduce partition columns:_col1 (type: int)
                               sort order:+
                               Statistics:Num rows: 12152 Data size: 13599051 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: int), _col2 (type: string), _col3 (type: decimal(17,2)), _col4 (type: decimal(17,2))
-                              Select Operator [SEL_31]
+                              Select Operator [SEL_25]
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                  Statistics:Num rows: 12152 Data size: 13599051 Basic stats: COMPLETE Column stats: NONE
-                                 Group By Operator [GBY_30]
+                                 Group By Operator [GBY_24]
                                  |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                                  |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: string)
                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                  |  Statistics:Num rows: 12152 Data size: 13599051 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_29]
+                                    Reduce Output Operator [RS_23]
                                        key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                        Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string)
                                        sort order:++++
                                        Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col4 (type: decimal(17,2)), _col5 (type: decimal(17,2))
-                                       Group By Operator [GBY_28]
+                                       Group By Operator [GBY_22]
                                           aggregations:["sum(_col6)","sum(_col7)"]
                                           keys:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col13 (type: string)
                                           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                           Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
-                                          Select Operator [SEL_27]
+                                          Select Operator [SEL_21]
                                              outputColumnNames:["_col1","_col3","_col5","_col13","_col6","_col7"]
                                              Statistics:Num rows: 24305 Data size: 27199223 Basic stats: COMPLETE Column stats: NONE
-                                             Merge Join Operator [MERGEJOIN_67]
+                                             Merge Join Operator [MERGEJOIN_59]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col1","_col3","_col5","_col6","_col7","_col13"]
                                              |  Statistics:Num rows: 24305 Data size: 27199223 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:+
@@ -101,26 +101,26 @@ Stage-0
                                              |     Select Operator [SEL_11]
                                              |        outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 6000 Data size: 642000 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_63]
+                                             |        Filter Operator [FIL_55]
                                              |           predicate:(((hd_dep_count = 8) or (hd_vehicle_count > 0)) and hd_demo_sk is not null) (type: boolean)
                                              |           Statistics:Num rows: 6000 Data size: 642000 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: 22096 Data size: 24726566 Basic stats: COMPLETE Column stats: NONE
                                                    value expressions:_col1 (type: int), _col3 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col13 (type: string)
-                                                   Merge Join Operator [MERGEJOIN_66]
+                                                   Merge Join Operator [MERGEJOIN_58]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col1","_col2","_col3","_col5","_col6","_col7","_col13"]
                                                    |  Statistics:Num rows: 22096 Data size: 24726566 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:+
@@ -129,26 +129,26 @@ Stage-0
                                                    |     Select Operator [SEL_8]
                                                    |        outputColumnNames:["_col0","_col2"]
                                                    |        Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
-                                                   |        Filter Operator [FIL_62]
+                                                   |        Filter Operator [FIL_54]
                                                    |           predicate:(s_number_employees BETWEEN 200 AND 295 and s_store_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE
                                                    |           TableScan [TS_6]
                                                    |              alias:store
                                                    |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Reducer 2 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_18]
+                                                      Reduce Output Operator [RS_15]
                                                          key expressions:_col4 (type: int)
                                                          Map-reduce partition columns:_col4 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: int), _col6 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                         Merge Join Operator [MERGEJOIN_65]
+                                                         Merge Join Operator [MERGEJOIN_57]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 1 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_13]
+                                                         |  Reduce Output Operator [RS_12]
                                                          |     key expressions:_col0 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int)
                                                          |     sort order:+
@@ -157,14 +157,14 @@ Stage-0
                                                          |     Select Operator [SEL_2]
                                                          |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                         |        Filter Operator [FIL_60]
+                                                         |        Filter Operator [FIL_52]
                                                          |           predicate:(((ss_sold_date_sk is not null and ss_store_sk is not null) and ss_hdemo_sk is not null) and ss_customer_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:+
@@ -172,7 +172,7 @@ Stage-0
                                                                Select Operator [SEL_5]
                                                                   outputColumnNames:["_col0"]
                                                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                                  Filter Operator [FIL_61]
+                                                                  Filter Operator [FIL_53]
                                                                      predicate:(((d_dow = 1) and (d_year) IN (1998, 1999, 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_3]


[07/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join13.q.out b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
index b46de18..97c73f8 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) < 200.0) and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -95,32 +95,29 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator
-                          predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) is not null (type: boolean)
-                          Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                          Map Join Operator
-                            condition map:
-                                 Inner Join 0 to 1
-                            keys:
-                              0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-                              1 UDFToDouble(_col0) (type: double)
-                            outputColumnNames: _col1, _col2
-                            input vertices:
-                              1 Map 4
+                        Map Join Operator
+                          condition map:
+                               Inner Join 0 to 1
+                          keys:
+                            0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
+                            1 UDFToDouble(_col0) (type: double)
+                          outputColumnNames: _col1, _col2
+                          input vertices:
+                            1 Map 4
+                          Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
+                          Select Operator
+                            expressions: hash(_col2,_col1) (type: int)
+                            outputColumnNames: _col0
                             Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
-                            Select Operator
-                              expressions: hash(_col2,_col1) (type: int)
+                            Group By Operator
+                              aggregations: sum(_col0)
+                              mode: hash
                               outputColumnNames: _col0
-                              Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE
-                              Group By Operator
-                                aggregations: sum(_col0)
-                                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)
             Local Work:
               Map Reduce Local Work
         Reducer 2 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join16.q.out b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
index 6da1c50..ba6336a 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) and key is not null) and value is not null) (type: boolean)
+                    predicate: (((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 18 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) and key is not null) and value is not null) (type: boolean)
+                    predicate: (((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) (type: boolean)
                     Statistics: Num rows: 18 Data size: 191 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/spark/auto_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join2.q.out b/ql/src/test/results/clientpositive/spark/auto_join2.q.out
index 10b12a9..a885837 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join2.q.out
@@ -49,7 +49,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -88,31 +88,28 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator
-                          predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                          Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                          Map Join Operator
-                            condition map:
-                                 Inner Join 0 to 1
-                            keys:
-                              0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                              1 UDFToDouble(_col0) (type: double)
-                            outputColumnNames: _col0, _col3
-                            input vertices:
-                              1 Map 3
+                        Map Join Operator
+                          condition map:
+                               Inner Join 0 to 1
+                          keys:
+                            0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                            1 UDFToDouble(_col0) (type: double)
+                          outputColumnNames: _col0, _col3
+                          input vertices:
+                            1 Map 3
+                          Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
+                          Select Operator
+                            expressions: UDFToInteger(_col0) (type: int), _col3 (type: string)
+                            outputColumnNames: _col0, _col1
                             Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                            Select Operator
-                              expressions: UDFToInteger(_col0) (type: int), _col3 (type: string)
-                              outputColumnNames: _col0, _col1
+                            File Output Operator
+                              compressed: false
                               Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                              File Output Operator
-                                compressed: false
-                                Statistics: Num rows: 605 Data size: 6427 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
-                                    name: default.dest_j2
+                              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
+                                  name: default.dest_j2
             Local Work:
               Map Reduce Local Work
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_filters.q.out b/ql/src/test/results/clientpositive/spark/auto_join_filters.q.out
index 601b27d..84810d5 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_filters.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -300,7 +300,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table sm
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_input2
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -310,7 +310,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a LEFT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
@@ -320,7 +320,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a RIGHT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_nulls.q.out b/ql/src/test/results/clientpositive/spark/auto_join_nulls.q.out
index 0024b24..15f4791 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_nulls.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[15][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out b/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out
index e826380..2691eac 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out
@@ -48,7 +48,7 @@ STAGE PLANS:
                   alias: smalltable
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -113,26 +113,23 @@ STAGE PLANS:
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                  Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Map Join Operator
-                    condition map:
-                         Inner Join 0 to 1
-                    keys:
-                      0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                      1 UDFToDouble(_col0) (type: double)
-                    outputColumnNames: _col0, _col1, _col2
-                    input vertices:
-                      1 Map 4
+                Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  keys:
+                    0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                    1 UDFToDouble(_col0) (type: double)
+                  outputColumnNames: _col0, _col1, _col2
+                  input vertices:
+                    1 Map 4
+                  Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
+                  File Output Operator
+                    compressed: false
                     Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      Statistics: Num rows: 605 Data size: 6427 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
+                    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
 
   Stage: Stage-0
     Fetch Operator
@@ -196,7 +193,7 @@ STAGE PLANS:
                   alias: smalltable
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -214,7 +211,7 @@ STAGE PLANS:
                   alias: smalltable2
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -279,9 +276,16 @@ STAGE PLANS:
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                  Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  keys:
+                    0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                    1 UDFToDouble(_col0) (type: double)
+                  outputColumnNames: _col0, _col1, _col2
+                  input vertices:
+                    1 Map 4
+                  Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -290,28 +294,15 @@ STAGE PLANS:
                       1 UDFToDouble(_col0) (type: double)
                     outputColumnNames: _col0, _col1, _col2
                     input vertices:
-                      1 Map 4
-                    Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                      Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                          1 UDFToDouble(_col0) (type: double)
-                        outputColumnNames: _col0, _col1, _col2
-                        input vertices:
-                          1 Map 5
-                        Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
-                        File Output Operator
-                          compressed: false
-                          Statistics: Num rows: 665 Data size: 7069 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
+                      1 Map 5
+                    Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
+                    File Output Operator
+                      compressed: false
+                      Statistics: Num rows: 665 Data size: 7069 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
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out b/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out
index 4062faf..de135aa 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: smalltable
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -97,26 +97,23 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator
-                          predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                          Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                          Map Join Operator
-                            condition map:
-                                 Inner Join 0 to 1
-                            keys:
-                              0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                              1 UDFToDouble(_col0) (type: double)
-                            outputColumnNames: _col0, _col1, _col2
-                            input vertices:
-                              1 Map 3
+                        Map Join Operator
+                          condition map:
+                               Inner Join 0 to 1
+                          keys:
+                            0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                            1 UDFToDouble(_col0) (type: double)
+                          outputColumnNames: _col0, _col1, _col2
+                          input vertices:
+                            1 Map 3
+                          Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
+                          File Output Operator
+                            compressed: false
                             Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                            File Output Operator
-                              compressed: false
-                              Statistics: Num rows: 605 Data size: 6427 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
+                            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
             Local Work:
               Map Reduce Local Work
 
@@ -200,7 +197,7 @@ STAGE PLANS:
                   alias: smalltable
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -218,7 +215,7 @@ STAGE PLANS:
                   alias: smalltable2
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -257,9 +254,16 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator
-                          predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                          Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                        Map Join Operator
+                          condition map:
+                               Inner Join 0 to 1
+                          keys:
+                            0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                            1 UDFToDouble(_col0) (type: double)
+                          outputColumnNames: _col0, _col1, _col2
+                          input vertices:
+                            1 Map 3
+                          Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
                           Map Join Operator
                             condition map:
                                  Inner Join 0 to 1
@@ -268,28 +272,15 @@ STAGE PLANS:
                               1 UDFToDouble(_col0) (type: double)
                             outputColumnNames: _col0, _col1, _col2
                             input vertices:
-                              1 Map 3
-                            Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                            Filter Operator
-                              predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
-                              Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                              Map Join Operator
-                                condition map:
-                                     Inner Join 0 to 1
-                                keys:
-                                  0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                                  1 UDFToDouble(_col0) (type: double)
-                                outputColumnNames: _col0, _col1, _col2
-                                input vertices:
-                                  1 Map 4
-                                Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
-                                File Output Operator
-                                  compressed: false
-                                  Statistics: Num rows: 665 Data size: 7069 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
+                              1 Map 4
+                            Statistics: Num rows: 665 Data size: 7069 Basic stats: COMPLETE Column stats: NONE
+                            File Output Operator
+                              compressed: false
+                              Statistics: Num rows: 665 Data size: 7069 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
             Local Work:
               Map Reduce Local Work
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out b/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
index 659c305..f055a59 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
@@ -337,7 +337,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) > 100.0) and value is not null) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) > 100.0) and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 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/spark/auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/spark/auto_smb_mapjoin_14.q.out
index 0c96d4c..14c7328 100644
--- a/ql/src/test/results/clientpositive/spark/auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_smb_mapjoin_14.q.out
@@ -582,7 +582,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -713,7 +713,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -938,14 +938,11 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: int)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: int)
-                          Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -958,14 +955,11 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: int)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: int)
-                          Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -1271,7 +1265,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
index 89251b7..4b6affc 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
@@ -138,7 +138,7 @@ POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3out
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@bucket_medium@ds=2008-04-08
-Warning: Map Join MAPJOIN[32][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
@@ -627,7 +627,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[32][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket_big

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
index 0609bc8..41b2b0a 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
@@ -450,7 +450,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -475,7 +475,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -867,7 +867,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -892,7 +892,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out
index be42791..464def4 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out
@@ -721,7 +721,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -852,7 +852,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1075,13 +1075,10 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Spark HashTable Sink Operator
-                          keys:
-                            0 _col0 (type: int)
-                            1 _col0 (type: int)
+                      Spark HashTable Sink Operator
+                        keys:
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
             Local Work:
               Map Reduce Local Work
 
@@ -1103,27 +1100,24 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col0 (type: int)
-                            1 _col0 (type: int)
-                          input vertices:
-                            1 Map 3
-                          Statistics: Num rows: 11 Data size: 77 Basic stats: COMPLETE Column stats: NONE
-                          Group By Operator
-                            aggregations: count()
-                            mode: hash
-                            outputColumnNames: _col0
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
+                        input vertices:
+                          1 Map 3
+                        Statistics: Num rows: 11 Data size: 77 Basic stats: COMPLETE Column stats: NONE
+                        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)
             Local Work:
               Map Reduce Local Work
         Reducer 2 
@@ -1506,7 +1500,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2426,7 +2420,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2451,7 +2445,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2585,7 +2579,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2610,7 +2604,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3269,7 +3263,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3294,7 +3288,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
index a54b03c..31908d7 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
@@ -268,7 +268,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -291,7 +291,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -349,7 +349,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 2) and (key > 1)) and key is not null) (type: boolean)
+                    predicate: ((key > 2) and (key > 1)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -372,7 +372,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 1) and (key > 2)) and key is not null) (type: boolean)
+                    predicate: ((key > 1) and (key > 2)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -670,7 +670,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and UDFToDouble(value) is not null) (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: value (type: string)
@@ -706,7 +706,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
index ded106c..0b64a87 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
@@ -459,7 +459,7 @@ STAGE PLANS:
                   alias: test_table1
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and ((key = 0) or (key = 5))) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and ((key = 0) or (key = 5))) (type: boolean)
                     Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -484,7 +484,7 @@ STAGE PLANS:
                   alias: test_table2
                   Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and ((key = 0) or (key = 5))) and key is not null) (type: boolean)
+                    predicate: ((key < 8) and ((key = 0) or (key = 5))) (type: boolean)
                     Statistics: Num rows: 28 Data size: 245 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cross_join.q.out b/ql/src/test/results/clientpositive/spark/cross_join.q.out
index d136913..7c8118c 100644
--- a/ql/src/test/results/clientpositive/spark/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/cross_join.q.out
@@ -203,7 +203,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src join src src2
@@ -271,7 +271,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src cross join src src2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out
index 5b03dcf..0656cd5 100644
--- a/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out
@@ -94,7 +94,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -198,7 +198,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[21][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
+Warning: Shuffle Join JOIN[19][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key
@@ -434,7 +434,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[23][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A  group by key) ss join
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out
index 93c502d..2d6eb38 100644
--- a/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -98,7 +98,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -205,7 +205,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[27][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key 
@@ -339,8 +339,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
@@ -460,7 +460,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[31][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
index b597ebd..9043fb1 100644
--- a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
@@ -932,14 +932,14 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
-                  outputColumnNames: _col0, _col1, _col3, _col4, _col5
+                  expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
+                  outputColumnNames: _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
                     predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
+                      expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
                       outputColumnNames: _col1, _col2, _col3, _col4, _col5
                       Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                       Reduce Output Operator
@@ -1015,14 +1015,14 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
-                  outputColumnNames: _col0, _col1, _col3, _col4, _col5
+                  expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col4 (type: double), _col5 (type: double)
+                  outputColumnNames: _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
                     predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: int), _col0 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
+                      expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type: double)
                       outputColumnNames: _col1, _col2, _col3, _col4, _col5
                       Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                       Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_position.q.out b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
index 81e4a1d..415703f 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
@@ -564,7 +564,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    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), substr(value, 5) (type: string)
@@ -586,7 +586,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    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: 6 Data size: 63 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
index fe124c6..57a6d59 100644
--- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
@@ -209,7 +209,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                       Filter Operator
-                        predicate: (_col1 is not null and UDFToDouble(_col1) is not null) (type: boolean)
+                        predicate: _col1 is not null (type: boolean)
                         Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                         Reduce Output Operator
                           key expressions: UDFToDouble(_col1) (type: double)
@@ -223,7 +223,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and UDFToDouble(value) is not null) (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join12.q.out b/ql/src/test/results/clientpositive/spark/join12.q.out
index cca05a9..2ad0a43 100644
--- a/ql/src/test/results/clientpositive/spark/join12.q.out
+++ b/ql/src/test/results/clientpositive/spark/join12.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join13.q.out b/ql/src/test/results/clientpositive/spark/join13.q.out
index 6ed8ca0..5b38f8c 100644
--- a/ql/src/test/results/clientpositive/spark/join13.q.out
+++ b/ql/src/test/results/clientpositive/spark/join13.q.out
@@ -77,7 +77,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) < 200.0) and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -98,15 +98,12 @@ STAGE PLANS:
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
+                  sort order: +
+                  Map-reduce partition columns: (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
                   Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-                    sort order: +
-                    Map-reduce partition columns: (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-                    Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: string), _col2 (type: string)
+                  value expressions: _col1 (type: string), _col2 (type: string)
         Reducer 3 
             Reduce Operator Tree:
               Join Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join16.q.out b/ql/src/test/results/clientpositive/spark/join16.q.out
index 2c40151..2496ec2 100644
--- a/ql/src/test/results/clientpositive/spark/join16.q.out
+++ b/ql/src/test/results/clientpositive/spark/join16.q.out
@@ -19,7 +19,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) and key is not null) and value is not null) (type: boolean)
+                    predicate: (((UDFToDouble(key) > 10.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) (type: boolean)
                     Statistics: Num rows: 18 Data size: 191 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -36,7 +36,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) and key is not null) and value is not null) (type: boolean)
+                    predicate: (((UDFToDouble(value) < 200.0) and (UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 18 Data size: 191 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/spark/join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join2.q.out b/ql/src/test/results/clientpositive/spark/join2.q.out
index 9ee6df0..2c6311b 100644
--- a/ql/src/test/results/clientpositive/spark/join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/join2.q.out
@@ -71,7 +71,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -93,15 +93,12 @@ STAGE PLANS:
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                Filter Operator
-                  predicate: (UDFToDouble(_col0) + UDFToDouble(_col1)) is not null (type: boolean)
+                Reduce Output Operator
+                  key expressions: (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
+                  sort order: +
+                  Map-reduce partition columns: (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                    sort order: +
-                    Map-reduce partition columns: (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double)
-                    Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string)
+                  value expressions: _col0 (type: string)
         Reducer 3 
             Reduce Operator Tree:
               Join Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
index e22cab5..b75d951 100644
--- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
@@ -301,7 +301,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain select *
 from part p1 join part p2 join part p3 on p2.p_partkey = 1 and p3.p_name = p2.p_name
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
index ae8cf04..e2886d3 100644
--- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
@@ -307,7 +307,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[16][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Work 'Reducer 3' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Work 'Reducer 3' is a cross product
 PREHOOK: query: explain select *
 from part p1 join part p2 join part p3 
 where p2.p_partkey = 1 and p3.p_name = p2.p_name

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/join_reorder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_reorder.q.out b/ql/src/test/results/clientpositive/spark/join_reorder.q.out
index 10cd56c..4933df4 100644
--- a/ql/src/test/results/clientpositive/spark/join_reorder.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_reorder.q.out
@@ -73,7 +73,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), val (type: string)
@@ -91,16 +91,16 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToDouble(key) + 1.0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: (UDFToDouble(_col0) + 1.0) (type: double)
+                        key expressions: (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
                         sort order: +
-                        Map-reduce partition columns: (UDFToDouble(_col0) + 1.0) (type: double)
+                        Map-reduce partition columns: (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: string)
         Reducer 2 
@@ -110,7 +110,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 UDFToDouble(_col0) (type: double)
-                  1 (UDFToDouble(_col0) + 1.0) (type: double)
+                  1 (UDFToDouble(_col0) + UDFToDouble(1)) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
index 767855b..c22158c 100644
--- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
@@ -1002,7 +1002,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)
@@ -1073,7 +1073,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/spark/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
index 3a126f6..26c8958 100644
--- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
@@ -532,7 +532,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/spark/outer_join_ppr.q.java1.7.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
index a3c4be7..7ac6bf8 100644
--- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
+++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
@@ -412,7 +412,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


[17/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query70.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query70.q.out b/ql/src/test/results/clientpositive/perf/query70.q.out
index 22a94b0..d8fd350 100644
--- a/ql/src/test/results/clientpositive/perf/query70.q.out
+++ b/ql/src/test/results/clientpositive/perf/query70.q.out
@@ -21,80 +21,80 @@ Stage-0
       limit:100
       Stage-1
          Reducer 6
-         File Output Operator [FS_71]
+         File Output Operator [FS_61]
             compressed:false
             Statistics:Num rows: 100 Data size: 111900 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_70]
+            Limit [LIM_60]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 111900 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_69]
+               Select Operator [SEL_59]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                |  Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 5 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_68]
+                  Reduce Output Operator [RS_58]
                      key expressions:_col3 (type: string), CASE WHEN ((_col3 = 0)) THEN (_col1) END (type: string), _col4 (type: int)
                      sort order:-++
                      Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col0 (type: decimal(17,2)), _col1 (type: string), _col2 (type: string)
-                     Select Operator [SEL_66]
+                     Select Operator [SEL_56]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                         Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
-                        PTF Operator [PTF_65]
+                        PTF Operator [PTF_55]
                            Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col4","partition by:":"_col5, CASE WHEN ((_col5 = 2)) THEN (_col0) END"}]
                            Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
-                           Select Operator [SEL_64]
+                           Select Operator [SEL_54]
                            |  outputColumnNames:["_col0","_col1","_col4","_col5"]
                            |  Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 4 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_63]
+                              Reduce Output Operator [RS_53]
                                  key expressions:_col5 (type: string), CASE WHEN ((_col5 = 2)) THEN (_col0) END (type: string), _col4 (type: decimal(17,2))
                                  Map-reduce partition columns:_col5 (type: string), CASE WHEN ((_col5 = 2)) THEN (_col0) END (type: string)
                                  sort order:+++
                                  Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col0 (type: string), _col1 (type: string)
-                                 Select Operator [SEL_62]
+                                 Select Operator [SEL_52]
                                     outputColumnNames:["_col0","_col1","_col4","_col5"]
                                     Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
-                                    Group By Operator [GBY_61]
+                                    Group By Operator [GBY_51]
                                     |  aggregations:["sum(VALUE._col0)"]
                                     |  keys:KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                                     |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |  Statistics:Num rows: 66289 Data size: 74179138 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 3 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_60]
+                                       Reduce Output Operator [RS_50]
                                           key expressions:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                           Map-reduce partition columns:_col0 (type: string), _col1 (type: string), _col2 (type: string)
                                           sort order:+++
                                           Statistics:Num rows: 132579 Data size: 148359396 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col3 (type: decimal(17,2))
-                                          Group By Operator [GBY_59]
+                                          Group By Operator [GBY_49]
                                              aggregations:["sum(_col2)"]
                                              keys:_col6 (type: string), _col7 (type: string), '0' (type: string)
                                              outputColumnNames:["_col0","_col1","_col2","_col3"]
                                              Statistics:Num rows: 132579 Data size: 148359396 Basic stats: COMPLETE Column stats: NONE
-                                             Select Operator [SEL_58]
+                                             Select Operator [SEL_48]
                                                 outputColumnNames:["_col6","_col7","_col2"]
                                                 Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_100]
+                                                Merge Join Operator [MERGEJOIN_90]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col2","_col6","_col7"]
                                                 |  Statistics:Num rows: 44193 Data size: 49453132 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                                |  Reduce Output Operator [RS_54]
+                                                |  Reduce Output Operator [RS_45]
                                                 |     key expressions:_col1 (type: int)
                                                 |     Map-reduce partition columns:_col1 (type: int)
                                                 |     sort order:+
                                                 |     Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 |     value expressions:_col2 (type: decimal(7,2))
-                                                |     Merge Join Operator [MERGEJOIN_96]
+                                                |     Merge Join Operator [MERGEJOIN_86]
                                                 |     |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |     |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |     |  outputColumnNames:["_col1","_col2"]
                                                 |     |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                 |     |<-Map 1 [SIMPLE_EDGE]
-                                                |     |  Reduce Output Operator [RS_49]
+                                                |     |  Reduce Output Operator [RS_42]
                                                 |     |     key expressions:_col0 (type: int)
                                                 |     |     Map-reduce partition columns:_col0 (type: int)
                                                 |     |     sort order:+
@@ -103,14 +103,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_89]
+                                                |     |        Filter Operator [FIL_79]
                                                 |     |           predicate:(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:ss
                                                 |     |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |     |<-Map 7 [SIMPLE_EDGE]
-                                                |        Reduce Output Operator [RS_51]
+                                                |        Reduce Output Operator [RS_43]
                                                 |           key expressions:_col0 (type: int)
                                                 |           Map-reduce partition columns:_col0 (type: int)
                                                 |           sort order:+
@@ -118,26 +118,26 @@ Stage-0
                                                 |           Select Operator [SEL_5]
                                                 |              outputColumnNames:["_col0"]
                                                 |              Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                |              Filter Operator [FIL_90]
+                                                |              Filter Operator [FIL_80]
                                                 |                 predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                 |                 Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                 |                 TableScan [TS_3]
                                                 |                    alias:d1
                                                 |                    Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Reducer 9 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_56]
+                                                   Reduce Output Operator [RS_46]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
                                                       Statistics:Num rows: 7365 Data size: 8242187 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col1 (type: string), _col2 (type: string)
-                                                      Merge Join Operator [MERGEJOIN_99]
+                                                      Merge Join Operator [MERGEJOIN_89]
                                                       |  condition map:[{"":"Left Semi Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: string)","1":"_col0 (type: string)"}
                                                       |  outputColumnNames:["_col0","_col1","_col2"]
                                                       |  Statistics:Num rows: 7365 Data size: 8242187 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Map 8 [SIMPLE_EDGE]
-                                                      |  Reduce Output Operator [RS_43]
+                                                      |  Reduce Output Operator [RS_38]
                                                       |     key expressions:_col2 (type: string)
                                                       |     Map-reduce partition columns:_col2 (type: string)
                                                       |     sort order:+
@@ -146,68 +146,68 @@ Stage-0
                                                       |     Select Operator [SEL_8]
                                                       |        outputColumnNames:["_col0","_col1","_col2"]
                                                       |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                      |        Filter Operator [FIL_91]
+                                                      |        Filter Operator [FIL_81]
                                                       |           predicate:(s_store_sk is not null and s_state is not null) (type: boolean)
                                                       |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |           TableScan [TS_6]
                                                       |              alias:s
                                                       |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                       |<-Reducer 14 [SIMPLE_EDGE]
-                                                         Reduce Output Operator [RS_45]
+                                                         Reduce Output Operator [RS_39]
                                                             key expressions:_col0 (type: string)
                                                             Map-reduce partition columns:_col0 (type: string)
                                                             sort order:+
                                                             Statistics:Num rows: 6696 Data size: 7492898 Basic stats: COMPLETE Column stats: NONE
-                                                            Group By Operator [GBY_41]
+                                                            Group By Operator [GBY_37]
                                                                keys:_col0 (type: string)
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 6696 Data size: 7492898 Basic stats: COMPLETE Column stats: NONE
-                                                               Select Operator [SEL_35]
+                                                               Select Operator [SEL_31]
                                                                   outputColumnNames:["_col0"]
                                                                   Statistics:Num rows: 6696 Data size: 7492898 Basic stats: COMPLETE Column stats: NONE
-                                                                  Filter Operator [FIL_92]
+                                                                  Filter Operator [FIL_82]
                                                                      predicate:((rank_window_0 <= 5) and _col0 is not null) (type: boolean)
                                                                      Statistics:Num rows: 6696 Data size: 7492898 Basic stats: COMPLETE Column stats: NONE
-                                                                     PTF Operator [PTF_34]
+                                                                     PTF Operator [PTF_30]
                                                                         Function definitions:[{"Input definition":{"type:":"WINDOWING"}},{"name:":"windowingtablefunction","order by:":"_col1(DESC)","partition by:":"_col0"}]
                                                                         Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                                                        Select Operator [SEL_33]
+                                                                        Select Operator [SEL_29]
                                                                         |  outputColumnNames:["_col0","_col1"]
                                                                         |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                         |<-Reducer 13 [SIMPLE_EDGE]
-                                                                           Reduce Output Operator [RS_32]
+                                                                           Reduce Output Operator [RS_28]
                                                                               key expressions:_col0 (type: string), _col1 (type: decimal(17,2))
                                                                               Map-reduce partition columns:_col0 (type: string)
                                                                               sort order:+-
                                                                               Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                               value expressions:_col1 (type: decimal(17,2))
-                                                                              Group By Operator [GBY_31]
+                                                                              Group By Operator [GBY_27]
                                                                               |  aggregations:["sum(VALUE._col0)"]
                                                                               |  keys:KEY._col0 (type: string)
                                                                               |  outputColumnNames:["_col0","_col1"]
                                                                               |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                               |<-Reducer 12 [SIMPLE_EDGE]
-                                                                                 Reduce Output Operator [RS_30]
+                                                                                 Reduce Output Operator [RS_26]
                                                                                     key expressions:_col0 (type: string)
                                                                                     Map-reduce partition columns:_col0 (type: string)
                                                                                     sort order:+
                                                                                     Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                                     value expressions:_col1 (type: decimal(17,2))
-                                                                                    Group By Operator [GBY_29]
+                                                                                    Group By Operator [GBY_25]
                                                                                        aggregations:["sum(_col2)"]
                                                                                        keys:_col4 (type: string)
                                                                                        outputColumnNames:["_col0","_col1"]
                                                                                        Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                                                                       Select Operator [SEL_28]
+                                                                                       Select Operator [SEL_24]
                                                                                           outputColumnNames:["_col4","_col2"]
                                                                                           Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                                                                          Merge Join Operator [MERGEJOIN_98]
+                                                                                          Merge Join Operator [MERGEJOIN_88]
                                                                                           |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                           |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                                           |  outputColumnNames:["_col2","_col4"]
                                                                                           |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                                           |<-Map 16 [SIMPLE_EDGE]
-                                                                                          |  Reduce Output Operator [RS_26]
+                                                                                          |  Reduce Output Operator [RS_22]
                                                                                           |     key expressions:_col0 (type: int)
                                                                                           |     Map-reduce partition columns:_col0 (type: int)
                                                                                           |     sort order:+
@@ -215,26 +215,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_95]
+                                                                                          |        Filter Operator [FIL_85]
                                                                                           |           predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null) (type: boolean)
                                                                                           |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                                           |           TableScan [TS_15]
                                                                                           |              alias:d1
                                                                                           |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                                                           |<-Reducer 11 [SIMPLE_EDGE]
-                                                                                             Reduce Output Operator [RS_24]
+                                                                                             Reduce Output Operator [RS_21]
                                                                                                 key expressions:_col0 (type: int)
                                                                                                 Map-reduce partition columns:_col0 (type: int)
                                                                                                 sort order:+
                                                                                                 Statistics:Num rows: 1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                                                                                 value expressions:_col2 (type: decimal(7,2)), _col4 (type: string)
-                                                                                                Merge Join Operator [MERGEJOIN_97]
+                                                                                                Merge Join Operator [MERGEJOIN_87]
                                                                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                                                 |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                                                                 |  outputColumnNames:["_col0","_col2","_col4"]
                                                                                                 |  Statistics:Num rows: 1874 Data size: 3581903 Basic stats: COMPLETE Column stats: NONE
                                                                                                 |<-Map 10 [SIMPLE_EDGE]
-                                                                                                |  Reduce Output Operator [RS_19]
+                                                                                                |  Reduce Output Operator [RS_18]
                                                                                                 |     key expressions:_col1 (type: int)
                                                                                                 |     Map-reduce partition columns:_col1 (type: int)
                                                                                                 |     sort order:+
@@ -243,14 +243,14 @@ Stage-0
                                                                                                 |     Select Operator [SEL_11]
                                                                                                 |        outputColumnNames:["_col0","_col1","_col2"]
                                                                                                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                                                |        Filter Operator [FIL_93]
+                                                                                                |        Filter Operator [FIL_83]
                                                                                                 |           predicate:(ss_store_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_9]
                                                                                                 |              alias:ss
                                                                                                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                                 |<-Map 15 [SIMPLE_EDGE]
-                                                                                                   Reduce Output Operator [RS_21]
+                                                                                                   Reduce Output Operator [RS_19]
                                                                                                       key expressions:_col0 (type: int)
                                                                                                       Map-reduce partition columns:_col0 (type: int)
                                                                                                       sort order:+
@@ -259,7 +259,7 @@ Stage-0
                                                                                                       Select Operator [SEL_14]
                                                                                                          outputColumnNames:["_col0","_col1"]
                                                                                                          Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                                                                                         Filter Operator [FIL_94]
+                                                                                                         Filter Operator [FIL_84]
                                                                                                             predicate:s_store_sk is not null (type: boolean)
                                                                                                             Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                                                                                             TableScan [TS_12]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query71.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query71.q.out b/ql/src/test/results/clientpositive/perf/query71.q.out
index be00aec..fa50e56 100644
--- a/ql/src/test/results/clientpositive/perf/query71.q.out
+++ b/ql/src/test/results/clientpositive/perf/query71.q.out
@@ -18,74 +18,74 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 5
-         File Output Operator [FS_63]
+         File Output Operator [FS_53]
             compressed:false
             Statistics:Num rows: 139755 Data size: 200727046 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"}
-            Select Operator [SEL_62]
+            Select Operator [SEL_52]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
             |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 4 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_61]
+               Reduce Output Operator [RS_51]
                   key expressions:_col4 (type: decimal(17,2)), _col0 (type: int)
                   sort order:-+
                   Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col1 (type: string), _col2 (type: int), _col3 (type: int)
-                  Group By Operator [GBY_58]
+                  Group By Operator [GBY_48]
                   |  aggregations:["sum(VALUE._col0)"]
                   |  keys:KEY._col0 (type: int), KEY._col1 (type: string), KEY._col2 (type: int), KEY._col3 (type: int)
                   |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                   |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                   |<-Reducer 3 [SIMPLE_EDGE]
-                     Reduce Output Operator [RS_57]
+                     Reduce Output Operator [RS_47]
                         key expressions:_col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: int)
                         Map-reduce partition columns:_col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: int)
                         sort order:++++
                         Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                         value expressions:_col4 (type: decimal(17,2))
-                        Group By Operator [GBY_56]
+                        Group By Operator [GBY_46]
                            aggregations:["sum(_col4)"]
                            keys:_col1 (type: int), _col2 (type: string), _col8 (type: int), _col9 (type: int)
                            outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                            Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                           Select Operator [SEL_55]
+                           Select Operator [SEL_45]
                               outputColumnNames:["_col1","_col2","_col8","_col9","_col4"]
                               Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_97]
+                              Merge Join Operator [MERGEJOIN_87]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col6 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col1","_col2","_col4","_col8","_col9"]
                               |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                               |<-Map 16 [SIMPLE_EDGE]
-                              |  Reduce Output Operator [RS_53]
+                              |  Reduce Output Operator [RS_43]
                               |     key expressions:_col0 (type: int)
                               |     Map-reduce partition columns:_col0 (type: int)
                               |     sort order:+
                               |     Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                               |     value expressions:_col1 (type: int), _col2 (type: int)
-                              |     Select Operator [SEL_44]
+                              |     Select Operator [SEL_38]
                               |        outputColumnNames:["_col0","_col1","_col2"]
                               |        Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
-                              |        Filter Operator [FIL_92]
+                              |        Filter Operator [FIL_82]
                               |           predicate:(((t_meal_time = 'breakfast') or (t_meal_time = 'dinner')) and t_time_sk is not null) (type: boolean)
                               |           Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
-                              |           TableScan [TS_42]
+                              |           TableScan [TS_36]
                               |              alias:time_dim
                               |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                               |<-Reducer 2 [SIMPLE_EDGE]
-                                 Reduce Output Operator [RS_51]
+                                 Reduce Output Operator [RS_42]
                                     key expressions:_col6 (type: int)
                                     Map-reduce partition columns:_col6 (type: int)
                                     sort order:+
                                     Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     value expressions:_col1 (type: int), _col2 (type: string), _col4 (type: decimal(7,2))
-                                    Merge Join Operator [MERGEJOIN_96]
+                                    Merge Join Operator [MERGEJOIN_86]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |  keys:{"0":"_col0 (type: int)","1":"_col1 (type: int)"}
                                     |  outputColumnNames:["_col1","_col2","_col4","_col6"]
                                     |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                     |<-Map 1 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_46]
+                                    |  Reduce Output Operator [RS_39]
                                     |     key expressions:_col0 (type: int)
                                     |     Map-reduce partition columns:_col0 (type: int)
                                     |     sort order:+
@@ -94,7 +94,7 @@ Stage-0
                                     |     Select Operator [SEL_2]
                                     |        outputColumnNames:["_col0","_col1","_col2"]
                                     |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                    |        Filter Operator [FIL_85]
+                                    |        Filter Operator [FIL_75]
                                     |           predicate:((i_manager_id = 1) and i_item_sk is not null) (type: boolean)
                                     |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                     |           TableScan [TS_0]
@@ -102,114 +102,114 @@ Stage-0
                                     |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                     |<-Union 8 [SIMPLE_EDGE]
                                        |<-Reducer 11 [CONTAINS]
-                                       |  Reduce Output Operator [RS_48]
+                                       |  Reduce Output Operator [RS_40]
                                        |     key expressions:_col1 (type: int)
                                        |     Map-reduce partition columns:_col1 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 60264 Data size: 67436088 Basic stats: COMPLETE Column stats: NONE
                                        |     value expressions:_col0 (type: decimal(7,2)), _col2 (type: int)
-                                       |     Select Operator [SEL_26]
+                                       |     Select Operator [SEL_22]
                                        |        outputColumnNames:["_col0","_col1","_col2"]
                                        |        Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       |        Merge Join Operator [MERGEJOIN_94]
+                                       |        Merge Join Operator [MERGEJOIN_84]
                                        |        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |        |  outputColumnNames:["_col1","_col2","_col3"]
                                        |        |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                        |        |<-Map 10 [SIMPLE_EDGE]
-                                       |        |  Reduce Output Operator [RS_22]
+                                       |        |  Reduce Output Operator [RS_19]
                                        |        |     key expressions:_col0 (type: int)
                                        |        |     Map-reduce partition columns:_col0 (type: int)
                                        |        |     sort order:+
                                        |        |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |     value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: decimal(7,2))
-                                       |        |     Select Operator [SEL_17]
+                                       |        |     Select Operator [SEL_15]
                                        |        |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                        |        |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |        Filter Operator [FIL_88]
+                                       |        |        Filter Operator [FIL_78]
                                        |        |           predicate:((cs_sold_date_sk is not null and cs_item_sk is not null) and cs_sold_time_sk is not null) (type: boolean)
                                        |        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |           TableScan [TS_15]
+                                       |        |           TableScan [TS_13]
                                        |        |              alias:catalog_sales
                                        |        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Map 12 [SIMPLE_EDGE]
-                                       |           Reduce Output Operator [RS_24]
+                                       |           Reduce Output Operator [RS_20]
                                        |              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_20]
+                                       |              Select Operator [SEL_18]
                                        |                 outputColumnNames:["_col0"]
                                        |                 Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |                 Filter Operator [FIL_89]
+                                       |                 Filter Operator [FIL_79]
                                        |                    predicate:(((d_moy = 12) and d_date_sk is not null) and (d_year = 2001)) (type: boolean)
                                        |                    Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |                    TableScan [TS_18]
+                                       |                    TableScan [TS_16]
                                        |                       alias:date_dim
                                        |                       Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 14 [CONTAINS]
-                                       |  Reduce Output Operator [RS_48]
+                                       |  Reduce Output Operator [RS_40]
                                        |     key expressions:_col1 (type: int)
                                        |     Map-reduce partition columns:_col1 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 60264 Data size: 67436088 Basic stats: COMPLETE Column stats: NONE
                                        |     value expressions:_col0 (type: decimal(7,2)), _col2 (type: int)
-                                       |     Select Operator [SEL_40]
+                                       |     Select Operator [SEL_34]
                                        |        outputColumnNames:["_col0","_col1","_col2"]
                                        |        Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       |        Merge Join Operator [MERGEJOIN_95]
+                                       |        Merge Join Operator [MERGEJOIN_85]
                                        |        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |        |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                        |        |  outputColumnNames:["_col1","_col2","_col3"]
                                        |        |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                        |        |<-Map 13 [SIMPLE_EDGE]
-                                       |        |  Reduce Output Operator [RS_36]
+                                       |        |  Reduce Output Operator [RS_31]
                                        |        |     key expressions:_col0 (type: int)
                                        |        |     Map-reduce partition columns:_col0 (type: int)
                                        |        |     sort order:+
                                        |        |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |     value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: decimal(7,2))
-                                       |        |     Select Operator [SEL_31]
+                                       |        |     Select Operator [SEL_27]
                                        |        |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                        |        |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |        Filter Operator [FIL_90]
+                                       |        |        Filter Operator [FIL_80]
                                        |        |           predicate:((ss_sold_date_sk is not null and ss_item_sk is not null) and ss_sold_time_sk is not null) (type: boolean)
                                        |        |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                       |        |           TableScan [TS_29]
+                                       |        |           TableScan [TS_25]
                                        |        |              alias:store_sales
                                        |        |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                        |        |<-Map 15 [SIMPLE_EDGE]
-                                       |           Reduce Output Operator [RS_38]
+                                       |           Reduce Output Operator [RS_32]
                                        |              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_34]
+                                       |              Select Operator [SEL_30]
                                        |                 outputColumnNames:["_col0"]
                                        |                 Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |                 Filter Operator [FIL_91]
+                                       |                 Filter Operator [FIL_81]
                                        |                    predicate:(((d_moy = 12) and d_date_sk is not null) and (d_year = 2001)) (type: boolean)
                                        |                    Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |                    TableScan [TS_32]
+                                       |                    TableScan [TS_28]
                                        |                       alias:date_dim
                                        |                       Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 7 [CONTAINS]
-                                          Reduce Output Operator [RS_48]
+                                          Reduce Output Operator [RS_40]
                                              key expressions:_col1 (type: int)
                                              Map-reduce partition columns:_col1 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 60264 Data size: 67436088 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col0 (type: decimal(7,2)), _col2 (type: int)
-                                             Select Operator [SEL_14]
+                                             Select Operator [SEL_12]
                                                 outputColumnNames:["_col0","_col1","_col2"]
                                                 Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_93]
+                                                Merge Join Operator [MERGEJOIN_83]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col1","_col2","_col3"]
                                                 |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                 |<-Map 6 [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:+
@@ -218,14 +218,14 @@ Stage-0
                                                 |     Select Operator [SEL_5]
                                                 |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                |        Filter Operator [FIL_86]
+                                                |        Filter Operator [FIL_76]
                                                 |           predicate:((ws_sold_date_sk is not null and ws_item_sk is not null) and ws_sold_time_sk is not null) (type: boolean)
                                                 |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |           TableScan [TS_3]
                                                 |              alias:web_sales
                                                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                 |<-Map 9 [SIMPLE_EDGE]
-                                                   Reduce Output Operator [RS_12]
+                                                   Reduce Output Operator [RS_10]
                                                       key expressions:_col0 (type: int)
                                                       Map-reduce partition columns:_col0 (type: int)
                                                       sort order:+
@@ -233,7 +233,7 @@ Stage-0
                                                       Select Operator [SEL_8]
                                                          outputColumnNames:["_col0"]
                                                          Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                         Filter Operator [FIL_87]
+                                                         Filter Operator [FIL_77]
                                                             predicate:(((d_moy = 12) and d_date_sk is not null) and (d_year = 2001)) (type: boolean)
                                                             Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                             TableScan [TS_6]


[25/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query31.q.out b/ql/src/test/results/clientpositive/perf/query31.q.out
index c479d91..52cbdf4 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -32,555 +32,555 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 7
-         File Output Operator [FS_166]
+         File Output Operator [FS_135]
             compressed:false
             Statistics:Num rows: 11831111 Data size: 12007156967 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"}
-            Select Operator [SEL_165]
+            Select Operator [SEL_134]
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |  Statistics:Num rows: 11831111 Data size: 12007156967 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_164]
+               Reduce Output Operator [RS_133]
                   key expressions:_col2 (type: decimal(37,20))
                   sort order:+
                   Statistics:Num rows: 11831111 Data size: 12007156967 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: string), _col1 (type: int), _col3 (type: decimal(37,20)), _col4 (type: decimal(37,20)), _col5 (type: decimal(37,20))
-                  Select Operator [SEL_163]
+                  Select Operator [SEL_132]
                      outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      Statistics:Num rows: 11831111 Data size: 12007156967 Basic stats: COMPLETE Column stats: NONE
-                     Filter Operator [FIL_275]
+                     Filter Operator [FIL_131]
                         predicate:(CASE WHEN ((_col19 > 0)) THEN ((_col23 / _col19)) ELSE (null) END > CASE WHEN ((_col7 > 0)) THEN ((_col11 / _col7)) ELSE (null) END) (type: boolean)
                         Statistics:Num rows: 11831111 Data size: 12007156967 Basic stats: COMPLETE Column stats: NONE
-                        Merge Join Operator [MERGEJOIN_308]
+                        Merge Join Operator [MERGEJOIN_275]
                         |  condition map:[{"":"Inner Join 0 to 1"}]
                         |  keys:{"0":"_col12 (type: string)","1":"_col0 (type: string)"}
                         |  outputColumnNames:["_col0","_col2","_col3","_col7","_col11","_col15","_col19","_col23"]
                         |  Statistics:Num rows: 35493334 Data size: 36021471918 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 37 [SIMPLE_EDGE]
-                        |  Reduce Output Operator [RS_160]
+                        |  Reduce Output Operator [RS_129]
                         |     key expressions:_col0 (type: string)
                         |     Map-reduce partition columns:_col0 (type: string)
                         |     sort order:+
                         |     Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col3 (type: decimal(17,2))
-                        |     Select Operator [SEL_156]
+                        |     Select Operator [SEL_127]
                         |        outputColumnNames:["_col0","_col3"]
                         |        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                        |        Group By Operator [GBY_155]
+                        |        Group By Operator [GBY_126]
                         |        |  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: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                         |        |<-Reducer 36 [SIMPLE_EDGE]
-                        |           Reduce Output Operator [RS_154]
+                        |           Reduce Output Operator [RS_125]
                         |              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: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                         |              value expressions:_col3 (type: decimal(17,2))
-                        |              Group By Operator [GBY_153]
+                        |              Group By Operator [GBY_124]
                         |                 aggregations:["sum(_col2)"]
                         |                 keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                         |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                         |                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                        |                 Select Operator [SEL_152]
+                        |                 Select Operator [SEL_123]
                         |                    outputColumnNames:["_col4","_col5","_col7","_col2"]
                         |                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                        |                    Merge Join Operator [MERGEJOIN_306]
+                        |                    Merge Join Operator [MERGEJOIN_273]
                         |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                         |                    |  outputColumnNames:["_col2","_col7"]
                         |                    |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Map 39 [SIMPLE_EDGE]
-                        |                    |  Reduce Output Operator [RS_150]
+                        |                    |  Reduce Output Operator [RS_121]
                         |                    |     key expressions:_col0 (type: int)
                         |                    |     Map-reduce partition columns:_col0 (type: int)
                         |                    |     sort order:+
                         |                    |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |     value expressions:_col1 (type: string)
-                        |                    |     Select Operator [SEL_141]
+                        |                    |     Select Operator [SEL_116]
                         |                    |        outputColumnNames:["_col0","_col1"]
                         |                    |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |        Filter Operator [FIL_294]
+                        |                    |        Filter Operator [FIL_261]
                         |                    |           predicate:(ca_address_sk is not null and ca_county is not null) (type: boolean)
                         |                    |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                        |                    |           TableScan [TS_139]
+                        |                    |           TableScan [TS_114]
                         |                    |              alias:customer_address
                         |                    |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                         |                    |<-Reducer 35 [SIMPLE_EDGE]
-                        |                       Reduce Output Operator [RS_148]
+                        |                       Reduce Output Operator [RS_120]
                         |                          key expressions:_col1 (type: int)
                         |                          Map-reduce partition columns:_col1 (type: int)
                         |                          sort order:+
                         |                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                         |                          value expressions:_col2 (type: decimal(7,2))
-                        |                          Merge Join Operator [MERGEJOIN_305]
+                        |                          Merge Join Operator [MERGEJOIN_272]
                         |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |                          |  outputColumnNames:["_col1","_col2"]
                         |                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                         |                          |<-Map 34 [SIMPLE_EDGE]
-                        |                          |  Reduce Output Operator [RS_143]
+                        |                          |  Reduce Output Operator [RS_117]
                         |                          |     key expressions:_col0 (type: int)
                         |                          |     Map-reduce partition columns:_col0 (type: int)
                         |                          |     sort order:+
                         |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                          |     value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                        |                          |     Select Operator [SEL_135]
+                        |                          |     Select Operator [SEL_110]
                         |                          |        outputColumnNames:["_col0","_col1","_col2"]
                         |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |        Filter Operator [FIL_292]
+                        |                          |        Filter Operator [FIL_259]
                         |                          |           predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean)
                         |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |           TableScan [TS_133]
+                        |                          |           TableScan [TS_108]
                         |                          |              alias:web_sales
                         |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                          |<-Map 38 [SIMPLE_EDGE]
-                        |                             Reduce Output Operator [RS_145]
+                        |                             Reduce Output Operator [RS_118]
                         |                                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_138]
+                        |                                Select Operator [SEL_113]
                         |                                   outputColumnNames:["_col0"]
                         |                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                        |                                   Filter Operator [FIL_293]
+                        |                                   Filter Operator [FIL_260]
                         |                                      predicate:(((d_qoy = 3) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                         |                                      Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                        |                                      TableScan [TS_136]
+                        |                                      TableScan [TS_111]
                         |                                         alias:date_dim
                         |                                         Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 5 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_158]
+                           Reduce Output Operator [RS_128]
                               key expressions:_col12 (type: string)
                               Map-reduce partition columns:_col12 (type: string)
                               sort order:+
                               Statistics:Num rows: 32266667 Data size: 32746791943 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col0 (type: string), _col2 (type: int), _col3 (type: decimal(17,2)), _col7 (type: decimal(17,2)), _col11 (type: decimal(17,2)), _col15 (type: decimal(17,2)), _col19 (type: decimal(17,2))
-                              Select Operator [SEL_132]
+                              Select Operator [SEL_107]
                                  outputColumnNames:["_col0","_col11","_col12","_col15","_col19","_col2","_col3","_col7"]
                                  Statistics:Num rows: 32266667 Data size: 32746791943 Basic stats: COMPLETE Column stats: NONE
-                                 Filter Operator [FIL_276]
+                                 Filter Operator [FIL_106]
                                     predicate:(CASE WHEN ((_col15 > 0)) THEN ((_col19 / _col15)) ELSE (null) END > CASE WHEN ((_col3 > 0)) THEN ((_col7 / _col3)) ELSE (null) END) (type: boolean)
                                     Statistics:Num rows: 32266667 Data size: 32746791943 Basic stats: COMPLETE Column stats: NONE
-                                    Merge Join Operator [MERGEJOIN_307]
+                                    Merge Join Operator [MERGEJOIN_274]
                                     |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 1 to 2"},{"":"Inner Join 0 to 3"},{"":"Inner Join 3 to 4"}]
                                     |  keys:{"0":"_col0 (type: string)","1":"_col0 (type: string)","2":"_col0 (type: string)","3":"_col0 (type: string)","4":"_col0 (type: string)"}
                                     |  outputColumnNames:["_col0","_col2","_col3","_col7","_col11","_col12","_col15","_col19"]
                                     |  Statistics:Num rows: 96800002 Data size: 98240376845 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 13 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_123]
+                                    |  Reduce Output Operator [RS_101]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col3 (type: decimal(17,2))
-                                    |     Select Operator [SEL_47]
+                                    |     Select Operator [SEL_39]
                                     |        outputColumnNames:["_col0","_col3"]
                                     |        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                    |        Group By Operator [GBY_46]
+                                    |        Group By Operator [GBY_38]
                                     |        |  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: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 12 [SIMPLE_EDGE]
-                                    |           Reduce Output Operator [RS_45]
+                                    |           Reduce Output Operator [RS_37]
                                     |              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: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |              value expressions:_col3 (type: decimal(17,2))
-                                    |              Group By Operator [GBY_44]
+                                    |              Group By Operator [GBY_36]
                                     |                 aggregations:["sum(_col2)"]
                                     |                 keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                                     |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Select Operator [SEL_43]
+                                    |                 Select Operator [SEL_35]
                                     |                    outputColumnNames:["_col4","_col5","_col7","_col2"]
                                     |                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                    Merge Join Operator [MERGEJOIN_298]
+                                    |                    Merge Join Operator [MERGEJOIN_265]
                                     |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                    |  outputColumnNames:["_col2","_col7"]
                                     |                    |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Map 15 [SIMPLE_EDGE]
-                                    |                    |  Reduce Output Operator [RS_41]
+                                    |                    |  Reduce Output Operator [RS_33]
                                     |                    |     key expressions:_col0 (type: int)
                                     |                    |     Map-reduce partition columns:_col0 (type: int)
                                     |                    |     sort order:+
                                     |                    |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |     value expressions:_col1 (type: string)
-                                    |                    |     Select Operator [SEL_32]
+                                    |                    |     Select Operator [SEL_28]
                                     |                    |        outputColumnNames:["_col0","_col1"]
                                     |                    |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |        Filter Operator [FIL_282]
+                                    |                    |        Filter Operator [FIL_249]
                                     |                    |           predicate:(ca_address_sk is not null and ca_county is not null) (type: boolean)
                                     |                    |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |           TableScan [TS_30]
+                                    |                    |           TableScan [TS_26]
                                     |                    |              alias:customer_address
                                     |                    |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Reducer 11 [SIMPLE_EDGE]
-                                    |                       Reduce Output Operator [RS_39]
+                                    |                       Reduce Output Operator [RS_32]
                                     |                          key expressions:_col1 (type: int)
                                     |                          Map-reduce partition columns:_col1 (type: int)
                                     |                          sort order:+
                                     |                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          value expressions:_col2 (type: decimal(7,2))
-                                    |                          Merge Join Operator [MERGEJOIN_297]
+                                    |                          Merge Join Operator [MERGEJOIN_264]
                                     |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                          |  outputColumnNames:["_col1","_col2"]
                                     |                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          |<-Map 10 [SIMPLE_EDGE]
-                                    |                          |  Reduce Output Operator [RS_34]
+                                    |                          |  Reduce Output Operator [RS_29]
                                     |                          |     key expressions:_col0 (type: int)
                                     |                          |     Map-reduce partition columns:_col0 (type: int)
                                     |                          |     sort order:+
                                     |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |     value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                    |                          |     Select Operator [SEL_26]
+                                    |                          |     Select Operator [SEL_22]
                                     |                          |        outputColumnNames:["_col0","_col1","_col2"]
                                     |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |        Filter Operator [FIL_280]
+                                    |                          |        Filter Operator [FIL_247]
                                     |                          |           predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean)
                                     |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |           TableScan [TS_24]
+                                    |                          |           TableScan [TS_20]
                                     |                          |              alias:store_sales
                                     |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |<-Map 14 [SIMPLE_EDGE]
-                                    |                             Reduce Output Operator [RS_36]
+                                    |                             Reduce Output Operator [RS_30]
                                     |                                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_29]
+                                    |                                Select Operator [SEL_25]
                                     |                                   outputColumnNames:["_col0"]
                                     |                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   Filter Operator [FIL_281]
+                                    |                                   Filter Operator [FIL_248]
                                     |                                      predicate:(((d_qoy = 2) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                     |                                      Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                      TableScan [TS_27]
+                                    |                                      TableScan [TS_23]
                                     |                                         alias:date_dim
                                     |                                         Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 19 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_125]
+                                    |  Reduce Output Operator [RS_102]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col3 (type: decimal(17,2))
-                                    |     Select Operator [SEL_71]
+                                    |     Select Operator [SEL_59]
                                     |        outputColumnNames:["_col0","_col3"]
                                     |        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                    |        Group By Operator [GBY_70]
+                                    |        Group By Operator [GBY_58]
                                     |        |  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: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 18 [SIMPLE_EDGE]
-                                    |           Reduce Output Operator [RS_69]
+                                    |           Reduce Output Operator [RS_57]
                                     |              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: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |              value expressions:_col3 (type: decimal(17,2))
-                                    |              Group By Operator [GBY_68]
+                                    |              Group By Operator [GBY_56]
                                     |                 aggregations:["sum(_col2)"]
                                     |                 keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                                     |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Select Operator [SEL_67]
+                                    |                 Select Operator [SEL_55]
                                     |                    outputColumnNames:["_col4","_col5","_col7","_col2"]
                                     |                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                    Merge Join Operator [MERGEJOIN_300]
+                                    |                    Merge Join Operator [MERGEJOIN_267]
                                     |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                    |  outputColumnNames:["_col2","_col7"]
                                     |                    |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Map 21 [SIMPLE_EDGE]
-                                    |                    |  Reduce Output Operator [RS_65]
+                                    |                    |  Reduce Output Operator [RS_53]
                                     |                    |     key expressions:_col0 (type: int)
                                     |                    |     Map-reduce partition columns:_col0 (type: int)
                                     |                    |     sort order:+
                                     |                    |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |     value expressions:_col1 (type: string)
-                                    |                    |     Select Operator [SEL_56]
+                                    |                    |     Select Operator [SEL_48]
                                     |                    |        outputColumnNames:["_col0","_col1"]
                                     |                    |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |        Filter Operator [FIL_285]
+                                    |                    |        Filter Operator [FIL_252]
                                     |                    |           predicate:(ca_address_sk is not null and ca_county is not null) (type: boolean)
                                     |                    |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |           TableScan [TS_54]
+                                    |                    |           TableScan [TS_46]
                                     |                    |              alias:customer_address
                                     |                    |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Reducer 17 [SIMPLE_EDGE]
-                                    |                       Reduce Output Operator [RS_63]
+                                    |                       Reduce Output Operator [RS_52]
                                     |                          key expressions:_col1 (type: int)
                                     |                          Map-reduce partition columns:_col1 (type: int)
                                     |                          sort order:+
                                     |                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          value expressions:_col2 (type: decimal(7,2))
-                                    |                          Merge Join Operator [MERGEJOIN_299]
+                                    |                          Merge Join Operator [MERGEJOIN_266]
                                     |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                          |  outputColumnNames:["_col1","_col2"]
                                     |                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          |<-Map 16 [SIMPLE_EDGE]
-                                    |                          |  Reduce Output Operator [RS_58]
+                                    |                          |  Reduce Output Operator [RS_49]
                                     |                          |     key expressions:_col0 (type: int)
                                     |                          |     Map-reduce partition columns:_col0 (type: int)
                                     |                          |     sort order:+
                                     |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |     value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                    |                          |     Select Operator [SEL_50]
+                                    |                          |     Select Operator [SEL_42]
                                     |                          |        outputColumnNames:["_col0","_col1","_col2"]
                                     |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |        Filter Operator [FIL_283]
+                                    |                          |        Filter Operator [FIL_250]
                                     |                          |           predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean)
                                     |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |           TableScan [TS_48]
+                                    |                          |           TableScan [TS_40]
                                     |                          |              alias:store_sales
                                     |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |<-Map 20 [SIMPLE_EDGE]
-                                    |                             Reduce Output Operator [RS_60]
+                                    |                             Reduce Output Operator [RS_50]
                                     |                                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_53]
+                                    |                                Select Operator [SEL_45]
                                     |                                   outputColumnNames:["_col0"]
                                     |                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   Filter Operator [FIL_284]
+                                    |                                   Filter Operator [FIL_251]
                                     |                                      predicate:(((d_qoy = 3) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                     |                                      Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                      TableScan [TS_51]
+                                    |                                      TableScan [TS_43]
                                     |                                         alias:date_dim
                                     |                                         Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 25 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_127]
+                                    |  Reduce Output Operator [RS_103]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col3 (type: decimal(17,2))
-                                    |     Select Operator [SEL_95]
+                                    |     Select Operator [SEL_79]
                                     |        outputColumnNames:["_col0","_col3"]
                                     |        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                    |        Group By Operator [GBY_94]
+                                    |        Group By Operator [GBY_78]
                                     |        |  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: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 24 [SIMPLE_EDGE]
-                                    |           Reduce Output Operator [RS_93]
+                                    |           Reduce Output Operator [RS_77]
                                     |              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: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |              value expressions:_col3 (type: decimal(17,2))
-                                    |              Group By Operator [GBY_92]
+                                    |              Group By Operator [GBY_76]
                                     |                 aggregations:["sum(_col2)"]
                                     |                 keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                                     |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Select Operator [SEL_91]
+                                    |                 Select Operator [SEL_75]
                                     |                    outputColumnNames:["_col4","_col5","_col7","_col2"]
                                     |                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                    Merge Join Operator [MERGEJOIN_302]
+                                    |                    Merge Join Operator [MERGEJOIN_269]
                                     |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                    |  outputColumnNames:["_col2","_col7"]
                                     |                    |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Map 27 [SIMPLE_EDGE]
-                                    |                    |  Reduce Output Operator [RS_89]
+                                    |                    |  Reduce Output Operator [RS_73]
                                     |                    |     key expressions:_col0 (type: int)
                                     |                    |     Map-reduce partition columns:_col0 (type: int)
                                     |                    |     sort order:+
                                     |                    |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |     value expressions:_col1 (type: string)
-                                    |                    |     Select Operator [SEL_80]
+                                    |                    |     Select Operator [SEL_68]
                                     |                    |        outputColumnNames:["_col0","_col1"]
                                     |                    |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |        Filter Operator [FIL_288]
+                                    |                    |        Filter Operator [FIL_255]
                                     |                    |           predicate:(ca_address_sk is not null and ca_county is not null) (type: boolean)
                                     |                    |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |           TableScan [TS_78]
+                                    |                    |           TableScan [TS_66]
                                     |                    |              alias:customer_address
                                     |                    |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Reducer 23 [SIMPLE_EDGE]
-                                    |                       Reduce Output Operator [RS_87]
+                                    |                       Reduce Output Operator [RS_72]
                                     |                          key expressions:_col1 (type: int)
                                     |                          Map-reduce partition columns:_col1 (type: int)
                                     |                          sort order:+
                                     |                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          value expressions:_col2 (type: decimal(7,2))
-                                    |                          Merge Join Operator [MERGEJOIN_301]
+                                    |                          Merge Join Operator [MERGEJOIN_268]
                                     |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                          |  outputColumnNames:["_col1","_col2"]
                                     |                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          |<-Map 22 [SIMPLE_EDGE]
-                                    |                          |  Reduce Output Operator [RS_82]
+                                    |                          |  Reduce Output Operator [RS_69]
                                     |                          |     key expressions:_col0 (type: int)
                                     |                          |     Map-reduce partition columns:_col0 (type: int)
                                     |                          |     sort order:+
                                     |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |     value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                    |                          |     Select Operator [SEL_74]
+                                    |                          |     Select Operator [SEL_62]
                                     |                          |        outputColumnNames:["_col0","_col1","_col2"]
                                     |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |        Filter Operator [FIL_286]
+                                    |                          |        Filter Operator [FIL_253]
                                     |                          |           predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean)
                                     |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |           TableScan [TS_72]
+                                    |                          |           TableScan [TS_60]
                                     |                          |              alias:web_sales
                                     |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |<-Map 26 [SIMPLE_EDGE]
-                                    |                             Reduce Output Operator [RS_84]
+                                    |                             Reduce Output Operator [RS_70]
                                     |                                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_77]
+                                    |                                Select Operator [SEL_65]
                                     |                                   outputColumnNames:["_col0"]
                                     |                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   Filter Operator [FIL_287]
+                                    |                                   Filter Operator [FIL_254]
                                     |                                      predicate:(((d_year = 1998) and (d_qoy = 1)) and d_date_sk is not null) (type: boolean)
                                     |                                      Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                      TableScan [TS_75]
+                                    |                                      TableScan [TS_63]
                                     |                                         alias:date_dim
                                     |                                         Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 31 [SIMPLE_EDGE]
-                                    |  Reduce Output Operator [RS_129]
+                                    |  Reduce Output Operator [RS_104]
                                     |     key expressions:_col0 (type: string)
                                     |     Map-reduce partition columns:_col0 (type: string)
                                     |     sort order:+
                                     |     Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |     value expressions:_col3 (type: decimal(17,2))
-                                    |     Select Operator [SEL_119]
+                                    |     Select Operator [SEL_99]
                                     |        outputColumnNames:["_col0","_col3"]
                                     |        Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                    |        Group By Operator [GBY_118]
+                                    |        Group By Operator [GBY_98]
                                     |        |  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: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                     |        |<-Reducer 30 [SIMPLE_EDGE]
-                                    |           Reduce Output Operator [RS_117]
+                                    |           Reduce Output Operator [RS_97]
                                     |              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: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |              value expressions:_col3 (type: decimal(17,2))
-                                    |              Group By Operator [GBY_116]
+                                    |              Group By Operator [GBY_96]
                                     |                 aggregations:["sum(_col2)"]
                                     |                 keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                                     |                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                     |                 Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                 Select Operator [SEL_115]
+                                    |                 Select Operator [SEL_95]
                                     |                    outputColumnNames:["_col4","_col5","_col7","_col2"]
                                     |                    Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                    |                    Merge Join Operator [MERGEJOIN_304]
+                                    |                    Merge Join Operator [MERGEJOIN_271]
                                     |                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                    |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                     |                    |  outputColumnNames:["_col2","_col7"]
                                     |                    |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Map 33 [SIMPLE_EDGE]
-                                    |                    |  Reduce Output Operator [RS_113]
+                                    |                    |  Reduce Output Operator [RS_93]
                                     |                    |     key expressions:_col0 (type: int)
                                     |                    |     Map-reduce partition columns:_col0 (type: int)
                                     |                    |     sort order:+
                                     |                    |     Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |     value expressions:_col1 (type: string)
-                                    |                    |     Select Operator [SEL_104]
+                                    |                    |     Select Operator [SEL_88]
                                     |                    |        outputColumnNames:["_col0","_col1"]
                                     |                    |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |        Filter Operator [FIL_291]
+                                    |                    |        Filter Operator [FIL_258]
                                     |                    |           predicate:(ca_address_sk is not null and ca_county is not null) (type: boolean)
                                     |                    |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                    |                    |           TableScan [TS_102]
+                                    |                    |           TableScan [TS_86]
                                     |                    |              alias:customer_address
                                     |                    |              Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                     |                    |<-Reducer 29 [SIMPLE_EDGE]
-                                    |                       Reduce Output Operator [RS_111]
+                                    |                       Reduce Output Operator [RS_92]
                                     |                          key expressions:_col1 (type: int)
                                     |                          Map-reduce partition columns:_col1 (type: int)
                                     |                          sort order:+
                                     |                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          value expressions:_col2 (type: decimal(7,2))
-                                    |                          Merge Join Operator [MERGEJOIN_303]
+                                    |                          Merge Join Operator [MERGEJOIN_270]
                                     |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                     |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                     |                          |  outputColumnNames:["_col1","_col2"]
                                     |                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                     |                          |<-Map 28 [SIMPLE_EDGE]
-                                    |                          |  Reduce Output Operator [RS_106]
+                                    |                          |  Reduce Output Operator [RS_89]
                                     |                          |     key expressions:_col0 (type: int)
                                     |                          |     Map-reduce partition columns:_col0 (type: int)
                                     |                          |     sort order:+
                                     |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |     value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                    |                          |     Select Operator [SEL_98]
+                                    |                          |     Select Operator [SEL_82]
                                     |                          |        outputColumnNames:["_col0","_col1","_col2"]
                                     |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |        Filter Operator [FIL_289]
+                                    |                          |        Filter Operator [FIL_256]
                                     |                          |           predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean)
                                     |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                    |                          |           TableScan [TS_96]
+                                    |                          |           TableScan [TS_80]
                                     |                          |              alias:web_sales
                                     |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                     |                          |<-Map 32 [SIMPLE_EDGE]
-                                    |                             Reduce Output Operator [RS_108]
+                                    |                             Reduce Output Operator [RS_90]
                                     |                                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_101]
+                                    |                                Select Operator [SEL_85]
                                     |                                   outputColumnNames:["_col0"]
                                     |                                   Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                   Filter Operator [FIL_290]
+                                    |                                   Filter Operator [FIL_257]
                                     |                                      predicate:(((d_qoy = 2) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                     |                                      Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                    |                                      TableScan [TS_99]
+                                    |                                      TableScan [TS_83]
                                     |                                         alias:date_dim
                                     |                                         Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_121]
+                                       Reduce Output Operator [RS_100]
                                           key expressions:_col0 (type: string)
                                           Map-reduce partition columns:_col0 (type: string)
                                           sort order:+
                                           Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
                                           value expressions:_col2 (type: int), _col3 (type: decimal(17,2))
-                                          Select Operator [SEL_23]
+                                          Select Operator [SEL_19]
                                              outputColumnNames:["_col0","_col2","_col3"]
                                              Statistics:Num rows: 22000000 Data size: 22327357890 Basic stats: COMPLETE Column stats: NONE
-                                             Group By Operator [GBY_22]
+                                             Group By Operator [GBY_18]
                                              |  aggregations:["sum(VALUE._col0)"]
                                              |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string)
                                              |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                              |  Statistics:Num rows: 22000000 Data size: 22327357890 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: 44000000 Data size: 44654715780 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(_col2)"]
                                                       keys:_col4 (type: int), _col5 (type: int), _col7 (type: string)
                                                       outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                       Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                      Select Operator [SEL_19]
+                                                      Select Operator [SEL_15]
                                                          outputColumnNames:["_col4","_col5","_col7","_col2"]
                                                          Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
-                                                         Merge Join Operator [MERGEJOIN_296]
+                                                         Merge Join Operator [MERGEJOIN_263]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col2","_col7"]
                                                          |  Statistics:Num rows: 44000000 Data size: 44654715780 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 9 [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:+
@@ -589,26 +589,26 @@ Stage-0
                                                          |     Select Operator [SEL_8]
                                                          |        outputColumnNames:["_col0","_col1"]
                                                          |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_279]
+                                                         |        Filter Operator [FIL_246]
                                                          |           predicate:(ca_address_sk is not null and ca_county 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:_col1 (type: int)
                                                                Map-reduce partition columns:_col1 (type: int)
                                                                sort order:+
                                                                Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col2 (type: decimal(7,2))
-                                                               Merge Join Operator [MERGEJOIN_295]
+                                                               Merge Join Operator [MERGEJOIN_262]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col2"]
                                                                |  Statistics:Num rows: 20088 Data size: 22478696 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:+
@@ -617,14 +617,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_277]
+                                                               |        Filter Operator [FIL_244]
                                                                |           predicate:(ss_sold_date_sk is not null and ss_addr_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_12]
+                                                                  Reduce Output Operator [RS_10]
                                                                      key expressions:_col0 (type: int)
                                                                      Map-reduce partition columns:_col0 (type: int)
                                                                      sort order:+
@@ -632,7 +632,7 @@ Stage-0
                                                                      Select Operator [SEL_5]
                                                                         outputColumnNames:["_col0"]
                                                                         Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                                                        Filter Operator [FIL_278]
+                                                                        Filter Operator [FIL_245]
                                                                            predicate:(((d_year = 1998) and (d_qoy = 1)) and d_date_sk is not null) (type: boolean)
                                                                            Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                            TableScan [TS_3]


[19/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

Posted by jc...@apache.org.
http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/perf/query65.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query65.q.out b/ql/src/test/results/clientpositive/perf/query65.q.out
index 14596be..12bdd33 100644
--- a/ql/src/test/results/clientpositive/perf/query65.q.out
+++ b/ql/src/test/results/clientpositive/perf/query65.q.out
@@ -1,5 +1,5 @@
-Warning: Shuffle Join MERGEJOIN[81][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-Warning: Shuffle Join MERGEJOIN[84][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[72][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[75][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select 
     s_store_name,
     i_item_desc,
@@ -94,157 +94,157 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_61]
+         File Output Operator [FS_55]
             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_60]
+            Limit [LIM_54]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_59]
+               Select Operator [SEL_53]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                |  Statistics:Num rows: 204974 Data size: 294399674 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_58]
+                  Reduce Output Operator [RS_52]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 204974 Data size: 294399674 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(17,2)), _col3 (type: decimal(7,2)), _col4 (type: decimal(7,2)), _col5 (type: string)
-                     Select Operator [SEL_57]
+                     Select Operator [SEL_51]
                         outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Statistics:Num rows: 204974 Data size: 294399674 Basic stats: COMPLETE Column stats: NONE
-                        Filter Operator [FIL_74]
+                        Filter Operator [FIL_50]
                            predicate:(_col11 <= CAST( (0.1 * UDFToDouble(_col8)) AS decimal(30,15))) (type: boolean)
                            Statistics:Num rows: 204974 Data size: 294399674 Basic stats: COMPLETE Column stats: NONE
-                           Merge Join Operator [MERGEJOIN_85]
+                           Merge Join Operator [MERGEJOIN_76]
                            |  condition map:[{"":"Inner Join 0 to 1"}]
                            |  keys:{"0":"_col7 (type: int), _col0 (type: int), _col2 (type: int)","1":"_col0 (type: int), _col0 (type: int), _col1 (type: int)"}
                            |  outputColumnNames:["_col1","_col3","_col4","_col5","_col6","_col8","_col11"]
                            |  Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 14 [SIMPLE_EDGE]
-                           |  Reduce Output Operator [RS_54]
+                           |  Reduce Output Operator [RS_48]
                            |     key expressions:_col0 (type: int), _col0 (type: int), _col1 (type: int)
                            |     Map-reduce partition columns:_col0 (type: int), _col0 (type: int), _col1 (type: int)
                            |     sort order:+++
                            |     Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                            |     value expressions:_col2 (type: decimal(17,2))
-                           |     Select Operator [SEL_42]
+                           |     Select Operator [SEL_38]
                            |        outputColumnNames:["_col0","_col1","_col2"]
                            |        Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                           |        Group By Operator [GBY_41]
+                           |        Group By Operator [GBY_37]
                            |        |  aggregations:["sum(VALUE._col0)"]
                            |        |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                            |        |  outputColumnNames:["_col0","_col1","_col2"]
                            |        |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                            |        |<-Reducer 13 [SIMPLE_EDGE]
-                           |           Reduce Output Operator [RS_40]
+                           |           Reduce Output Operator [RS_36]
                            |              key expressions:_col0 (type: int), _col1 (type: int)
                            |              Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                            |              sort order:++
                            |              Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |              value expressions:_col2 (type: decimal(17,2))
-                           |              Group By Operator [GBY_39]
+                           |              Group By Operator [GBY_35]
                            |                 aggregations:["sum(_col3)"]
                            |                 keys:_col1 (type: int), _col2 (type: int)
                            |                 outputColumnNames:["_col0","_col1","_col2"]
                            |                 Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                           |                 Merge Join Operator [MERGEJOIN_83]
+                           |                 Merge Join Operator [MERGEJOIN_74]
                            |                 |  condition map:[{"":"Inner Join 0 to 1"}]
                            |                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                            |                 |  outputColumnNames:["_col1","_col2","_col3"]
                            |                 |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                            |                 |<-Map 12 [SIMPLE_EDGE]
-                           |                 |  Reduce Output Operator [RS_34]
+                           |                 |  Reduce Output Operator [RS_31]
                            |                 |     key expressions:_col0 (type: int)
                            |                 |     Map-reduce partition columns:_col0 (type: int)
                            |                 |     sort order:+
                            |                 |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |     value expressions:_col1 (type: int), _col2 (type: int), _col3 (type: decimal(7,2))
-                           |                 |     Select Operator [SEL_29]
+                           |                 |     Select Operator [SEL_27]
                            |                 |        outputColumnNames:["_col0","_col1","_col2","_col3"]
                            |                 |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                           |                 |        Filter Operator [FIL_79]
+                           |                 |        Filter Operator [FIL_70]
                            |                 |           predicate:((ss_sold_date_sk is not null and ss_item_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_27]
+                           |                 |           TableScan [TS_25]
                            |                 |              alias:store_sales
                            |                 |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                            |                 |<-Map 15 [SIMPLE_EDGE]
-                           |                    Reduce Output Operator [RS_36]
+                           |                    Reduce Output Operator [RS_32]
                            |                       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_32]
+                           |                       Select Operator [SEL_30]
                            |                          outputColumnNames:["_col0"]
                            |                          Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                          Filter Operator [FIL_80]
+                           |                          Filter Operator [FIL_71]
                            |                             predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean)
                            |                             Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                           |                             TableScan [TS_30]
+                           |                             TableScan [TS_28]
                            |                                alias:date_dim
                            |                                Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                            |<-Reducer 3 [SIMPLE_EDGE]
-                              Reduce Output Operator [RS_52]
+                              Reduce Output Operator [RS_47]
                                  key expressions:_col7 (type: int), _col0 (type: int), _col2 (type: int)
                                  Map-reduce partition columns:_col7 (type: int), _col0 (type: int), _col2 (type: int)
                                  sort order:+++
                                  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col1 (type: string), _col3 (type: string), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2)), _col6 (type: string), _col8 (type: decimal(21,6))
-                                 Merge Join Operator [MERGEJOIN_84]
+                                 Merge Join Operator [MERGEJOIN_75]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{}
                                  |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                  |  Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 10 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_49]
+                                 |  Reduce Output Operator [RS_45]
                                  |     sort order:
                                  |     Statistics:Num rows: 10044 Data size: 11239348 Basic stats: COMPLETE Column stats: NONE
                                  |     value expressions:_col0 (type: int), _col1 (type: decimal(21,6))
-                                 |     Group By Operator [GBY_25]
+                                 |     Group By Operator [GBY_23]
                                  |     |  aggregations:["avg(VALUE._col0)"]
                                  |     |  keys:KEY._col0 (type: int)
                                  |     |  outputColumnNames:["_col0","_col1"]
                                  |     |  Statistics:Num rows: 10044 Data size: 11239348 Basic stats: COMPLETE Column stats: NONE
                                  |     |<-Reducer 9 [SIMPLE_EDGE]
-                                 |        Reduce Output Operator [RS_24]
+                                 |        Reduce Output Operator [RS_22]
                                  |           key expressions:_col0 (type: int)
                                  |           Map-reduce partition columns:_col0 (type: int)
                                  |           sort order:+
                                  |           Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                  |           value expressions:_col1 (type: struct<count:bigint,sum:decimal(27,2),input:decimal(17,2)>)
-                                 |           Group By Operator [GBY_23]
+                                 |           Group By Operator [GBY_21]
                                  |              aggregations:["avg(_col2)"]
                                  |              keys:_col1 (type: int)
                                  |              outputColumnNames:["_col0","_col1"]
                                  |              Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                 |              Select Operator [SEL_21]
+                                 |              Select Operator [SEL_19]
                                  |                 outputColumnNames:["_col1","_col2"]
                                  |                 Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                 |                 Group By Operator [GBY_20]
+                                 |                 Group By Operator [GBY_18]
                                  |                 |  aggregations:["sum(VALUE._col0)"]
                                  |                 |  keys:KEY._col0 (type: int), KEY._col1 (type: int)
                                  |                 |  outputColumnNames:["_col0","_col1","_col2"]
                                  |                 |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
                                  |                 |<-Reducer 8 [SIMPLE_EDGE]
-                                 |                    Reduce Output Operator [RS_19]
+                                 |                    Reduce Output Operator [RS_17]
                                  |                       key expressions:_col0 (type: int), _col1 (type: int)
                                  |                       Map-reduce partition columns:_col0 (type: int), _col1 (type: int)
                                  |                       sort order:++
                                  |                       Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                  |                       value expressions:_col2 (type: decimal(17,2))
-                                 |                       Group By Operator [GBY_18]
+                                 |                       Group By Operator [GBY_16]
                                  |                          aggregations:["sum(_col3)"]
                                  |                          keys:_col1 (type: int), _col2 (type: int)
                                  |                          outputColumnNames:["_col0","_col1","_col2"]
                                  |                          Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
-                                 |                          Merge Join Operator [MERGEJOIN_82]
+                                 |                          Merge Join Operator [MERGEJOIN_73]
                                  |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                  |                          |  outputColumnNames:["_col1","_col2","_col3"]
                                  |                          |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                  |                          |<-Map 11 [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:+
@@ -252,14 +252,14 @@ Stage-0
                                  |                          |     Select Operator [SEL_11]
                                  |                          |        outputColumnNames:["_col0"]
                                  |                          |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                 |                          |        Filter Operator [FIL_78]
+                                 |                          |        Filter Operator [FIL_69]
                                  |                          |           predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean)
                                  |                          |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                  |                          |           TableScan [TS_9]
                                  |                          |              alias:date_dim
                                  |                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                  |                          |<-Map 7 [SIMPLE_EDGE]
-                                 |                             Reduce Output Operator [RS_13]
+                                 |                             Reduce Output Operator [RS_12]
                                  |                                key expressions:_col0 (type: int)
                                  |                                Map-reduce partition columns:_col0 (type: int)
                                  |                                sort order:+
@@ -268,45 +268,45 @@ 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_77]
+                                 |                                   Filter Operator [FIL_68]
                                  |                                      predicate:(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_6]
                                  |                                         alias:store_sales
                                  |                                         Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                  |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_48]
+                                    Reduce Output Operator [RS_44]
                                        sort order:
                                        Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: string), _col4 (type: decimal(7,2)), _col5 (type: decimal(7,2)), _col6 (type: string)
-                                       Merge Join Operator [MERGEJOIN_81]
+                                       Merge Join Operator [MERGEJOIN_72]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{}
                                        |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                        |  Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_45]
+                                       |  Reduce Output Operator [RS_41]
                                        |     sort order:
                                        |     Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                        |     value expressions:_col0 (type: int), _col1 (type: string)
                                        |     Select Operator [SEL_2]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_75]
+                                       |        Filter Operator [FIL_66]
                                        |           predicate:s_store_sk is not null (type: boolean)
                                        |           Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:store
                                        |              Statistics:Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 6 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_46]
+                                          Reduce Output Operator [RS_42]
                                              sort order:
                                              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col0 (type: int), _col1 (type: string), _col2 (type: decimal(7,2)), _col3 (type: decimal(7,2)), _col4 (type: string)
                                              Select Operator [SEL_5]
                                                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                 Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                                Filter Operator [FIL_76]
+                                                Filter Operator [FIL_67]
                                                    predicate:i_item_sk is not null (type: boolean)
                                                    Statistics:Num rows: 462000 Data size: 663560457 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/query66.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query66.q.out b/ql/src/test/results/clientpositive/perf/query66.q.out
index 42bcb83..22eaf61 100644
--- a/ql/src/test/results/clientpositive/perf/query66.q.out
+++ b/ql/src/test/results/clientpositive/perf/query66.q.out
@@ -457,230 +457,230 @@ Stage-0
       limit:100
       Stage-1
          Reducer 9
-         File Output Operator [FS_92]
+         File Output Operator [FS_76]
             compressed:false
             Statistics:Num rows: 100 Data size: 47100 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_91]
+            Limit [LIM_75]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 47100 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_90]
+               Select Operator [SEL_74]
                |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                |  Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 8 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_89]
+                  Reduce Output Operator [RS_73]
                      key expressions:_col0 (type: string)
                      sort order:+
                      Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int), _col8 (type: decimal(38,2)), _col9 (type: decimal(38,2)), _col10 (type: decimal(38,2)), _col11 (type: decimal(38,2)), _col12 (type: decimal(38,2)), _col13 (type: decimal(38,2)), _col14 (type: decimal(38,2)), _col15 (type: decimal(38,2)), _col16 (type: decimal(38,2)), _col17 (type: decimal(38,2)), _col18 (type: decimal(38,2)), _col19 (type: decimal(38,2)), _col20 (type: decimal(38,12)), _col21 (type: decimal(38,12)), _col22 (type: decimal(38,12)), _col23 (type: decimal(38,12)), _col24 (type: decimal(38,12)), _col25 (type: decimal(38,12)), _col26 (type: decimal(38,12)), _col27 (type: decimal(38,12)), _col28 (type: decimal(38,12)), _col29 (type: decimal(38,12)), _col30 (type: decimal(38,12)), _col31 (type: decimal(38,12)), _col32 (type: decimal(38,2)), _col33 (type: decimal(38,2)), _col34 (type: decima
 l(38,2)), _col35 (type: decimal(38,2)), _col36 (type: decimal(38,2)), _col37 (type: decimal(38,2)), _col38 (type: decimal(38,2)), _col39 (type: decimal(38,2)), _col40 (type: decimal(38,2)), _col41 (type: decimal(38,2)), _col42 (type: decimal(38,2)), _col43 (type: decimal(38,2))
-                     Group By Operator [GBY_87]
+                     Group By Operator [GBY_71]
                      |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)","sum(VALUE._col7)","sum(VALUE._col8)","sum(VALUE._col9)","sum(VALUE._col10)","sum(VALUE._col11)","sum(VALUE._col12)","sum(VALUE._col13)","sum(VALUE._col14)","sum(VALUE._col15)","sum(VALUE._col16)","sum(VALUE._col17)","sum(VALUE._col18)","sum(VALUE._col19)","sum(VALUE._col20)","sum(VALUE._col21)","sum(VALUE._col22)","sum(VALUE._col23)","sum(VALUE._col24)","sum(VALUE._col25)","sum(VALUE._col26)","sum(VALUE._col27)","sum(VALUE._col28)","sum(VALUE._col29)","sum(VALUE._col30)","sum(VALUE._col31)","sum(VALUE._col32)","sum(VALUE._col33)","sum(VALUE._col34)","sum(VALUE._col35)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string), KEY._col5 (type: string), KEY._col6 (type: string), KEY._col7 (type: int)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                      |  Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
                      |<-Union 7 [SIMPLE_EDGE]
                         |<-Reducer 19 [CONTAINS]
-                        |  Reduce Output Operator [RS_86]
+                        |  Reduce Output Operator [RS_70]
                         |     key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                         |     Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                         |     sort order:++++++++
                         |     Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                         |     value expressions:_col8 (type: decimal(38,2)), _col9 (type: decimal(38,2)), _col10 (type: decimal(38,2)), _col11 (type: decimal(38,2)), _col12 (type: decimal(38,2)), _col13 (type: decimal(38,2)), _col14 (type: decimal(38,2)), _col15 (type: decimal(38,2)), _col16 (type: decimal(38,2)), _col17 (type: decimal(38,2)), _col18 (type: decimal(38,2)), _col19 (type: decimal(38,2)), _col20 (type: decimal(38,12)), _col21 (type: decimal(38,12)), _col22 (type: decimal(38,12)), _col23 (type: decimal(38,12)), _col24 (type: decimal(38,12)), _col25 (type: decimal(38,12)), _col26 (type: decimal(38,12)), _col27 (type: decimal(38,12)), _col28 (type: decimal(38,12)), _col29 (type: decimal(38,12)), _col30 (type: decimal(38,12)), _col31 (type: decimal(38,12)), _col32 (type: decimal(38,2)), _col33 (type: decimal(38,2)), _col34 (type: decimal(38,2)), _col35 (type: decimal(38,2)), _col36 (type: decimal(38,2)), _col37 (type: decimal(38,2)), _col38 (type: decimal(38,2)), _col39 (t
 ype: decimal(38,2)), _col40 (type: decimal(38,2)), _col41 (type: decimal(38,2)), _col42 (type: decimal(38,2)), _col43 (type: decimal(38,2))
-                        |     Group By Operator [GBY_85]
+                        |     Group By Operator [GBY_69]
                         |        aggregations:["sum(_col8)","sum(_col9)","sum(_col10)","sum(_col11)","sum(_col12)","sum(_col13)","sum(_col14)","sum(_col15)","sum(_col16)","sum(_col17)","sum(_col18)","sum(_col19)","sum(_col20)","sum(_col21)","sum(_col22)","sum(_col23)","sum(_col24)","sum(_col25)","sum(_col26)","sum(_col27)","sum(_col28)","sum(_col29)","sum(_col30)","sum(_col31)","sum(_col32)","sum(_col33)","sum(_col34)","sum(_col35)","sum(_col36)","sum(_col37)","sum(_col38)","sum(_col39)","sum(_col40)","sum(_col41)","sum(_col42)","sum(_col43)"]
                         |        keys:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                         |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                         |        Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                        |        Select Operator [SEL_83]
+                        |        Select Operator [SEL_67]
                         |           outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                         |           Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                        |           Select Operator [SEL_81]
+                        |           Select Operator [SEL_65]
                         |              outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31"]
                         |              Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
-                        |              Group By Operator [GBY_80]
+                        |              Group By Operator [GBY_64]
                         |              |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)","sum(VALUE._col7)","sum(VALUE._col8)","sum(VALUE._col9)","sum(VALUE._col10)","sum(VALUE._col11)","sum(VALUE._col12)","sum(VALUE._col13)","sum(VALUE._col14)","sum(VALUE._col15)","sum(VALUE._col16)","sum(VALUE._col17)","sum(VALUE._col18)","sum(VALUE._col19)","sum(VALUE._col20)","sum(VALUE._col21)","sum(VALUE._col22)","sum(VALUE._col23)"]
                         |              |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string), KEY._col5 (type: string), KEY._col6 (type: int)
                         |              |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                         |              |  Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
                         |              |<-Reducer 18 [SIMPLE_EDGE]
-                        |                 Reduce Output Operator [RS_79]
+                        |                 Reduce Output Operator [RS_63]
                         |                    key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                         |                    Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                         |                    sort order:+++++++
                         |                    Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                         |                    value expressions:_col7 (type: decimal(28,2)), _col8 (type: decimal(28,2)), _col9 (type: decimal(28,2)), _col10 (type: decimal(28,2)), _col11 (type: decimal(28,2)), _col12 (type: decimal(28,2)), _col13 (type: decimal(28,2)), _col14 (type: decimal(28,2)), _col15 (type: decimal(28,2)), _col16 (type: decimal(28,2)), _col17 (type: decimal(28,2)), _col18 (type: decimal(28,2)), _col19 (type: decimal(28,2)), _col20 (type: decimal(28,2)), _col21 (type: decimal(28,2)), _col22 (type: decimal(28,2)), _col23 (type: decimal(28,2)), _col24 (type: decimal(28,2)), _col25 (type: decimal(28,2)), _col26 (type: decimal(28,2)), _col27 (type: decimal(28,2)), _col28 (type: decimal(28,2)), _col29 (type: decimal(28,2)), _col30 (type: decimal(28,2))
-                        |                    Group By Operator [GBY_78]
+                        |                    Group By Operator [GBY_62]
                         |                       aggregations:["sum(_col7)","sum(_col8)","sum(_col9)","sum(_col10)","sum(_col11)","sum(_col12)","sum(_col13)","sum(_col14)","sum(_col15)","sum(_col16)","sum(_col17)","sum(_col18)","sum(_col19)","sum(_col20)","sum(_col21)","sum(_col22)","sum(_col23)","sum(_col24)","sum(_col25)","sum(_col26)","sum(_col27)","sum(_col28)","sum(_col29)","sum(_col30)"]
                         |                       keys:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                         |                       outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                         |                       Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                        |                       Select Operator [SEL_76]
+                        |                       Select Operator [SEL_60]
                         |                          outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                         |                          Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                        |                          Merge Join Operator [MERGEJOIN_138]
+                        |                          Merge Join Operator [MERGEJOIN_122]
                         |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                          |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                         |                          |  outputColumnNames:["_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                         |                          |  Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                         |                          |<-Map 23 [SIMPLE_EDGE]
-                        |                          |  Reduce Output Operator [RS_74]
+                        |                          |  Reduce Output Operator [RS_58]
                         |                          |     key expressions:_col0 (type: int)
                         |                          |     Map-reduce partition columns:_col0 (type: int)
                         |                          |     sort order:+
                         |                          |     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |     Select Operator [SEL_55]
+                        |                          |     Select Operator [SEL_47]
                         |                          |        outputColumnNames:["_col0"]
                         |                          |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |        Filter Operator [FIL_130]
+                        |                          |        Filter Operator [FIL_114]
                         |                          |           predicate:((sm_carrier) IN ('DIAMOND', 'AIRBORNE') and sm_ship_mode_sk is not null) (type: boolean)
                         |                          |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                          |           TableScan [TS_53]
+                        |                          |           TableScan [TS_45]
                         |                          |              alias:ship_mode
                         |                          |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                          |<-Reducer 17 [SIMPLE_EDGE]
-                        |                             Reduce Output Operator [RS_72]
+                        |                             Reduce Output Operator [RS_57]
                         |                                key expressions:_col2 (type: int)
                         |                                Map-reduce partition columns:_col2 (type: int)
                         |                                sort order:+
                         |                                Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
                         |                                value expressions:_col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string), _col16 (type: int)
-                        |                                Merge Join Operator [MERGEJOIN_137]
+                        |                                Merge Join Operator [MERGEJOIN_121]
                         |                                |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                                |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                         |                                |  outputColumnNames:["_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                         |                                |  Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
                         |                                |<-Map 22 [SIMPLE_EDGE]
-                        |                                |  Reduce Output Operator [RS_69]
+                        |                                |  Reduce Output Operator [RS_55]
                         |                                |     key expressions:_col0 (type: int)
                         |                                |     Map-reduce partition columns:_col0 (type: int)
                         |                                |     sort order:+
                         |                                |     Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                                |     Select Operator [SEL_52]
+                        |                                |     Select Operator [SEL_44]
                         |                                |        outputColumnNames:["_col0"]
                         |                                |        Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                                |        Filter Operator [FIL_129]
+                        |                                |        Filter Operator [FIL_113]
                         |                                |           predicate:(t_time BETWEEN 49530 AND 78330 and t_time_sk is not null) (type: boolean)
                         |                                |           Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                        |                                |           TableScan [TS_50]
+                        |                                |           TableScan [TS_42]
                         |                                |              alias:time_dim
                         |                                |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                         |                                |<-Reducer 16 [SIMPLE_EDGE]
-                        |                                   Reduce Output Operator [RS_67]
+                        |                                   Reduce Output Operator [RS_54]
                         |                                      key expressions:_col1 (type: int)
                         |                                      Map-reduce partition columns:_col1 (type: int)
                         |                                      sort order:+
                         |                                      Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                         |                                      value expressions:_col2 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string), _col16 (type: int)
-                        |                                      Merge Join Operator [MERGEJOIN_136]
+                        |                                      Merge Join Operator [MERGEJOIN_120]
                         |                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                         |                                      |  outputColumnNames:["_col1","_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                         |                                      |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                         |                                      |<-Map 21 [SIMPLE_EDGE]
-                        |                                      |  Reduce Output Operator [RS_64]
+                        |                                      |  Reduce Output Operator [RS_52]
                         |                                      |     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
                         |                                      |     value expressions:_col2 (type: int)
-                        |                                      |     Select Operator [SEL_49]
+                        |                                      |     Select Operator [SEL_41]
                         |                                      |        outputColumnNames:["_col0","_col2"]
                         |                                      |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                        |                                      |        Filter Operator [FIL_128]
+                        |                                      |        Filter Operator [FIL_112]
                         |                                      |           predicate:((d_year = 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_47]
+                        |                                      |           TableScan [TS_39]
                         |                                      |              alias:date_dim
                         |                                      |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                         |                                      |<-Reducer 15 [SIMPLE_EDGE]
-                        |                                         Reduce Output Operator [RS_62]
+                        |                                         Reduce Output Operator [RS_51]
                         |                                            key expressions:_col0 (type: int)
                         |                                            Map-reduce partition columns:_col0 (type: int)
                         |                                            sort order:+
                         |                                            Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                         |                                            value expressions:_col1 (type: int), _col2 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string)
-                        |                                            Merge Join Operator [MERGEJOIN_135]
+                        |                                            Merge Join Operator [MERGEJOIN_119]
                         |                                            |  condition map:[{"":"Inner Join 0 to 1"}]
                         |                                            |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                         |                                            |  outputColumnNames:["_col0","_col1","_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13"]
                         |                                            |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                         |                                            |<-Map 14 [SIMPLE_EDGE]
-                        |                                            |  Reduce Output Operator [RS_57]
+                        |                                            |  Reduce Output Operator [RS_48]
                         |                                            |     key expressions:_col3 (type: int)
                         |                                            |     Map-reduce partition columns:_col3 (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), _col2 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2))
-                        |                                            |     Select Operator [SEL_43]
+                        |                                            |     Select Operator [SEL_35]
                         |                                            |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         |                                            |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                                            |        Filter Operator [FIL_126]
+                        |                                            |        Filter Operator [FIL_110]
                         |                                            |           predicate:(((cs_warehouse_sk is not null and cs_sold_date_sk is not null) and cs_sold_time_sk is not null) and cs_ship_mode_sk is not null) (type: boolean)
                         |                                            |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        |                                            |           TableScan [TS_41]
+                        |                                            |           TableScan [TS_33]
                         |                                            |              alias:catalog_sales
                         |                                            |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                         |                                            |<-Map 20 [SIMPLE_EDGE]
-                        |                                               Reduce Output Operator [RS_59]
+                        |                                               Reduce Output Operator [RS_49]
                         |                                                  key expressions:_col0 (type: int)
                         |                                                  Map-reduce partition columns:_col0 (type: int)
                         |                                                  sort order:+
                         |                                                  Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                         |                                                  value expressions:_col1 (type: string), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string)
-                        |                                                  Select Operator [SEL_46]
+                        |                                                  Select Operator [SEL_38]
                         |                                                     outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                         |                                                     Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                        |                                                     Filter Operator [FIL_127]
+                        |                                                     Filter Operator [FIL_111]
                         |                                                        predicate:w_warehouse_sk is not null (type: boolean)
                         |                                                        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                        |                                                        TableScan [TS_44]
+                        |                                                        TableScan [TS_36]
                         |                                                           alias:warehouse
                         |                                                           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                         |<-Reducer 6 [CONTAINS]
-                           Reduce Output Operator [RS_86]
+                           Reduce Output Operator [RS_70]
                               key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                               Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                               sort order:++++++++
                               Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                               value expressions:_col8 (type: decimal(38,2)), _col9 (type: decimal(38,2)), _col10 (type: decimal(38,2)), _col11 (type: decimal(38,2)), _col12 (type: decimal(38,2)), _col13 (type: decimal(38,2)), _col14 (type: decimal(38,2)), _col15 (type: decimal(38,2)), _col16 (type: decimal(38,2)), _col17 (type: decimal(38,2)), _col18 (type: decimal(38,2)), _col19 (type: decimal(38,2)), _col20 (type: decimal(38,12)), _col21 (type: decimal(38,12)), _col22 (type: decimal(38,12)), _col23 (type: decimal(38,12)), _col24 (type: decimal(38,12)), _col25 (type: decimal(38,12)), _col26 (type: decimal(38,12)), _col27 (type: decimal(38,12)), _col28 (type: decimal(38,12)), _col29 (type: decimal(38,12)), _col30 (type: decimal(38,12)), _col31 (type: decimal(38,12)), _col32 (type: decimal(38,2)), _col33 (type: decimal(38,2)), _col34 (type: decimal(38,2)), _col35 (type: decimal(38,2)), _col36 (type: decimal(38,2)), _col37 (type: decimal(38,2)), _col38 (type: decimal(38,2)), _col39 (t
 ype: decimal(38,2)), _col40 (type: decimal(38,2)), _col41 (type: decimal(38,2)), _col42 (type: decimal(38,2)), _col43 (type: decimal(38,2))
-                              Group By Operator [GBY_85]
+                              Group By Operator [GBY_69]
                                  aggregations:["sum(_col8)","sum(_col9)","sum(_col10)","sum(_col11)","sum(_col12)","sum(_col13)","sum(_col14)","sum(_col15)","sum(_col16)","sum(_col17)","sum(_col18)","sum(_col19)","sum(_col20)","sum(_col21)","sum(_col22)","sum(_col23)","sum(_col24)","sum(_col25)","sum(_col26)","sum(_col27)","sum(_col28)","sum(_col29)","sum(_col30)","sum(_col31)","sum(_col32)","sum(_col33)","sum(_col34)","sum(_col35)","sum(_col36)","sum(_col37)","sum(_col38)","sum(_col39)","sum(_col40)","sum(_col41)","sum(_col42)","sum(_col43)"]
                                  keys:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int)
                                  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                                  Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_83]
+                                 Select Operator [SEL_67]
                                     outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31","_col32","_col33","_col34","_col35","_col36","_col37","_col38","_col39","_col40","_col41","_col42","_col43"]
                                     Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                                    Select Operator [SEL_40]
+                                    Select Operator [SEL_32]
                                        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30","_col31"]
                                        Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
-                                       Group By Operator [GBY_39]
+                                       Group By Operator [GBY_31]
                                        |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)","sum(VALUE._col7)","sum(VALUE._col8)","sum(VALUE._col9)","sum(VALUE._col10)","sum(VALUE._col11)","sum(VALUE._col12)","sum(VALUE._col13)","sum(VALUE._col14)","sum(VALUE._col15)","sum(VALUE._col16)","sum(VALUE._col17)","sum(VALUE._col18)","sum(VALUE._col19)","sum(VALUE._col20)","sum(VALUE._col21)","sum(VALUE._col22)","sum(VALUE._col23)"]
                                        |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: string), KEY._col5 (type: string), KEY._col6 (type: int)
                                        |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                                        |  Statistics:Num rows: 26136 Data size: 12310056 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 5 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_38]
+                                          Reduce Output Operator [RS_30]
                                              key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                                              Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                                              sort order:+++++++
                                              Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col7 (type: decimal(28,2)), _col8 (type: decimal(28,2)), _col9 (type: decimal(28,2)), _col10 (type: decimal(28,2)), _col11 (type: decimal(28,2)), _col12 (type: decimal(28,2)), _col13 (type: decimal(28,2)), _col14 (type: decimal(28,2)), _col15 (type: decimal(28,2)), _col16 (type: decimal(28,2)), _col17 (type: decimal(28,2)), _col18 (type: decimal(28,2)), _col19 (type: decimal(28,2)), _col20 (type: decimal(28,2)), _col21 (type: decimal(28,2)), _col22 (type: decimal(28,2)), _col23 (type: decimal(28,2)), _col24 (type: decimal(28,2)), _col25 (type: decimal(28,2)), _col26 (type: decimal(28,2)), _col27 (type: decimal(28,2)), _col28 (type: decimal(28,2)), _col29 (type: decimal(28,2)), _col30 (type: decimal(28,2))
-                                             Group By Operator [GBY_37]
+                                             Group By Operator [GBY_29]
                                                 aggregations:["sum(_col7)","sum(_col8)","sum(_col9)","sum(_col10)","sum(_col11)","sum(_col12)","sum(_col13)","sum(_col14)","sum(_col15)","sum(_col16)","sum(_col17)","sum(_col18)","sum(_col19)","sum(_col20)","sum(_col21)","sum(_col22)","sum(_col23)","sum(_col24)","sum(_col25)","sum(_col26)","sum(_col27)","sum(_col28)","sum(_col29)","sum(_col30)"]
                                                 keys:_col0 (type: string), _col1 (type: int), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: int)
                                                 outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                                                 Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                                                Select Operator [SEL_35]
+                                                Select Operator [SEL_27]
                                                    outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23","_col24","_col25","_col26","_col27","_col28","_col29","_col30"]
                                                    Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
-                                                   Merge Join Operator [MERGEJOIN_134]
+                                                   Merge Join Operator [MERGEJOIN_118]
                                                    |  condition map:[{"":"Inner Join 0 to 1"}]
                                                    |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                    |  outputColumnNames:["_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                                                    |  Statistics:Num rows: 52272 Data size: 24620112 Basic stats: COMPLETE Column stats: NONE
                                                    |<-Map 13 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_33]
+                                                   |  Reduce Output Operator [RS_25]
                                                    |     key expressions:_col0 (type: int)
                                                    |     Map-reduce partition columns:_col0 (type: int)
                                                    |     sort order:+
@@ -688,26 +688,26 @@ Stage-0
                                                    |     Select Operator [SEL_14]
                                                    |        outputColumnNames:["_col0"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_125]
+                                                   |        Filter Operator [FIL_109]
                                                    |           predicate:((sm_carrier) IN ('DIAMOND', 'AIRBORNE') and sm_ship_mode_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |           TableScan [TS_12]
                                                    |              alias:ship_mode
                                                    |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |<-Reducer 4 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_31]
+                                                      Reduce Output Operator [RS_24]
                                                          key expressions:_col2 (type: int)
                                                          Map-reduce partition columns:_col2 (type: int)
                                                          sort order:+
                                                          Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
                                                          value expressions:_col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string), _col16 (type: int)
-                                                         Merge Join Operator [MERGEJOIN_133]
+                                                         Merge Join Operator [MERGEJOIN_117]
                                                          |  condition map:[{"":"Inner Join 0 to 1"}]
                                                          |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                          |  outputColumnNames:["_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                                                          |  Statistics:Num rows: 47520 Data size: 22381920 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Map 12 [SIMPLE_EDGE]
-                                                         |  Reduce Output Operator [RS_28]
+                                                         |  Reduce Output Operator [RS_22]
                                                          |     key expressions:_col0 (type: int)
                                                          |     Map-reduce partition columns:_col0 (type: int)
                                                          |     sort order:+
@@ -715,26 +715,26 @@ Stage-0
                                                          |     Select Operator [SEL_11]
                                                          |        outputColumnNames:["_col0"]
                                                          |        Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
-                                                         |        Filter Operator [FIL_124]
+                                                         |        Filter Operator [FIL_108]
                                                          |           predicate:(t_time BETWEEN 49530 AND 78330 and t_time_sk is not null) (type: boolean)
                                                          |           Statistics:Num rows: 43200 Data size: 20347200 Basic stats: COMPLETE Column stats: NONE
                                                          |           TableScan [TS_9]
                                                          |              alias:time_dim
                                                          |              Statistics:Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE
                                                          |<-Reducer 3 [SIMPLE_EDGE]
-                                                            Reduce Output Operator [RS_26]
+                                                            Reduce Output Operator [RS_21]
                                                                key expressions:_col1 (type: int)
                                                                Map-reduce partition columns:_col1 (type: int)
                                                                sort order:+
                                                                Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                value expressions:_col2 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string), _col16 (type: int)
-                                                               Merge Join Operator [MERGEJOIN_132]
+                                                               Merge Join Operator [MERGEJOIN_116]
                                                                |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                                |  outputColumnNames:["_col1","_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
                                                                |  Statistics:Num rows: 40176 Data size: 44957392 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Map 11 [SIMPLE_EDGE]
-                                                               |  Reduce Output Operator [RS_23]
+                                                               |  Reduce Output Operator [RS_19]
                                                                |     key expressions:_col0 (type: int)
                                                                |     Map-reduce partition columns:_col0 (type: int)
                                                                |     sort order:+
@@ -743,26 +743,26 @@ Stage-0
                                                                |     Select Operator [SEL_8]
                                                                |        outputColumnNames:["_col0","_col2"]
                                                                |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                                               |        Filter Operator [FIL_123]
+                                                               |        Filter Operator [FIL_107]
                                                                |           predicate:((d_year = 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_6]
                                                                |              alias:date_dim
                                                                |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                                                |<-Reducer 2 [SIMPLE_EDGE]
-                                                                  Reduce Output Operator [RS_21]
+                                                                  Reduce Output Operator [RS_18]
                                                                      key expressions:_col0 (type: int)
                                                                      Map-reduce partition columns:_col0 (type: int)
                                                                      sort order:+
                                                                      Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                                      value expressions:_col1 (type: int), _col2 (type: int), _col4 (type: int), _col5 (type: decimal(7,2)), _col6 (type: decimal(7,2)), _col8 (type: string), _col9 (type: int), _col10 (type: string), _col11 (type: string), _col12 (type: string), _col13 (type: string)
-                                                                     Merge Join Operator [MERGEJOIN_131]
+                                                                     Merge Join Operator [MERGEJOIN_115]
                                                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                                                                      |  keys:{"0":"_col3 (type: int)","1":"_col0 (type: int)"}
                                                                      |  outputColumnNames:["_col0","_col1","_col2","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13"]
                                                                      |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                                                      |<-Map 1 [SIMPLE_EDGE]
-                                                                     |  Reduce Output Operator [RS_16]
+                                                                     |  Reduce Output Operator [RS_15]
                                                                      |     key expressions:_col3 (type: int)
                                                                      |     Map-reduce partition columns:_col3 (type: int)
                                                                      |     sort order:+
@@ -771,14 +771,14 @@ Stage-0
                                                                      |     Select Operator [SEL_2]
                                                                      |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                                      |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                                     |        Filter Operator [FIL_121]
+                                                                     |        Filter Operator [FIL_105]
                                                                      |           predicate:(((ws_warehouse_sk is not null and ws_sold_date_sk is not null) and ws_sold_time_sk is not null) and ws_ship_mode_sk is not null) (type: boolean)
                                                                      |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |           TableScan [TS_0]
                                                                      |              alias:web_sales
                                                                      |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                      |<-Map 10 [SIMPLE_EDGE]
-                                                                        Reduce Output Operator [RS_18]
+                                                                        Reduce Output Operator [RS_16]
                                                                            key expressions:_col0 (type: int)
                                                                            Map-reduce partition columns:_col0 (type: int)
                                                                            sort order:+
@@ -787,7 +787,7 @@ Stage-0
                                                                            Select Operator [SEL_5]
                                                                               outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                                                                               Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                                                              Filter Operator [FIL_122]
+                                                                              Filter Operator [FIL_106]
                                                                                  predicate:w_warehouse_sk is not null (type: boolean)
                                                                                  Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                                                                  TableScan [TS_3]