http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 c46a81a..42f21fb 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
@@ -226,10 +226,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -353,10 +353,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -483,10 +483,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -517,10 +517,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: 344 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: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -668,10 +668,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -687,10 +687,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: 344 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: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -831,10 +831,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: 1440 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: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -973,10 +973,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: 1440 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: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -1098,10 +1098,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1225,10 +1225,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1348,10 +1348,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1475,10 +1475,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1602,10 +1602,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1714,10 +1714,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1839,10 +1839,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1984,20 +1984,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
             Execution mode: llap
         Reducer 2 
             Execution mode: llap
@@ -2007,7 +2003,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()
@@ -2037,30 +2033,32 @@ STAGE PLANS:
             Execution mode: vectorized, llap
             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
@@ -2714,23 +2712,24 @@ 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)
             Execution mode: llap
         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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -2783,11 +2782,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 
             Execution mode: llap
@@ -2796,7 +2796,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
@@ -2873,10 +2873,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)
@@ -2892,10 +2892,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3732,10 +3732,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3881,10 +3881,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3915,10 +3915,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: 344 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: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -4053,10 +4053,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: 1440 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: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -4203,10 +4203,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -4314,10 +4314,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4436,10 +4436,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: 188 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: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4561,48 +4561,46 @@ 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
             Execution mode: llap
         Reducer 3 
             Execution mode: vectorized, llap
             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 
             Execution mode: vectorized, uber
             Reduce Operator Tree:
@@ -4963,8 +4961,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:
@@ -4972,6 +4970,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
@@ -4980,7 +4979,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
@@ -5000,10 +4999,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5111,10 +5110,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)
@@ -5130,10 +5129,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: 376 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: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5508,10 +5507,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: 1440 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: 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/a6d9bf76/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 44d4768..a32986c 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: (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/merge_dynamic_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out 
b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
index da19b32..07102b1 100644
--- a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
+++ b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
@@ -1291,7 +1291,7 @@ STAGE PLANS:
             alias: srcpart_merge_dp
             Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), 
'2008-04-08' (type: string), '11' (type: string)
+              expressions: key (type: string), value (type: string), 
'2008-04-08' (type: string), hr (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 cbd1177..e6b12d4 100644
--- a/ql/src/test/results/clientpositive/perf/query21.q.out
+++ b/ql/src/test/results/clientpositive/perf/query21.q.out
@@ -74,7 +74,7 @@ Stage-0
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_28]
               Filter Operator [FIL_26] (rows=69877 width=1436)
-                predicate:CASE WHEN ((_col2 > 0)) THEN ((UDFToDouble(_col3) / 
UDFToDouble(_col2))) ELSE (null) END BETWEEN 0.6666666666666666 AND 1.5
+                predicate:CASE WHEN ((_col2 > 0)) THEN ((UDFToDouble(_col3) / 
UDFToDouble(_col2)) BETWEEN 0.6666666666666666 AND 1.5) ELSE (null) END
                 Group By Operator [GBY_25] (rows=139755 width=1436)
                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0,
 KEY._col1
                 <-Reducer 4 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 a16eead..a3c47a5 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -33,15 +33,15 @@ Stage-0
     Stage-1
       Reducer 7
       File Output Operator [FS_141]
-        Select Operator [SEL_140] (rows=11831111 width=1014)
+        Select Operator [SEL_140] (rows=26620001 width=1014)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
         <-Reducer 6 [SIMPLE_EDGE]
           SHUFFLE [RS_139]
-            Select Operator [SEL_138] (rows=11831111 width=1014)
+            Select Operator [SEL_138] (rows=26620001 width=1014)
               Output:["_col0","_col2","_col3","_col4","_col5"]
-              Filter Operator [FIL_137] (rows=11831111 width=1014)
-                predicate:(CASE WHEN ((_col19 > 0)) THEN ((_col23 / _col19)) 
ELSE (null) END > CASE WHEN ((_col7 > 0)) THEN ((_col11 / _col7)) ELSE (null) 
END)
-                Merge Join Operator [MERGEJOIN_281] (rows=35493334 width=1014)
+              Filter Operator [FIL_137] (rows=26620001 width=1014)
+                predicate:CASE WHEN ((_col7 > 0)) THEN (CASE WHEN ((_col19 > 
0)) THEN (((_col23 / _col19) > (_col11 / _col7))) ELSE ((null > (_col11 / 
_col7))) END) ELSE (CASE WHEN ((_col19 > 0)) THEN (((_col23 / _col19) > null)) 
ELSE (null) END) END
+                Merge Join Operator [MERGEJOIN_281] (rows=53240002 width=1014)
                   
Conds:RS_134._col12=RS_135._col0(Inner),Output:["_col0","_col3","_col7","_col11","_col15","_col19","_col23"]
                 <-Reducer 37 [SIMPLE_EDGE]
                   SHUFFLE [RS_135]
@@ -88,16 +88,16 @@ Stage-0
                                       Select Operator [SEL_118] (rows=18262 
width=1119)
                                         Output:["_col0"]
                                         Filter Operator [FIL_266] (rows=18262 
width=1119)
-                                          predicate:((d_date_sk is not null 
and (d_qoy = 3)) and (d_year = 1998))
+                                          predicate:(((d_qoy = 3) and (d_year 
= 1998)) and d_date_sk is not null)
                                           TableScan [TS_116] (rows=73049 
width=1119)
                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                 <-Reducer 5 [SIMPLE_EDGE]
                   SHUFFLE [RS_134]
                     PartitionCols:_col12
-                    Select Operator [SEL_112] (rows=32266667 width=1014)
+                    Select Operator [SEL_112] (rows=48400001 width=1014)
                       
Output:["_col0","_col11","_col12","_col15","_col19","_col3","_col7"]
-                      Filter Operator [FIL_111] (rows=32266667 width=1014)
-                        predicate:(CASE WHEN ((_col15 > 0)) THEN ((_col19 / 
_col15)) ELSE (null) END > CASE WHEN ((_col3 > 0)) THEN ((_col7 / _col3)) ELSE 
(null) END)
+                      Filter Operator [FIL_111] (rows=48400001 width=1014)
+                        predicate:CASE WHEN ((_col3 > 0)) THEN (CASE WHEN 
((_col15 > 0)) THEN (((_col19 / _col15) > (_col7 / _col3))) ELSE ((null > 
(_col7 / _col3))) END) ELSE (CASE WHEN ((_col15 > 0)) THEN (((_col19 / _col15) 
> null)) ELSE (null) END) END
                         Merge Join Operator [MERGEJOIN_280] (rows=96800002 
width=1014)
                           
Conds:RS_105._col0=RS_106._col0(Inner),RS_106._col0=RS_107._col0(Inner),RS_105._col0=RS_108._col0(Inner),RS_108._col0=RS_109._col0(Inner),Output:["_col0","_col3","_col7","_col11","_col12","_col15","_col19"]
                         <-Reducer 13 [SIMPLE_EDGE]
@@ -145,7 +145,7 @@ Stage-0
                                               Select Operator [SEL_26] 
(rows=18262 width=1119)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_254] 
(rows=18262 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_qoy = 2)) and (d_year = 1998))
+                                                  predicate:(((d_qoy = 2) and 
(d_year = 1998)) and d_date_sk is not null)
                                                   TableScan [TS_24] 
(rows=73049 width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                         <-Reducer 19 [SIMPLE_EDGE]
@@ -193,7 +193,7 @@ Stage-0
                                               Select Operator [SEL_47] 
(rows=18262 width=1119)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_257] 
(rows=18262 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_qoy = 3)) and (d_year = 1998))
+                                                  predicate:(((d_qoy = 3) and 
(d_year = 1998)) and d_date_sk is not null)
                                                   TableScan [TS_45] 
(rows=73049 width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                         <-Reducer 25 [SIMPLE_EDGE]
@@ -241,7 +241,7 @@ Stage-0
                                               Select Operator [SEL_68] 
(rows=18262 width=1119)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_260] 
(rows=18262 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_qoy = 1)) and (d_year = 1998))
+                                                  predicate:(((d_qoy = 1) and 
(d_year = 1998)) and d_date_sk is not null)
                                                   TableScan [TS_66] 
(rows=73049 width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                         <-Reducer 31 [SIMPLE_EDGE]
@@ -289,7 +289,7 @@ Stage-0
                                               Select Operator [SEL_89] 
(rows=18262 width=1119)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_263] 
(rows=18262 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_qoy = 2)) and (d_year = 1998))
+                                                  predicate:(((d_qoy = 2) and 
(d_year = 1998)) and d_date_sk is not null)
                                                   TableScan [TS_87] 
(rows=73049 width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                         <-Reducer 4 [SIMPLE_EDGE]
@@ -337,7 +337,7 @@ Stage-0
                                               Select Operator [SEL_5] 
(rows=18262 width=1119)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_251] 
(rows=18262 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_qoy = 1)) and (d_year = 1998))
+                                                  predicate:(((d_qoy = 1) and 
(d_year = 1998)) and d_date_sk is not null)
                                                   TableScan [TS_3] (rows=73049 
width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 dc085dd..f9cfd69 100644
--- a/ql/src/test/results/clientpositive/perf/query32.q.out
+++ b/ql/src/test/results/clientpositive/perf/query32.q.out
@@ -69,7 +69,7 @@ Stage-0
                       Select Operator [SEL_12] (rows=231000 width=1436)
                         Output:["_col0"]
                         Filter Operator [FIL_54] (rows=231000 width=1436)
-                          predicate:(i_item_sk is not null and (i_manufact_id 
= 436))
+                          predicate:((i_manufact_id = 436) and i_item_sk is 
not null)
                           TableScan [TS_10] (rows=462000 width=1436)
                             
default@item,i,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_manufact_id"]
                   <-Reducer 2 [SIMPLE_EDGE]
@@ -94,7 +94,7 @@ Stage-0
                             Select Operator [SEL_5] (rows=36524 width=1119)
                               Output:["_col0"]
                               Filter Operator [FIL_53] (rows=36524 width=1119)
-                                predicate:(d_date_sk is not null and d_date 
BETWEEN '2000-01-27' AND '2000-04-27')
+                                predicate:(d_date BETWEEN '2000-01-27' AND 
'2000-04-27' and d_date_sk is not null)
                                 TableScan [TS_3] (rows=73049 width=1119)
                                   
default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                   <-Reducer 9 [SIMPLE_EDGE]
@@ -117,7 +117,7 @@ Stage-0
                                   Select Operator [SEL_18] (rows=36524 
width=1119)
                                     Output:["_col0"]
                                     Filter Operator [FIL_56] (rows=36524 
width=1119)
-                                      predicate:(d_date_sk is not null and 
d_date BETWEEN '2000-01-27' AND '2000-04-27')
+                                      predicate:(d_date BETWEEN '2000-01-27' 
AND '2000-04-27' and d_date_sk is not null)
                                       TableScan [TS_16] (rows=73049 width=1119)
                                         
default@date_dim,d,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                               <-Map 7 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 037bc76..6fa6985 100644
--- a/ql/src/test/results/clientpositive/perf/query34.q.out
+++ b/ql/src/test/results/clientpositive/perf/query34.q.out
@@ -54,10 +54,10 @@ Stage-0
                             <-Map 10 [SIMPLE_EDGE]
                               SHUFFLE [RS_19]
                                 PartitionCols:_col0
-                                Select Operator [SEL_11] (rows=800 width=107)
+                                Select Operator [SEL_11] (rows=1200 width=107)
                                   Output:["_col0"]
-                                  Filter Operator [FIL_55] (rows=800 width=107)
-                                    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.2)) and hd_demo_sk is not 
null)
+                                  Filter Operator [FIL_55] (rows=1200 
width=107)
+                                    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)) > 1.2)) ELSE (null) END) and hd_demo_sk is not 
null)
                                     TableScan [TS_9] (rows=7200 width=107)
                                       
default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"]
                             <-Reducer 3 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 7dcf01d..fb77c7e 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -22,21 +22,21 @@ Stage-0
     Stage-1
       Reducer 7
       File Output Operator [FS_62]
-        Select Operator [SEL_61] (rows=112735 width=1436)
+        Select Operator [SEL_61] (rows=169103 width=1436)
           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
         <-Reducer 6 [SIMPLE_EDGE]
           SHUFFLE [RS_60]
-            Select Operator [SEL_59] (rows=112735 width=1436)
+            Select Operator [SEL_59] (rows=169103 width=1436)
               
Output:["_col0","_col1","_col3","_col4","_col5","_col6","_col8","_col9"]
-              Merge Join Operator [MERGEJOIN_105] (rows=112735 width=1436)
+              Merge Join Operator [MERGEJOIN_105] (rows=169103 width=1436)
                 Conds:RS_56._col2, _col1=RS_57._col2, 
_col1(Inner),Output:["_col1","_col2","_col4","_col5","_col7","_col8","_col10","_col11"]
               <-Reducer 15 [SIMPLE_EDGE]
                 SHUFFLE [RS_57]
                   PartitionCols:_col2, _col1
-                  Select Operator [SEL_55] (rows=102487 width=1436)
+                  Select Operator [SEL_55] (rows=153730 width=1436)
                     Output:["_col1","_col2","_col4","_col5"]
-                    Filter Operator [FIL_54] (rows=102487 width=1436)
-                      predicate:(CASE (_col4) WHEN (0) THEN (0) ELSE ((_col5 / 
_col4)) END > 1.0)
+                    Filter Operator [FIL_54] (rows=153730 width=1436)
+                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col5 / _col4) > 1.0)) END
                       Select Operator [SEL_97] (rows=307461 width=1436)
                         Output:["_col1","_col2","_col4","_col5"]
                         Group By Operator [GBY_53] (rows=307461 width=1436)
@@ -56,7 +56,7 @@ Stage-0
                                     Select Operator [SEL_39] (rows=18262 
width=1119)
                                       Output:["_col0"]
                                       Filter Operator [FIL_96] (rows=18262 
width=1119)
-                                        predicate:(((d_year = 1999) and 
d_date_sk is not null) and (d_moy = 4))
+                                        predicate:(((d_year = 1999) and (d_moy 
= 4)) and d_date_sk is not null)
                                         TableScan [TS_37] (rows=73049 
width=1119)
                                           
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                 <-Reducer 13 [SIMPLE_EDGE]
@@ -99,10 +99,10 @@ Stage-0
               <-Reducer 5 [SIMPLE_EDGE]
                 SHUFFLE [RS_56]
                   PartitionCols:_col2, _col1
-                  Select Operator [SEL_27] (rows=102487 width=1436)
+                  Select Operator [SEL_27] (rows=153730 width=1436)
                     Output:["_col1","_col2","_col4","_col5"]
-                    Filter Operator [FIL_26] (rows=102487 width=1436)
-                      predicate:(CASE (_col4) WHEN (0) THEN (0) ELSE ((_col5 / 
_col4)) END > 1.0)
+                    Filter Operator [FIL_26] (rows=153730 width=1436)
+                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col5 / _col4) > 1.0)) END
                       Select Operator [SEL_98] (rows=307461 width=1436)
                         Output:["_col1","_col2","_col4","_col5"]
                         Group By Operator [GBY_25] (rows=307461 width=1436)
@@ -122,7 +122,7 @@ Stage-0
                                     Select Operator [SEL_11] (rows=18262 
width=1119)
                                       Output:["_col0"]
                                       Filter Operator [FIL_92] (rows=18262 
width=1119)
-                                        predicate:(((d_year = 1999) and 
d_date_sk is not null) and (d_moy = 3))
+                                        predicate:(((d_year = 1999) and (d_moy 
= 3)) and d_date_sk is not null)
                                         TableScan [TS_9] (rows=73049 
width=1119)
                                           
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                 <-Reducer 3 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 35befff..2985ba9 100644
--- a/ql/src/test/results/clientpositive/perf/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/query45.q.out
@@ -74,7 +74,7 @@ Stage-0
                                 Select Operator [SEL_11] (rows=18262 
width=1119)
                                   Output:["_col0"]
                                   Filter Operator [FIL_65] (rows=18262 
width=1119)
-                                    predicate:((d_date_sk is not null and 
(d_qoy = 2)) and (d_year = 2000))
+                                    predicate:(((d_qoy = 2) and (d_year = 
2000)) and d_date_sk is not null)
                                     TableScan [TS_9] (rows=73049 width=1119)
                                       
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                             <-Reducer 3 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 bfda69f..2475d92 100644
--- a/ql/src/test/results/clientpositive/perf/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/query58.q.out
@@ -203,7 +203,7 @@ Stage-0
                                       Select Operator [SEL_85] (rows=36524 
width=1119)
                                         Output:["_col1"]
                                         Filter Operator [FIL_188] (rows=36524 
width=1119)
-                                          predicate:(d_week_seq is not null 
and (d_date = '1998-08-04'))
+                                          predicate:((d_date = '1998-08-04') 
and d_week_seq is not null)
                                           TableScan [TS_83] (rows=73049 
width=1119)
                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                   <-Reducer 6 [SIMPLE_EDGE]
@@ -284,7 +284,7 @@ Stage-0
                                             Select Operator [SEL_47] 
(rows=36524 width=1119)
                                               Output:["_col1"]
                                               Filter Operator [FIL_183] 
(rows=36524 width=1119)
-                                                predicate:(d_week_seq is not 
null and (d_date = '1998-08-04'))
+                                                predicate:((d_date = 
'1998-08-04') and d_week_seq is not null)
                                                 TableScan [TS_45] (rows=73049 
width=1119)
                                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                         <-Reducer 5 [SIMPLE_EDGE]
@@ -321,7 +321,7 @@ Stage-0
                                             Select Operator [SEL_14] 
(rows=36524 width=1119)
                                               Output:["_col1"]
                                               Filter Operator [FIL_178] 
(rows=36524 width=1119)
-                                                predicate:(d_week_seq is not 
null and (d_date = '1998-08-04'))
+                                                predicate:((d_date = 
'1998-08-04') and d_week_seq is not null)
                                                 TableScan [TS_12] (rows=73049 
width=1119)
                                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                                     <-Reducer 3 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 2f52a47..dddcc80 100644
--- a/ql/src/test/results/clientpositive/perf/query64.q.out
+++ b/ql/src/test/results/clientpositive/perf/query64.q.out
@@ -84,7 +84,7 @@ Stage-0
                                   Select Operator [SEL_76] (rows=57750 
width=1436)
                                     Output:["_col0","_col3"]
                                     Filter Operator [FIL_660] (rows=57750 
width=1436)
-                                      predicate:(((i_item_sk is not null and 
(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)
+                                      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)
                                       TableScan [TS_74] (rows=462000 
width=1436)
                                         
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_current_price","i_color","i_product_name"]
                               <-Reducer 16 [SIMPLE_EDGE]
@@ -270,7 +270,7 @@ Stage-0
                                                                                
           Select Operator [SEL_11] (rows=36524 width=1119)
                                                                                
             Output:["_col0"]
                                                                                
             Filter Operator [FIL_647] (rows=36524 width=1119)
-                                                                               
               predicate:(d_date_sk is not null and (d_year = 2000))
+                                                                               
               predicate:((d_year = 2000) and d_date_sk is not null)
                                                                                
               TableScan [TS_9] (rows=73049 width=1119)
                                                                                
                 
default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                                                                
       <-Reducer 3 [SIMPLE_EDGE]
@@ -368,7 +368,7 @@ Stage-0
                                   Select Operator [SEL_200] (rows=57750 
width=1436)
                                     Output:["_col0","_col3"]
                                     Filter Operator [FIL_679] (rows=57750 
width=1436)
-                                      predicate:(((i_item_sk is not null and 
(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)
+                                      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)
                                       TableScan [TS_198] (rows=462000 
width=1436)
                                         
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_current_price","i_color","i_product_name"]
                               <-Reducer 56 [SIMPLE_EDGE]
@@ -554,7 +554,7 @@ Stage-0
                                                                                
           Select Operator [SEL_135] (rows=36524 width=1119)
                                                                                
             Output:["_col0"]
                                                                                
             Filter Operator [FIL_666] (rows=36524 width=1119)
-                                                                               
               predicate:(d_date_sk is not null and (d_year = 2001))
+                                                                               
               predicate:((d_year = 2001) and d_date_sk is not null)
                                                                                
               TableScan [TS_133] (rows=73049 width=1119)
                                                                                
                 
default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                                                                
       <-Reducer 43 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 9b58fdb..2521e0e 100644
--- a/ql/src/test/results/clientpositive/perf/query70.q.out
+++ b/ql/src/test/results/clientpositive/perf/query70.q.out
@@ -31,12 +31,12 @@ Stage-0
               Select Operator [SEL_57] (rows=66289 width=1119)
                 Output:["_col0","_col1","_col2","_col3","_col4"]
                 PTF Operator [PTF_56] (rows=66289 width=1119)
-                  Function 
definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col4","partition by:":"_col5, CASE WHEN ((_col5 = 2)) THEN (_col0) END"}]
+                  Function 
definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col4","partition by:":"_col5, CASE WHEN ((_col5 = 2)) THEN (_col0) ELSE 
(null) END"}]
                   Select Operator [SEL_55] (rows=66289 width=1119)
                     Output:["_col0","_col1","_col4","_col5"]
                   <-Reducer 4 [SIMPLE_EDGE]
                     SHUFFLE [RS_54]
-                      PartitionCols:_col5, CASE WHEN ((_col5 = 2)) THEN 
(_col0) END
+                      PartitionCols:_col5, CASE WHEN ((_col5 = 2)) THEN 
(_col0) ELSE (null) END
                       Select Operator [SEL_53] (rows=66289 width=1119)
                         Output:["_col0","_col1","_col4","_col5"]
                         Group By Operator [GBY_52] (rows=66289 width=1119)
@@ -70,7 +70,7 @@ Stage-0
                                         Select Operator [SEL_5] (rows=36524 
width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_81] (rows=36524 
width=1119)
-                                            predicate:(d_date_sk is not null 
and d_month_seq BETWEEN 1193 AND 1204)
+                                            predicate:(d_month_seq BETWEEN 
1193 AND 1204 and d_date_sk is not null)
                                             TableScan [TS_3] (rows=73049 
width=1119)
                                               
default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_month_seq"]
                                 <-Reducer 9 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 11c3a0c..504705b 100644
--- a/ql/src/test/results/clientpositive/perf/query71.q.out
+++ b/ql/src/test/results/clientpositive/perf/query71.q.out
@@ -40,7 +40,7 @@ Stage-0
                         Select Operator [SEL_38] (rows=86400 width=471)
                           Output:["_col0","_col1","_col2"]
                           Filter Operator [FIL_82] (rows=86400 width=471)
-                            predicate:(t_time_sk is not null and ((t_meal_time 
= 'breakfast') or (t_meal_time = 'dinner')))
+                            predicate:(((t_meal_time = 'breakfast') or 
(t_meal_time = 'dinner')) and t_time_sk is not null)
                             TableScan [TS_36] (rows=86400 width=471)
                               
default@time_dim,time_dim,Tbl:COMPLETE,Col:NONE,Output:["t_time_sk","t_hour","t_minute","t_meal_time"]
                     <-Reducer 2 [SIMPLE_EDGE]
@@ -54,7 +54,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=231000 width=1436)
                               Output:["_col0","_col1","_col2"]
                               Filter Operator [FIL_75] (rows=231000 width=1436)
-                                predicate:(i_item_sk is not null and 
(i_manager_id = 1))
+                                predicate:((i_manager_id = 1) and i_item_sk is 
not null)
                                 TableScan [TS_0] (rows=462000 width=1436)
                                   
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
                         <-Union 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 99e00a7..6d8bd36 100644
--- a/ql/src/test/results/clientpositive/perf/query72.q.out
+++ b/ql/src/test/results/clientpositive/perf/query72.q.out
@@ -105,7 +105,7 @@ Stage-0
                                               Select Operator [SEL_25] 
(rows=36524 width=1119)
                                                 
Output:["_col0","_col1","_col2"]
                                                 Filter Operator [FIL_128] 
(rows=36524 width=1119)
-                                                  predicate:((d_date_sk is not 
null and (d_year = 2001)) and d_week_seq is not null)
+                                                  predicate:(((d_year = 2001) 
and d_date_sk is not null) and d_week_seq is not null)
                                                   TableScan [TS_23] 
(rows=73049 width=1119)
                                                     
default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_week_seq","d_year"]
                                           <-Reducer 6 [SIMPLE_EDGE]
@@ -119,7 +119,7 @@ Stage-0
                                                   Select Operator [SEL_22] 
(rows=3600 width=107)
                                                     Output:["_col0"]
                                                     Filter Operator [FIL_127] 
(rows=3600 width=107)
-                                                      predicate:(hd_demo_sk is 
not null and (hd_buy_potential = '1001-5000'))
+                                                      
predicate:((hd_buy_potential = '1001-5000') and hd_demo_sk is not null)
                                                       TableScan [TS_20] 
(rows=7200 width=107)
                                                         
default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_buy_potential"]
                                               <-Reducer 5 [SIMPLE_EDGE]
@@ -133,7 +133,7 @@ Stage-0
                                                       Select Operator [SEL_19] 
(rows=9900 width=362)
                                                         Output:["_col0"]
                                                         Filter Operator 
[FIL_126] (rows=9900 width=362)
-                                                          
predicate:(cd_demo_sk is not null and (cd_marital_status = 'M'))
+                                                          
predicate:((cd_marital_status = 'M') and cd_demo_sk is not null)
                                                           TableScan [TS_17] 
(rows=19800 width=362)
                                                             
default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status"]
                                                   <-Reducer 4 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 af359d0..e367f51 100644
--- a/ql/src/test/results/clientpositive/perf/query73.q.out
+++ b/ql/src/test/results/clientpositive/perf/query73.q.out
@@ -54,10 +54,10 @@ Stage-0
                             <-Map 10 [SIMPLE_EDGE]
                               SHUFFLE [RS_19]
                                 PartitionCols:_col0
-                                Select Operator [SEL_11] (rows=800 width=107)
+                                Select Operator [SEL_11] (rows=1200 width=107)
                                   Output:["_col0"]
-                                  Filter Operator [FIL_55] (rows=800 width=107)
-                                    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)
+                                  Filter Operator [FIL_55] (rows=1200 
width=107)
+                                    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)) > 1.0)) ELSE (null) END) and hd_demo_sk is not 
null)
                                     TableScan [TS_9] (rows=7200 width=107)
                                       
default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"]
                             <-Reducer 3 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 3791621..25a8776 100644
--- a/ql/src/test/results/clientpositive/perf/query75.q.out
+++ b/ql/src/test/results/clientpositive/perf/query75.q.out
@@ -83,7 +83,7 @@ Stage-0
                                           Select Operator [SEL_82] (rows=36524 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_231] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2001))
+                                              predicate:((d_year = 2001) and 
d_date_sk is not null)
                                               TableScan [TS_80] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 27 [SIMPLE_EDGE]
@@ -106,7 +106,7 @@ Stage-0
                                               Select Operator [SEL_79] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_230] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_77] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
                         <-Reducer 38 [CONTAINS]
@@ -140,7 +140,7 @@ Stage-0
                                           Select Operator [SEL_104] 
(rows=36524 width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_235] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2001))
+                                              predicate:((d_year = 2001) and 
d_date_sk is not null)
                                               TableScan [TS_102] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 36 [SIMPLE_EDGE]
@@ -163,7 +163,7 @@ Stage-0
                                               Select Operator [SEL_101] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_234] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_99] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
                         <-Reducer 45 [CONTAINS]
@@ -197,7 +197,7 @@ Stage-0
                                           Select Operator [SEL_128] 
(rows=36524 width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_239] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2001))
+                                              predicate:((d_year = 2001) and 
d_date_sk is not null)
                                               TableScan [TS_126] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 43 [SIMPLE_EDGE]
@@ -220,7 +220,7 @@ Stage-0
                                               Select Operator [SEL_125] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_238] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_123] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
                   <-Reducer 6 [SIMPLE_EDGE]
@@ -260,7 +260,7 @@ Stage-0
                                           Select Operator [SEL_30] (rows=36524 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_223] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2002))
+                                              predicate:((d_year = 2002) and 
d_date_sk is not null)
                                               TableScan [TS_28] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 13 [SIMPLE_EDGE]
@@ -283,7 +283,7 @@ Stage-0
                                               Select Operator [SEL_27] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_222] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_25] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
                         <-Reducer 22 [CONTAINS]
@@ -317,7 +317,7 @@ Stage-0
                                           Select Operator [SEL_54] (rows=36524 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_227] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2002))
+                                              predicate:((d_year = 2002) and 
d_date_sk is not null)
                                               TableScan [TS_52] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 20 [SIMPLE_EDGE]
@@ -340,7 +340,7 @@ Stage-0
                                               Select Operator [SEL_51] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_226] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_49] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
                         <-Reducer 4 [CONTAINS]
@@ -374,7 +374,7 @@ Stage-0
                                           Select Operator [SEL_8] (rows=36524 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_219] 
(rows=36524 width=1119)
-                                              predicate:(d_date_sk is not null 
and (d_year = 2002))
+                                              predicate:((d_year = 2002) and 
d_date_sk is not null)
                                               TableScan [TS_6] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
                                       <-Reducer 2 [SIMPLE_EDGE]
@@ -397,7 +397,7 @@ Stage-0
                                               Select Operator [SEL_5] 
(rows=231000 width=1436)
                                                 
Output:["_col0","_col1","_col2","_col3","_col5"]
                                                 Filter Operator [FIL_218] 
(rows=231000 width=1436)
-                                                  predicate:(((((i_item_sk is 
not null and (i_category = 'Sports')) and i_brand_id is not null) and 
i_class_id is not null) and i_category_id is not null) and i_manufact_id is not 
null)
+                                                  predicate:((((((i_category = 
'Sports') and i_item_sk is not null) and i_brand_id is not null) and i_class_id 
is not null) and i_category_id is not null) and i_manufact_id is not null)
                                                   TableScan [TS_3] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/a6d9bf76/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 ad9aa89..72ac500 100644
--- a/ql/src/test/results/clientpositive/perf/query85.q.out
+++ b/ql/src/test/results/clientpositive/perf/query85.q.out
@@ -92,7 +92,7 @@ Stage-0
                                             Select Operator [SEL_25] 
(rows=19800 width=362)
                                               Output:["_col0","_col1","_col2"]
                                               Filter Operator [FIL_97] 
(rows=19800 width=362)
-                                                predicate:((((cd_demo_sk is 
not null and cd_marital_status is not null) and cd_education_status is not 
null) and ((cd_education_status = '4 yr Degree') or (cd_education_status = 
'Primary') or (cd_education_status = 'Advanced Degree'))) and 
((cd_marital_status = 'M') or (cd_marital_status = 'D') or (cd_marital_status = 
'U')))
+                                                
predicate:((((((cd_education_status = '4 yr Degree') or (cd_education_status = 
'Primary') or (cd_education_status = 'Advanced Degree')) and 
((cd_marital_status = 'M') or (cd_marital_status = 'D') or (cd_marital_status = 
'U'))) and cd_demo_sk is not null) and cd_marital_status is not null) and 
cd_education_status is not null)
                                                 TableScan [TS_23] (rows=19800 
width=362)
                                                   
default@customer_demographics,cd1,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
                                         <-Reducer 4 [SIMPLE_EDGE]

Reply via email to