http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 bee95c1..fb16b40 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
@@ -223,10 +223,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -346,10 +346,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -469,10 +469,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -592,10 +592,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -705,10 +705,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -738,10 +738,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 5 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -884,10 +884,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -902,10 +902,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 5 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -1041,10 +1041,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 27 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -1179,10 +1179,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 27 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -1300,10 +1300,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1423,10 +1423,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1542,10 +1542,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -1665,10 +1665,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -1788,10 +1788,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -1896,10 +1896,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -2017,10 +2017,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -2158,20 +2158,16 @@ STAGE PLANS:
                   alias: srcpart
                   filterExpr: (ds = '2008-04-08') (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: '2008-04-08' (type: string)
-                    outputColumnNames: ds
+                  Group By Operator
+                    keys: '2008-04-08' (type: string)
+                    mode: hash
+                    outputColumnNames: _col0
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-                    Group By Operator
-                      keys: ds (type: string)
-                      mode: hash
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: '2008-04-08' (type: string)
+                      sort order: +
+                      Map-reduce partition columns: '2008-04-08' (type: string)
                       Statistics: Num rows: 1000 Data size: 10624 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: 1000 Data size: 10624 Basic 
stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Merge Join Operator
@@ -2179,7 +2175,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: string)
-                  1 _col0 (type: string)
+                  1 '2008-04-08' (type: string)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
@@ -2207,30 +2203,32 @@ STAGE PLANS:
         Reducer 5 
             Reduce Operator Tree:
               Group By Operator
-                keys: KEY._col0 (type: string)
+                keys: '2008-04-08' (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0
                 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
                 Select Operator
-                  expressions: _col0 (type: string)
-                  outputColumnNames: _col0
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Group By Operator
-                    keys: _col0 (type: string)
-                    mode: hash
+                  Reduce Output Operator
+                    key expressions: '2008-04-08' (type: string)
+                    sort order: +
+                    Map-reduce partition columns: '2008-04-08' (type: string)
+                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: '2008-04-08' (type: string)
                     outputColumnNames: _col0
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Dynamic Partitioning Event Operator
-                      Target column: ds (string)
-                      Target Input: srcpart
-                      Partition key expr: ds
+                    Group By Operator
+                      keys: _col0 (type: string)
+                      mode: hash
+                      outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Target Vertex: Map 1
+                      Dynamic Partitioning Event Operator
+                        Target column: ds (string)
+                        Target Input: srcpart
+                        Partition key expr: ds
+                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                        Target Vertex: Map 1
 
   Stage: Stage-0
     Fetch Operator
@@ -2864,22 +2862,23 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
-                    outputColumnNames: _col0
+                    expressions: ds (type: string), hr (type: string)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1000 Data size: 10624 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: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Map 5 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -2929,11 +2928,12 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '11' (type: string)
+                  key expressions: _col1 (type: string)
                   sort order: +
-                  Map-reduce partition columns: '11' (type: string)
+                  Map-reduce partition columns: _col1 (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -2941,7 +2941,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 '11' (type: string)
+                  0 _col1 (type: string)
                   1 '11' (type: string)
                 Statistics: Num rows: 1210 Data size: 12854 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -3017,10 +3017,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
+                  filterExpr: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
+                    predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3035,10 +3035,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3846,10 +3846,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3980,10 +3980,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -4113,10 +4113,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -4146,10 +4146,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 5 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -4281,10 +4281,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
+                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and ds is not null) and hr is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 27 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -4428,10 +4428,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
+                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -4536,10 +4536,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -4655,10 +4655,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(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)
@@ -4777,46 +4777,44 @@ STAGE PLANS:
                   alias: srcpart
                   filterExpr: (ds = '2008-04-08') (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: '2008-04-08' (type: string)
-                    outputColumnNames: ds
+                  Group By Operator
+                    keys: '2008-04-08' (type: string)
+                    mode: hash
+                    outputColumnNames: _col0
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-                    Group By Operator
-                      keys: ds (type: string)
-                      mode: hash
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: '2008-04-08' (type: string)
+                      sort order: +
+                      Map-reduce partition columns: '2008-04-08' (type: string)
                       Statistics: Num rows: 1000 Data size: 10624 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: 1000 Data size: 10624 Basic 
stats: COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator
-                keys: KEY._col0 (type: string)
+                keys: '2008-04-08' (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 _col0 (type: string)
-                    1 _col0 (type: string)
-                  input vertices:
-                    0 Map 1
-                  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: 
+                Select Operator
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Map Join Operator
+                    condition map:
+                         Inner Join 0 to 1
+                    keys:
+                      0 _col0 (type: string)
+                      1 '2008-04-08' (type: string)
+                    input vertices:
+                      0 Map 1
+                    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
-                      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)
         Reducer 4 
             Reduce Operator Tree:
               Group By Operator
@@ -5167,8 +5165,8 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
-                    outputColumnNames: _col0
+                    expressions: ds (type: string), hr (type: string)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -5176,6 +5174,7 @@ STAGE PLANS:
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
+                      outputColumnNames: _col1
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
@@ -5184,7 +5183,7 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 '11' (type: string)
+                          0 _col1 (type: string)
                           1 '11' (type: string)
                         input vertices:
                           1 Map 4
@@ -5203,10 +5202,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5311,10 +5310,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
+                  filterExpr: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
+                    predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5329,10 +5328,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
+                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 21 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5697,10 +5696,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((ds is not null and hr is not null) and ((date 
= '2008-04-08') or (date = '2008-04-09'))) and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
+                  filterExpr: (((((date = '2008-04-08') or (date = 
'2008-04-09')) and (UDFToDouble(hour) = 11.0)) and ds is not null) and hr is 
not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((ds is not null and hr is not null) and 
((date = '2008-04-08') or (date = '2008-04-09'))) and (UDFToDouble(hour) = 
11.0)) (type: boolean)
+                    predicate: (((((date = '2008-04-08') or (date = 
'2008-04-09')) and (UDFToDouble(hour) = 11.0)) and ds is not null) and hr 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/a6d9bf76/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out 
b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
index 341a549..e129795 100644
--- a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
@@ -561,6 +561,7 @@ bar
 baz
 baz
 baz
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: EXPLAIN SELECT agg.amount
 FROM agg_01 agg,
 dim_shops d1
@@ -599,13 +600,12 @@ STAGE PLANS:
                       condition map:
                            Inner Join 0 to 1
                       keys:
-                        0 1 (type: int)
-                        1 1 (type: int)
+                        0 
+                        1 
                       outputColumnNames: _col0
                       input vertices:
                         1 Map 2
                       Statistics: Num rows: 3 Data size: 9 Basic stats: 
COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 3 Data size: 9 Basic stats: 
COMPLETE Column stats: NONE
@@ -625,9 +625,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 5 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: 1 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: 1 (type: int)
+                        sort order: 
                         Statistics: Num rows: 1 Data size: 5 Basic stats: 
COMPLETE Column stats: NONE
 
   Stage: Stage-0
@@ -636,6 +634,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT agg.amount
 FROM agg_01 agg,
 dim_shops d1

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 b39d2fc..5114076 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
@@ -1575,17 +1575,17 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_12]
-        Select Operator [SEL_11] (rows=7 width=4)
+        Select Operator [SEL_11] (rows=6 width=4)
           Output:["_col0"]
-          Merge Join Operator [MERGEJOIN_17] (rows=7 width=4)
+          Merge Join Operator [MERGEJOIN_17] (rows=6 width=4)
             Conds:RS_8._col0=RS_9._col0(Left Semi),Output:["_col1"]
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_8]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=6 width=77)
+              Select Operator [SEL_2] (rows=5 width=74)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_15] (rows=6 width=77)
-                  predicate:((key is not null and ((c_int + 1) = 2)) and 
((c_int > 0) or (c_float >= 0.0)))
+                Filter Operator [FIL_15] (rows=5 width=74)
+                  predicate:((((c_int + 1) = 2) and ((c_int > 0) or (c_float 
>= 0.0))) and key is not null)
                   TableScan [TS_0] (rows=20 width=83)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 3 [SIMPLE_EDGE]
@@ -1801,25 +1801,27 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 3
-      File Output Operator [FS_14]
-        Group By Operator [GBY_12] (rows=1 width=8)
+      File Output Operator [FS_15]
+        Group By Operator [GBY_13] (rows=1 width=8)
           Output:["_col0"],aggregations:["count(VALUE._col0)"]
         <-Reducer 2 [SIMPLE_EDGE]
-          SHUFFLE [RS_11]
-            Group By Operator [GBY_10] (rows=1 width=8)
-              Output:["_col0"],aggregations:["count(_col0)"]
-              Select Operator [SEL_9] (rows=400 width=0)
-                Output:["_col0"]
-                Merge Join Operator [MERGEJOIN_19] (rows=400 width=0)
-                  Conds:RS_6.'2014'=RS_7.'2014'(Inner)
-                <-Map 1 [SIMPLE_EDGE]
-                  SHUFFLE [RS_6]
-                    PartitionCols:'2014'
+          SHUFFLE [RS_12]
+            Group By Operator [GBY_11] (rows=1 width=8)
+              Output:["_col0"],aggregations:["count('2014')"]
+              Merge Join Operator [MERGEJOIN_20] (rows=400 width=0)
+                Conds:RS_6._col0=RS_7._col0(Inner)
+              <-Map 1 [SIMPLE_EDGE]
+                SHUFFLE [RS_6]
+                  PartitionCols:_col0
+                  Select Operator [SEL_2] (rows=20 width=184)
+                    Output:["_col0"]
                     TableScan [TS_0] (rows=20 width=13)
                       default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE
-                <-Map 4 [SIMPLE_EDGE]
-                  SHUFFLE [RS_7]
-                    PartitionCols:'2014'
+              <-Map 4 [SIMPLE_EDGE]
+                SHUFFLE [RS_7]
+                  PartitionCols:_col0
+                  Select Operator [SEL_5] (rows=20 width=184)
+                    Output:["_col0"]
                     TableScan [TS_3] (rows=20 width=13)
                       default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE
 
@@ -1986,7 +1988,7 @@ Stage-0
             Select Operator [SEL_2] (rows=166 width=178)
               Output:["_col0","_col1"]
               Filter Operator [FIL_15] (rows=166 width=178)
-                predicate:(key is not null and (value > 'val_9'))
+                predicate:((value > 'val_9') and key is not null)
                 TableScan [TS_0] (rows=500 width=178)
                   
default@src_cbo,b,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         <-Map 3 [SIMPLE_EDGE]
@@ -2038,7 +2040,7 @@ Stage-0
             Select Operator [SEL_2] (rows=166 width=178)
               Output:["_col0","_col1"]
               Filter Operator [FIL_15] (rows=166 width=178)
-                predicate:(key is not null and (value > 'val_9'))
+                predicate:((value > 'val_9') and key is not null)
                 TableScan [TS_0] (rows=500 width=178)
                   
default@src_cbo,b,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         <-Map 3 [SIMPLE_EDGE]
@@ -2133,7 +2135,7 @@ Stage-0
                   Select Operator [SEL_2] (rows=16 width=16)
                     Output:["_col0","_col1","_col2","_col3"]
                     Filter Operator [FIL_28] (rows=16 width=16)
-                      predicate:((l_partkey is not null and l_orderkey is not 
null) and (l_linenumber = 1))
+                      predicate:(((l_linenumber = 1) and l_partkey is not 
null) and l_orderkey is not null)
                       TableScan [TS_0] (rows=100 width=16)
                         
default@lineitem,lineitem,Tbl:COMPLETE,Col:COMPLETE,Output:["l_orderkey","l_partkey","l_suppkey","l_linenumber"]
               <-Map 4 [SIMPLE_EDGE]
@@ -2144,7 +2146,7 @@ Stage-0
                     Select Operator [SEL_5] (rows=14 width=4)
                       Output:["_col0"]
                       Filter Operator [FIL_29] (rows=14 width=96)
-                        predicate:(((l_shipmode = 'AIR') and l_orderkey is not 
null) and (l_linenumber = 1))
+                        predicate:(((l_shipmode = 'AIR') and (l_linenumber = 
1)) and l_orderkey is not null)
                         TableScan [TS_3] (rows=100 width=96)
                           
default@lineitem,lineitem,Tbl:COMPLETE,Col:COMPLETE,Output:["l_orderkey","l_linenumber","l_shipmode"]
           <-Reducer 6 [SIMPLE_EDGE]
@@ -2603,8 +2605,10 @@ Stage-0
                             PartitionCols:_col0
                             Group By Operator [GBY_22] (rows=5 width=114)
                               
Output:["_col0","_col1","_col2"],aggregations:["min(p_retailprice)","max(p_retailprice)"],keys:p_mfgr
-                              TableScan [TS_20] (rows=26 width=106)
-                                
default@part,b,Tbl:COMPLETE,Col:COMPLETE,Output:["p_mfgr","p_retailprice"]
+                              Select Operator [SEL_21] (rows=26 width=106)
+                                Output:["p_mfgr","p_retailprice"]
+                                TableScan [TS_20] (rows=26 width=106)
+                                  
default@part,b,Tbl:COMPLETE,Col:COMPLETE,Output:["p_mfgr","p_retailprice"]
                 <-Reducer 3 [SIMPLE_EDGE]
                   SHUFFLE [RS_31]
                     PartitionCols:_col0, _col1
@@ -4178,7 +4182,7 @@ Stage-0
             <-Select Operator [SEL_2] (rows=666 width=178)
                 Output:["_col0","_col1"]
                 Filter Operator [FIL_22] (rows=666 width=178)
-                  predicate:(key is not null and (value > 'val_450'))
+                  predicate:((value > 'val_450') and key is not null)
                   TableScan [TS_0] (rows=2000 width=178)
                     
default@srcpart,srcpart,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         <-Map 4 [SIMPLE_EDGE]
@@ -4226,7 +4230,7 @@ Stage-0
             <-Select Operator [SEL_2] (rows=666 width=178)
                 Output:["_col0","_col1"]
                 Filter Operator [FIL_22] (rows=666 width=178)
-                  predicate:(key is not null and (value > 'val_450'))
+                  predicate:((value > 'val_450') and key is not null)
                   TableScan [TS_0] (rows=2000 width=178)
                     
default@srcpart,srcpart,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         <-Map 4 [SIMPLE_EDGE]
@@ -4274,7 +4278,7 @@ Stage-0
             <-Select Operator [SEL_2] (rows=666 width=178)
                 Output:["_col0","_col1"]
                 Filter Operator [FIL_22] (rows=666 width=178)
-                  predicate:(key is not null and (value > 'val_450'))
+                  predicate:((value > 'val_450') and key is not null)
                   TableScan [TS_0] (rows=2000 width=178)
                     
default@srcpart,srcpart,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         <-Map 4 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_4.q.out 
b/ql/src/test/results/clientpositive/tez/explainuser_4.q.out
index 3a3e17d..661f95f 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_4.q.out
@@ -40,7 +40,7 @@ Stage-0
                 Select Operator [SEL_2] (rows=6144 width=215)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_15] (rows=6144 width=215)
-                    predicate:(cint is not null and cint BETWEEN 1000000 AND 
3000000)
+                    predicate:cint BETWEEN 1000000 AND 3000000
                     TableScan [TS_0] (rows=12288 width=215)
                       
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
             <-Map 4 [SIMPLE_EDGE]
@@ -49,7 +49,7 @@ Stage-0
                 Select Operator [SEL_5] (rows=6144 width=215)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_16] (rows=6144 width=215)
-                    predicate:((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000)
+                    predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is 
not null)
                     TableScan [TS_3] (rows=12288 width=215)
                       
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
 
@@ -121,7 +121,7 @@ Stage-0
                   Select Operator [SEL_2] (rows=6144 width=215)
                     Output:["_col0"]
                     Filter Operator [FIL_17] (rows=6144 width=215)
-                      predicate:(cint is not null and cint BETWEEN 1000000 AND 
3000000)
+                      predicate:cint BETWEEN 1000000 AND 3000000
                       TableScan [TS_0] (rows=12288 width=215)
                         
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint"]
               <-Map 4 [SIMPLE_EDGE]
@@ -130,7 +130,7 @@ Stage-0
                   Select Operator [SEL_5] (rows=6144 width=215)
                     Output:["_col0"]
                     Filter Operator [FIL_18] (rows=6144 width=215)
-                      predicate:((cint is not null and cbigint is not null) 
and cint BETWEEN 1000000 AND 3000000)
+                      predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null)
                       TableScan [TS_3] (rows=12288 width=215)
                         
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
 
@@ -201,7 +201,7 @@ Stage-0
                       Select Operator [SEL_2] (rows=6144 width=215)
                         Output:["_col0","_col1"]
                         Filter Operator [FIL_19] (rows=6144 width=215)
-                          predicate:(cint is not null and cint BETWEEN 1000000 
AND 3000000)
+                          predicate:cint BETWEEN 1000000 AND 3000000
                           TableScan [TS_0] (rows=12288 width=215)
                             
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["csmallint","cint"]
                   <-Map 5 [SIMPLE_EDGE]
@@ -210,7 +210,7 @@ Stage-0
                       Select Operator [SEL_5] (rows=6144 width=215)
                         Output:["_col0"]
                         Filter Operator [FIL_20] (rows=6144 width=215)
-                          predicate:((cint is not null and cbigint is not 
null) and cint BETWEEN 1000000 AND 3000000)
+                          predicate:(cint BETWEEN 1000000 AND 3000000 and 
cbigint is not null)
                           TableScan [TS_3] (rows=12288 width=215)
                             
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
 
@@ -281,7 +281,7 @@ Stage-0
                 Select Operator [SEL_5] (rows=6144 width=215)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_16] (rows=6144 width=215)
-                    predicate:((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000)
+                    predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is 
not null)
                     TableScan [TS_3] (rows=12288 width=215)
                       
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
             <-Map 1 [CUSTOM_SIMPLE_EDGE]
@@ -290,7 +290,7 @@ Stage-0
                 Select Operator [SEL_2] (rows=6144 width=215)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_15] (rows=6144 width=215)
-                    predicate:(cint is not null and cint BETWEEN 1000000 AND 
3000000)
+                    predicate:cint BETWEEN 1000000 AND 3000000
                     TableScan [TS_0] (rows=12288 width=215)
                       
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
 
@@ -362,7 +362,7 @@ Stage-0
                   Select Operator [SEL_5] (rows=6144 width=215)
                     Output:["_col0"]
                     Filter Operator [FIL_18] (rows=6144 width=215)
-                      predicate:((cint is not null and cbigint is not null) 
and cint BETWEEN 1000000 AND 3000000)
+                      predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null)
                       TableScan [TS_3] (rows=12288 width=215)
                         
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
               <-Map 1 [CUSTOM_SIMPLE_EDGE]
@@ -371,7 +371,7 @@ Stage-0
                   Select Operator [SEL_2] (rows=6144 width=215)
                     Output:["_col0"]
                     Filter Operator [FIL_17] (rows=6144 width=215)
-                      predicate:(cint is not null and cint BETWEEN 1000000 AND 
3000000)
+                      predicate:cint BETWEEN 1000000 AND 3000000
                       TableScan [TS_0] (rows=12288 width=215)
                         
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint"]
 
@@ -442,7 +442,7 @@ Stage-0
                       Select Operator [SEL_5] (rows=6144 width=215)
                         Output:["_col0"]
                         Filter Operator [FIL_20] (rows=6144 width=215)
-                          predicate:((cint is not null and cbigint is not 
null) and cint BETWEEN 1000000 AND 3000000)
+                          predicate:(cint BETWEEN 1000000 AND 3000000 and 
cbigint is not null)
                           TableScan [TS_3] (rows=12288 width=215)
                             
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
                   <-Map 1 [CUSTOM_SIMPLE_EDGE]
@@ -451,7 +451,7 @@ Stage-0
                       Select Operator [SEL_2] (rows=6144 width=215)
                         Output:["_col0","_col1"]
                         Filter Operator [FIL_19] (rows=6144 width=215)
-                          predicate:(cint is not null and cint BETWEEN 1000000 
AND 3000000)
+                          predicate:cint BETWEEN 1000000 AND 3000000
                           TableScan [TS_0] (rows=12288 width=215)
                             
default@alltypesorc,a,Tbl:COMPLETE,Col:NONE,Output:["csmallint","cint"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out 
b/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
index 3aba57d..83c4734 100644
--- a/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
@@ -226,7 +226,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((key is not null and value is not null) and 
(value <> '')) (type: boolean)
+                    predicate: ((value <> '') and key is not null) (type: 
boolean)
                     Statistics: Num rows: 25 Data size: 211 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -298,7 +298,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (value is not null and (value <> '')) (type: 
boolean)
+                    predicate: (value <> '') (type: boolean)
                     Statistics: Num rows: 25 Data size: 211 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
index 5ccee00..3a1b937 100644
--- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
@@ -1244,6 +1244,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@decimal_mapjoin
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: EXPLAIN SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
@@ -1282,8 +1283,8 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 6981 (type: int)
-                          1 6981 (type: int)
+                          0 
+                          1 
                         outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
@@ -1313,9 +1314,7 @@ STAGE PLANS:
                       outputColumnNames: _col0
                       Statistics: Num rows: 6144 Data size: 1082530 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: 6981 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: 6981 (type: int)
+                        sort order: 
                         Statistics: Num rows: 6144 Data size: 1082530 Basic 
stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: decimal(23,14))
             Execution mode: vectorized
@@ -1326,6 +1325,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
@@ -1440,6 +1440,7 @@ POSTHOOK: Input: default@decimal_mapjoin
 6981   6981    -515.6210729730 NULL
 6981   6981    -515.6210729730 NULL
 6981   6981    -515.6210729730 NULL
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: EXPLAIN SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
@@ -1478,13 +1479,12 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 6981 (type: int)
-                          1 6981 (type: int)
+                          0 
+                          1 
                         outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 6758 Data size: 1190783 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: 6981 (type: int), 6981 (type: int), 
_col0 (type: decimal(20,10)), _col2 (type: decimal(23,14))
                           outputColumnNames: _col0, _col1, _col2, _col3
@@ -1510,9 +1510,7 @@ STAGE PLANS:
                       outputColumnNames: _col0
                       Statistics: Num rows: 6144 Data size: 1082530 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: 6981 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: 6981 (type: int)
+                        sort order: 
                         Statistics: Num rows: 6144 Data size: 1082530 Basic 
stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: decimal(23,14))
             Execution mode: vectorized
@@ -1523,6 +1521,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 4aebb1f..62fe941 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
@@ -491,7 +491,7 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (value > 'val_450')) 
(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/a6d9bf76/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 1c1a885..b8b399b 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: (key is not null and (value > 'val_9')) (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)

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 7cd4113..523430b 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
@@ -150,7 +150,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and (key > '9')) (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)
@@ -633,7 +633,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and (key > '9')) (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)
@@ -790,7 +790,7 @@ STAGE PLANS:
                   alias: lineitem
                   Statistics: Num rows: 100 Data size: 11999 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((l_partkey is not null and l_orderkey is not 
null) and (l_linenumber = 1)) (type: boolean)
+                    predicate: (((l_linenumber = 1) and l_partkey is not null) 
and l_orderkey is not null) (type: boolean)
                     Statistics: Num rows: 50 Data size: 5999 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: l_orderkey (type: int), l_partkey (type: 
int), l_suppkey (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_1.q.out
index 1304e7d..e3168c3 100644
--- a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_1.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -52,7 +52,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -160,7 +160,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -177,7 +177,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -282,7 +282,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: csmallint (type: smallint), cint (type: int)
@@ -300,7 +300,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -428,7 +428,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -446,7 +446,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -557,7 +557,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -574,7 +574,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -682,7 +682,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: csmallint (type: smallint), cint (type: int)
@@ -700,7 +700,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/tez_self_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_self_join.q.out 
b/ql/src/test/results/clientpositive/tez/tez_self_join.q.out
index 8228453..f5375b2 100644
--- a/ql/src/test/results/clientpositive/tez/tez_self_join.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_self_join.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
                   alias: self1
                   Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (id1 is not null and (id2 = 'ab')) (type: 
boolean)
+                    predicate: ((id2 = 'ab') and id1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: id1 (type: int), id3 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_1.q.out
index bf8cf22..7abc24e 100644
--- a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_1.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -52,7 +52,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -160,7 +160,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -177,7 +177,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -282,7 +282,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: csmallint (type: smallint), cint (type: int)
@@ -300,7 +300,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -428,7 +428,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -447,7 +447,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 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)
@@ -561,7 +561,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -579,7 +579,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)
@@ -690,7 +690,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint is not null and cint BETWEEN 1000000 AND 
3000000) (type: boolean)
+                    predicate: cint BETWEEN 1000000 AND 3000000 (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: csmallint (type: smallint), cint (type: int)
@@ -709,7 +709,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cint is not null and cbigint is not null) and 
cint BETWEEN 1000000 AND 3000000) (type: boolean)
+                    predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null) (type: boolean)
                     Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cint (type: int)

Reply via email to