http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index 6a57f1f..bbe4c29 100644
--- 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/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 BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -53,7 +53,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)
@@ -163,7 +163,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -181,7 +181,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)
@@ -288,7 +288,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -307,7 +307,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)
@@ -438,7 +438,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -457,7 +457,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)
@@ -570,7 +570,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -588,7 +588,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)
@@ -698,7 +698,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (cint BETWEEN 1000000 AND 3000000 and cint is 
not null) (type: boolean)
+                    predicate: (cint is not null and 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)
@@ -717,7 +717,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((cbigint is not null and cint BETWEEN 1000000 
AND 3000000) and cint is not null) (type: boolean)
+                    predicate: ((cint is not null and cbigint is not null) and 
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)

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 63121a9..1f74c89 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
@@ -224,10 +224,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -350,10 +350,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -479,10 +479,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -513,10 +513,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -663,10 +663,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -682,10 +682,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -825,10 +825,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -950,7 +950,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (hr is not null and ds is not null) (type: 
boolean)
+                  filterExpr: (ds is not null and hr is not null) (type: 
boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: ds (type: string), hr (type: string)
@@ -966,10 +966,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -1090,10 +1090,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1216,10 +1216,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -1338,10 +1338,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1464,10 +1464,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1590,10 +1590,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1701,10 +1701,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1825,10 +1825,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -2238,10 +2238,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (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: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (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)
@@ -2706,10 +2706,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -2851,10 +2851,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -2870,10 +2870,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3706,10 +3706,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3854,10 +3854,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -3888,10 +3888,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: string)
@@ -4025,10 +4025,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                  filterExpr: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((date = '2008-04-08') and (UDFToDouble(hour) 
= 11.0)) and hr is not null) and ds is not null) (type: boolean)
+                    predicate: (((ds is not null and hr is not null) and (date 
= '2008-04-08')) and (UDFToDouble(hour) = 11.0)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 360 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)
@@ -4174,10 +4174,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = 'I DONT EXIST') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = 'I DONT EXIST')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -4284,10 +4284,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4405,10 +4405,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                  filterExpr: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
+                    predicate: (hr is not null and (UDFToDouble(hour) = 11.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4964,10 +4964,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5074,10 +5074,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (UDFToDouble(hr) = 13.0)) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5093,10 +5093,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date
-                  filterExpr: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                  filterExpr: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((date = '2008-04-08') and ds is not null) 
(type: boolean)
+                    predicate: (ds is not null and (date = '2008-04-08')) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string)
@@ -5469,10 +5469,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
+                  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)
                   Statistics: Num rows: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
+                    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)
                     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/48b201ee/ql/src/test/results/clientpositive/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/louter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
index 553def9..ea0779f 100644
--- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
@@ -993,7 +993,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((((UDFToDouble(key) > 15.0) and (UDFToDouble(key) < 
25.0)) and (UDFToDouble(key) < 20.0)) and (UDFToDouble(key) > 10.0)) (type: 
boolean)
+              predicate: ((((UDFToDouble(key) > 15.0) and (UDFToDouble(key) < 
25.0)) and (UDFToDouble(key) > 10.0)) and (UDFToDouble(key) < 20.0)) (type: 
boolean)
               Statistics: Num rows: 12 Data size: 127 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 41d824c..6193580 100644
--- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
@@ -512,7 +512,7 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((value > 'val_450') and key is not null) (type: 
boolean)
+              predicate: (key is not null and (value > 'val_450')) (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/48b201ee/ql/src/test/results/clientpositive/mergejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mergejoin.q.out 
b/ql/src/test/results/clientpositive/mergejoin.q.out
index acf816e..b794f1a 100644
--- a/ql/src/test/results/clientpositive/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/mergejoin.q.out
@@ -2681,14 +2681,12 @@ NULL    NULL    NULL    98      val_98  2008-04-08
 PREHOOK: query: select * from (select * from tab where tab.key = 0)a right 
outer join (select * from tab_part where tab_part.key = 98)b on a.key = b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab
-PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
 POSTHOOK: query: select * from (select * from tab where tab.key = 0)a right 
outer join (select * from tab_part where tab_part.key = 98)b on a.key = b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tab
-POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -2700,7 +2698,6 @@ full outer join
 (select * from tab_part where tab_part.key = 98)b join tab_part c on a.key = 
b.key and b.key = c.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab
-PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -2710,7 +2707,6 @@ full outer join
 (select * from tab_part where tab_part.key = 98)b join tab_part c on a.key = 
b.key and b.key = c.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tab
-POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -2720,7 +2716,6 @@ full outer join
 (select * from tab_part where tab_part.key = 98)b on a.key = b.key join 
tab_part c on b.key = c.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab
-PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -2730,7 +2725,6 @@ full outer join
 (select * from tab_part where tab_part.key = 98)b on a.key = b.key join 
tab_part c on b.key = c.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tab
-POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -3271,7 +3265,6 @@ join
 (select * from tab_part where tab_part.key = 98)b on a.key = b.key full outer 
join tab_part c on b.key = c.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab
-PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
@@ -3281,7 +3274,6 @@ join
 (select * from tab_part where tab_part.key = 98)b on a.key = b.key full outer 
join tab_part c on b.key = c.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tab
-POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/mergejoins.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mergejoins.q.out 
b/ql/src/test/results/clientpositive/mergejoins.q.out
index 9010410..eb3ad8a 100644
--- a/ql/src/test/results/clientpositive/mergejoins.q.out
+++ b/ql/src/test/results/clientpositive/mergejoins.q.out
@@ -233,16 +233,19 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string)
-              outputColumnNames: _col0, _col1
+            Filter Operator
+              predicate: key is not null (type: boolean)
               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)
+              Select Operator
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                value expressions: _col1 (type: string)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mergejoins_mixed.q.out 
b/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
index 10f37f9..197e6e6 100644
--- a/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
+++ b/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
@@ -61,29 +61,35 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string)
-              outputColumnNames: _col0, _col1
+            Filter Operator
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Reduce Output Operator
-                key expressions: _col0 (type: string)
-                sort order: +
-                Map-reduce partition columns: _col0 (type: string)
+              Select Operator
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
-                value expressions: _col1 (type: string)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
+                  value expressions: _col1 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string)
-              outputColumnNames: _col0, _col1
+            Filter Operator
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Reduce Output Operator
-                key expressions: _col0 (type: string)
-                sort order: +
-                Map-reduce partition columns: _col0 (type: string)
+              Select Operator
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
-                value expressions: _col1 (type: string)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -160,16 +166,19 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string)
-              outputColumnNames: _col0, _col1
+            Filter Operator
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Reduce Output Operator
-                key expressions: _col0 (type: string)
-                sort order: +
-                Map-reduce partition columns: _col0 (type: string)
+              Select Operator
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
-                value expressions: _col1 (type: string)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
+                  value expressions: _col1 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
@@ -460,16 +469,19 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string)
-              outputColumnNames: _col0, _col1
+            Filter Operator
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Reduce Output Operator
-                key expressions: _col0 (type: string)
-                sort order: +
-                Map-reduce partition columns: _col0 (type: string)
+              Select Operator
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
-                value expressions: _col1 (type: string)
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/orc_llap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_llap.q.out 
b/ql/src/test/results/clientpositive/orc_llap.q.out
index 7ab3d14..f6d7508 100644
--- a/ql/src/test/results/clientpositive/orc_llap.q.out
+++ b/ql/src/test/results/clientpositive/orc_llap.q.out
@@ -557,10 +557,10 @@ STAGE PLANS:
         $hdt$_0:o1 
           TableScan
             alias: o1
-            filterExpr: (cbigint is not null and csmallint is not null) (type: 
boolean)
+            filterExpr: (csmallint is not null and cbigint is not null) (type: 
boolean)
             Statistics: Num rows: 122880 Data size: 29079940 Basic stats: 
COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (cbigint is not null and csmallint is not null) 
(type: boolean)
+              predicate: (csmallint is not null and cbigint is not null) 
(type: boolean)
               Statistics: Num rows: 122880 Data size: 29079940 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: csmallint (type: smallint), cstring1 (type: 
string)
@@ -576,10 +576,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: o1
-            filterExpr: (cbigint is not null and csmallint is not null) (type: 
boolean)
+            filterExpr: (csmallint is not null and cbigint is not null) (type: 
boolean)
             Statistics: Num rows: 122880 Data size: 29079940 Basic stats: 
COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (cbigint is not null and csmallint is not null) 
(type: boolean)
+              predicate: (csmallint is not null and cbigint is not null) 
(type: boolean)
               Statistics: Num rows: 122880 Data size: 29079940 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: csmallint (type: smallint), cstring2 (type: 
string)
@@ -998,10 +998,10 @@ STAGE PLANS:
         $hdt$_0:o1 
           TableScan
             alias: o1
-            filterExpr: (cbigint is not null and csmallint is not null) (type: 
boolean)
+            filterExpr: (csmallint is not null and cbigint is not null) (type: 
boolean)
             Statistics: Num rows: 14111 Data size: 1580469 Basic stats: 
COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (cbigint is not null and csmallint is not null) 
(type: boolean)
+              predicate: (csmallint is not null and cbigint is not null) 
(type: boolean)
               Statistics: Num rows: 14111 Data size: 1580469 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: csmallint (type: smallint), cstring1 (type: 
string)
@@ -1017,10 +1017,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: o1
-            filterExpr: (cbigint is not null and csmallint is not null) (type: 
boolean)
+            filterExpr: (csmallint is not null and cbigint is not null) (type: 
boolean)
             Statistics: Num rows: 14111 Data size: 1580469 Basic stats: 
COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (cbigint is not null and csmallint is not null) 
(type: boolean)
+              predicate: (csmallint is not null and cbigint is not null) 
(type: boolean)
               Statistics: Num rows: 14111 Data size: 1580469 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: csmallint (type: smallint), cstring2 (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query13.q.out 
b/ql/src/test/results/clientpositive/perf/query13.q.out
index 6113d18..b8dc4cc 100644
--- a/ql/src/test/results/clientpositive/perf/query13.q.out
+++ b/ql/src/test/results/clientpositive/perf/query13.q.out
@@ -153,7 +153,7 @@ Stage-0
                      |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 36524 Data size: 40870356 
Basic stats: COMPLETE Column stats: NONE
                      |        Filter Operator [FIL_68]
-                     |           predicate:(d_date_sk is not null and (d_year 
= 2001)) (type: boolean)
+                     |           predicate:((d_year = 2001) and d_date_sk is 
not null) (type: boolean)
                      |           Statistics:Num rows: 36524 Data size: 
40870356 Basic stats: COMPLETE Column stats: NONE
                      |           TableScan [TS_31]
                      |              alias:date_dim
@@ -277,7 +277,7 @@ Stage-0
                                                          |        
outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                                                          |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                          |        Filter 
Operator [FIL_63]
-                                                         |           
predicate:(((((((ss_net_profit BETWEEN 100 AND 200 or ss_net_profit BETWEEN 150 
AND 300 or ss_net_profit BETWEEN 50 AND 250) and ss_store_sk is not null) and 
(ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 
100.0 or ss_sales_price BETWEEN 150.0 AND 200.0)) and ss_cdemo_sk is not null) 
and ss_hdemo_sk is not null) and ss_addr_sk is not null) and ss_sold_date_sk is 
not null) (type: boolean)
+                                                         |           
predicate:(((((((ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price 
BETWEEN 50.0 AND 100.0 or ss_sales_price BETWEEN 150.0 AND 200.0) and 
(ss_net_profit BETWEEN 100 AND 200 or ss_net_profit BETWEEN 150 AND 300 or 
ss_net_profit BETWEEN 50 AND 250)) and ss_store_sk is not null) and ss_cdemo_sk 
is not null) and ss_hdemo_sk is not null) and ss_addr_sk is not null) and 
ss_sold_date_sk is not null) (type: boolean)
                                                          |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                          |           TableScan 
[TS_0]
                                                          |              
alias:store_sales

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query17.q.out 
b/ql/src/test/results/clientpositive/perf/query17.q.out
index 0e42d05..1e468f5 100644
--- a/ql/src/test/results/clientpositive/perf/query17.q.out
+++ b/ql/src/test/results/clientpositive/perf/query17.q.out
@@ -212,7 +212,7 @@ Stage-0
                                                                   |        
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                   |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |        
Filter Operator [FIL_92]
-                                                                  |           
predicate:((cs_item_sk is not null and cs_bill_customer_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
+                                                                  |           
predicate:((cs_bill_customer_sk is not null and cs_item_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
                                                                   |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |           
TableScan [TS_6]
                                                                   |            
  alias:catalog_sales
@@ -240,7 +240,7 @@ Stage-0
                                                                         |      
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                                         |      
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
  Filter Operator [FIL_90]
-                                                                        |      
     predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) 
and ss_item_sk is not null) and ss_sold_date_sk is not null) and ss_store_sk is 
not null) (type: boolean)
+                                                                        |      
     predicate:((((ss_item_sk is not null and ss_customer_sk is not null) and 
ss_ticket_number is not null) and ss_sold_date_sk is not null) and ss_store_sk 
is not null) (type: boolean)
                                                                         |      
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
     TableScan [TS_0]
                                                                         |      
        alias:store_sales
@@ -256,7 +256,7 @@ Stage-0
                                                                                
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                                                
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
  Filter Operator [FIL_91]
-                                                                               
     predicate:(((sr_ticket_number is not null and sr_customer_sk is not null) 
and sr_item_sk is not null) and sr_returned_date_sk is not null) (type: boolean)
+                                                                               
     predicate:(((sr_item_sk is not null and sr_customer_sk is not null) and 
sr_ticket_number is not null) and sr_returned_date_sk is not null) (type: 
boolean)
                                                                                
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
     TableScan [TS_3]
                                                                                
        alias:store_returns

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query18.q.out 
b/ql/src/test/results/clientpositive/perf/query18.q.out
index 83f21dc..9ab9043 100644
--- a/ql/src/test/results/clientpositive/perf/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/query18.q.out
@@ -129,7 +129,7 @@ Stage-0
                                                 |        
outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                 |        Statistics:Num rows: 
40000000 Data size: 34400807926 Basic stats: COMPLETE Column stats: NONE
                                                 |        Filter Operator 
[FIL_80]
-                                                |           
predicate:(((c_customer_sk is not null and (c_birth_month) IN (9, 5, 12, 4, 1, 
10)) and c_current_addr_sk is not null) and c_current_cdemo_sk is not null) 
(type: boolean)
+                                                |           
predicate:((((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_customer_sk is not 
null) and c_current_addr_sk is not null) and c_current_cdemo_sk is not null) 
(type: boolean)
                                                 |           Statistics:Num 
rows: 40000000 Data size: 34400807926 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_12]
                                                 |              alias:customer
@@ -228,7 +228,7 @@ Stage-0
                                                                            
outputColumnNames:["_col0"]
                                                                            
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
                                                                            
Filter Operator [FIL_77]
-                                                                              
predicate:(d_date_sk is not null and (d_year = 2001)) (type: boolean)
+                                                                              
predicate:((d_year = 2001) and d_date_sk is not null) (type: boolean)
                                                                               
Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column 
stats: NONE
                                                                               
TableScan [TS_3]
                                                                                
  alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query19.q.out 
b/ql/src/test/results/clientpositive/perf/query19.q.out
index d565839..e6d6438 100644
--- a/ql/src/test/results/clientpositive/perf/query19.q.out
+++ b/ql/src/test/results/clientpositive/perf/query19.q.out
@@ -183,7 +183,7 @@ Stage-0
                                                             |        
outputColumnNames:["_col0"]
                                                             |        
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |        Filter 
Operator [FIL_64]
-                                                            |           
predicate:(((d_moy = 11) and d_date_sk is not null) and (d_year = 1999)) (type: 
boolean)
+                                                            |           
predicate:(((d_moy = 11) and (d_year = 1999)) and d_date_sk is not null) (type: 
boolean)
                                                             |           
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_0]
                                                             |              
alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query25.q.out 
b/ql/src/test/results/clientpositive/perf/query25.q.out
index dabc1c5..a4973cd 100644
--- a/ql/src/test/results/clientpositive/perf/query25.q.out
+++ b/ql/src/test/results/clientpositive/perf/query25.q.out
@@ -130,7 +130,7 @@ Stage-0
                                                 |        
outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 
18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                 |        Filter Operator 
[FIL_94]
-                                                |           
predicate:(((d_year = 1998) and d_moy BETWEEN 4 AND 10) and d_date_sk is not 
null) (type: boolean)
+                                                |           predicate:((d_moy 
BETWEEN 4 AND 10 and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                                 |           Statistics:Num 
rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_15]
                                                 |              alias:d1
@@ -157,7 +157,7 @@ Stage-0
                                                       |        
outputColumnNames:["_col0"]
                                                       |        Statistics:Num 
rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                       |        Filter Operator 
[FIL_93]
-                                                      |           
predicate:(((d_year = 1998) and d_moy BETWEEN 4 AND 10) and d_date_sk is not 
null) (type: boolean)
+                                                      |           
predicate:((d_moy BETWEEN 4 AND 10 and (d_year = 1998)) and d_date_sk is not 
null) (type: boolean)
                                                       |           
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                       |           TableScan 
[TS_12]
                                                       |              alias:d1
@@ -184,7 +184,7 @@ Stage-0
                                                             |        
outputColumnNames:["_col0"]
                                                             |        
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |        Filter 
Operator [FIL_92]
-                                                            |           
predicate:(((d_year = 1998) and (d_moy = 4)) and d_date_sk is not null) (type: 
boolean)
+                                                            |           
predicate:(((d_moy = 4) and (d_year = 1998)) and d_date_sk is not null) (type: 
boolean)
                                                             |           
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_9]
                                                             |              
alias:d1
@@ -212,7 +212,7 @@ Stage-0
                                                                   |        
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                   |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |        
Filter Operator [FIL_91]
-                                                                  |           
predicate:((cs_item_sk is not null and cs_bill_customer_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
+                                                                  |           
predicate:((cs_bill_customer_sk is not null and cs_item_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
                                                                   |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |           
TableScan [TS_6]
                                                                   |            
  alias:catalog_sales
@@ -240,7 +240,7 @@ Stage-0
                                                                         |      
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                                         |      
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
  Filter Operator [FIL_89]
-                                                                        |      
     predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) 
and ss_item_sk is not null) and ss_sold_date_sk is not null) and ss_store_sk is 
not null) (type: boolean)
+                                                                        |      
     predicate:((((ss_item_sk is not null and ss_customer_sk is not null) and 
ss_ticket_number is not null) and ss_sold_date_sk is not null) and ss_store_sk 
is not null) (type: boolean)
                                                                         |      
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
     TableScan [TS_0]
                                                                         |      
        alias:store_sales
@@ -256,7 +256,7 @@ Stage-0
                                                                                
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                                                
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
  Filter Operator [FIL_90]
-                                                                               
     predicate:(((sr_ticket_number is not null and sr_customer_sk is not null) 
and sr_item_sk is not null) and sr_returned_date_sk is not null) (type: boolean)
+                                                                               
     predicate:(((sr_item_sk is not null and sr_customer_sk is not null) and 
sr_ticket_number is not null) and sr_returned_date_sk is not null) (type: 
boolean)
                                                                                
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
     TableScan [TS_3]
                                                                                
        alias:store_returns

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/ql/src/test/results/clientpositive/perf/query29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query29.q.out 
b/ql/src/test/results/clientpositive/perf/query29.q.out
index 8991f35..2471d93 100644
--- a/ql/src/test/results/clientpositive/perf/query29.q.out
+++ b/ql/src/test/results/clientpositive/perf/query29.q.out
@@ -184,7 +184,7 @@ Stage-0
                                                             |        
outputColumnNames:["_col0"]
                                                             |        
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |        Filter 
Operator [FIL_92]
-                                                            |           
predicate:(((d_year = 2000) and (d_moy = 2)) and d_date_sk is not null) (type: 
boolean)
+                                                            |           
predicate:(((d_moy = 2) and (d_year = 2000)) and d_date_sk is not null) (type: 
boolean)
                                                             |           
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                             |           
TableScan [TS_9]
                                                             |              
alias:d1
@@ -212,7 +212,7 @@ Stage-0
                                                                   |        
outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                                   |        
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |        
Filter Operator [FIL_91]
-                                                                  |           
predicate:((cs_item_sk is not null and cs_bill_customer_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
+                                                                  |           
predicate:((cs_bill_customer_sk is not null and cs_item_sk is not null) and 
cs_sold_date_sk is not null) (type: boolean)
                                                                   |           
Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                   |           
TableScan [TS_6]
                                                                   |            
  alias:catalog_sales
@@ -240,7 +240,7 @@ Stage-0
                                                                         |      
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                                         |      
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
  Filter Operator [FIL_89]
-                                                                        |      
     predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) 
and ss_item_sk is not null) and ss_sold_date_sk is not null) and ss_store_sk is 
not null) (type: boolean)
+                                                                        |      
     predicate:((((ss_item_sk is not null and ss_customer_sk is not null) and 
ss_ticket_number is not null) and ss_sold_date_sk is not null) and ss_store_sk 
is not null) (type: boolean)
                                                                         |      
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                         |      
     TableScan [TS_0]
                                                                         |      
        alias:store_sales
@@ -256,7 +256,7 @@ Stage-0
                                                                                
  outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                                                
  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
  Filter Operator [FIL_90]
-                                                                               
     predicate:(((sr_ticket_number is not null and sr_customer_sk is not null) 
and sr_item_sk is not null) and sr_returned_date_sk is not null) (type: boolean)
+                                                                               
     predicate:(((sr_item_sk is not null and sr_customer_sk is not null) and 
sr_ticket_number is not null) and sr_returned_date_sk is not null) (type: 
boolean)
                                                                                
     Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                                
     TableScan [TS_3]
                                                                                
        alias:store_returns

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 909d64c..5c2186d 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -145,7 +145,7 @@ Stage-0
                         |                                   
outputColumnNames:["_col0"]
                         |                                   Statistics:Num 
rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                         |                                   Filter Operator 
[FIL_266]
-                        |                                      
predicate:(((d_qoy = 3) and (d_year = 1998)) and d_date_sk is not null) (type: 
boolean)
+                        |                                      
predicate:((d_date_sk is not null and (d_qoy = 3)) and (d_year = 1998)) (type: 
boolean)
                         |                                      Statistics:Num 
rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                         |                                      TableScan 
[TS_116]
                         |                                         
alias:date_dim
@@ -257,7 +257,7 @@ Stage-0
                                     |                                   
outputColumnNames:["_col0"]
                                     |                                   
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                   Filter 
Operator [FIL_254]
-                                    |                                      
predicate:(((d_qoy = 2) and (d_year = 1998)) and d_date_sk is not null) (type: 
boolean)
+                                    |                                      
predicate:((d_date_sk is not null and (d_qoy = 2)) and (d_year = 1998)) (type: 
boolean)
                                     |                                      
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                      
TableScan [TS_24]
                                     |                                         
alias:date_dim
@@ -351,7 +351,7 @@ Stage-0
                                     |                                   
outputColumnNames:["_col0"]
                                     |                                   
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                   Filter 
Operator [FIL_257]
-                                    |                                      
predicate:(((d_qoy = 3) and (d_year = 1998)) and d_date_sk is not null) (type: 
boolean)
+                                    |                                      
predicate:((d_date_sk is not null and (d_qoy = 3)) and (d_year = 1998)) (type: 
boolean)
                                     |                                      
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                      
TableScan [TS_45]
                                     |                                         
alias:date_dim
@@ -445,7 +445,7 @@ Stage-0
                                     |                                   
outputColumnNames:["_col0"]
                                     |                                   
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                   Filter 
Operator [FIL_260]
-                                    |                                      
predicate:(((d_year = 1998) and (d_qoy = 1)) and d_date_sk is not null) (type: 
boolean)
+                                    |                                      
predicate:((d_date_sk is not null and (d_qoy = 1)) and (d_year = 1998)) (type: 
boolean)
                                     |                                      
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                      
TableScan [TS_66]
                                     |                                         
alias:date_dim
@@ -539,7 +539,7 @@ Stage-0
                                     |                                   
outputColumnNames:["_col0"]
                                     |                                   
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                   Filter 
Operator [FIL_263]
-                                    |                                      
predicate:(((d_qoy = 2) and (d_year = 1998)) and d_date_sk is not null) (type: 
boolean)
+                                    |                                      
predicate:((d_date_sk is not null and (d_qoy = 2)) and (d_year = 1998)) (type: 
boolean)
                                     |                                      
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                     |                                      
TableScan [TS_87]
                                     |                                         
alias:date_dim
@@ -633,7 +633,7 @@ Stage-0
                                                                         
outputColumnNames:["_col0"]
                                                                         
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                                         Filter 
Operator [FIL_251]
-                                                                           
predicate:(((d_year = 1998) and (d_qoy = 1)) and d_date_sk is not null) (type: 
boolean)
+                                                                           
predicate:((d_date_sk is not null and (d_qoy = 1)) and (d_year = 1998)) (type: 
boolean)
                                                                            
Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column 
stats: NONE
                                                                            
TableScan [TS_3]
                                                                               
alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 da2ac8f..ecc5834 100644
--- a/ql/src/test/results/clientpositive/perf/query32.q.out
+++ b/ql/src/test/results/clientpositive/perf/query32.q.out
@@ -88,7 +88,7 @@ Stage-0
                            |        outputColumnNames:["_col0"]
                            |        Statistics:Num rows: 231000 Data size: 
331780228 Basic stats: COMPLETE Column stats: NONE
                            |        Filter Operator [FIL_54]
-                           |           predicate:((i_manufact_id = 436) and 
i_item_sk is not null) (type: boolean)
+                           |           predicate:(i_item_sk is not null and 
(i_manufact_id = 436)) (type: boolean)
                            |           Statistics:Num rows: 231000 Data size: 
331780228 Basic stats: COMPLETE Column stats: NONE
                            |           TableScan [TS_10]
                            |              alias:i
@@ -134,7 +134,7 @@ Stage-0
                            |                 outputColumnNames:["_col0"]
                            |                 Statistics:Num rows: 36524 Data 
size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                 Filter Operator [FIL_53]
-                           |                    predicate:(d_date BETWEEN 
'2000-01-27' AND '2000-04-27' and d_date_sk is not null) (type: boolean)
+                           |                    predicate:(d_date_sk is not 
null and d_date BETWEEN '2000-01-27' AND '2000-04-27') (type: boolean)
                            |                    Statistics:Num rows: 36524 
Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                    TableScan [TS_3]
                            |                       alias:d
@@ -181,7 +181,7 @@ Stage-0
                                              |        
outputColumnNames:["_col0"]
                                              |        Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                              |        Filter Operator [FIL_56]
-                                             |           predicate:(d_date 
BETWEEN '2000-01-27' AND '2000-04-27' and d_date_sk is not null) (type: boolean)
+                                             |           predicate:(d_date_sk 
is not null and d_date BETWEEN '2000-01-27' AND '2000-04-27') (type: boolean)
                                              |           Statistics:Num rows: 
36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                              |           TableScan [TS_16]
                                              |              alias:d

Reply via email to