http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_windowing_gby.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing_gby.q.out
index 993ea61..5dffd15 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing_gby.q.out
@@ -33,6 +33,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ws
+                  filterExpr: value is not null (type: boolean)
                   Statistics: Num rows: 20 Data size: 1767 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -85,6 +86,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: wr
+                  filterExpr: cstring1 is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 899146 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_gby2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_windowing_gby2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing_gby2.q.out
index 493d404..75c393e9 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing_gby2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing_gby2.q.out
@@ -873,6 +873,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ws
+                  filterExpr: value is not null (type: boolean)
                   Statistics: Num rows: 20 Data size: 1767 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -925,6 +926,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: wr
+                  filterExpr: cstring1 is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 899146 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out
 
b/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out
index 1a06f08..725ed34 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out
@@ -10238,6 +10238,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n6
+                  filterExpr: ((s = 'tom allen') or (s = 'bob steinbeck')) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -10515,6 +10516,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n6
+                  filterExpr: ((s = 'tom allen') or (s = 'bob steinbeck')) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 196 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -10781,6 +10783,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n6
+                  filterExpr: ((s = 'tom allen') or (s = 'bob steinbeck')) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -11053,6 +11056,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n6
+                  filterExpr: ((s = 'tom allen') or (s = 'bob steinbeck')) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -11332,6 +11336,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n6
+                  filterExpr: ((s = 'tom allen') or (s = 'bob steinbeck')) 
(type: boolean)
                   Statistics: Num rows: 1 Data size: 304 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_navfn.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_windowing_navfn.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing_navfn.q.out
index 42e9694..74ac56d 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing_navfn.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing_navfn.q.out
@@ -71,6 +71,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src
+                  filterExpr: (key = '238') (type: boolean)
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1409,6 +1410,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n7
+                  filterExpr: (((s = 'oscar allen') or (s = 'oscar carson')) 
and (t = 10Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out
index ff7cf6c..0be304c 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out
@@ -1021,6 +1021,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: other
+                  filterExpr: b is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -1073,6 +1074,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n0
+                  filterExpr: b is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -1320,6 +1322,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: other
+                  filterExpr: b is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -1372,6 +1375,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n0
+                  filterExpr: b is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -1621,6 +1625,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: other
+                  filterExpr: ((t < 10Y) and b is not null) (type: boolean)
                   Statistics: Num rows: 1 Data size: 164 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
@@ -1673,6 +1678,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n0
+                  filterExpr: b is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vector_windowing_streaming.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_windowing_streaming.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing_streaming.q.out
index 55899ef..cf8f348 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing_streaming.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing_streaming.q.out
@@ -420,6 +420,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over10k_n8
+                  filterExpr: (t < 5Y) (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
index 2a8ae49..d882657 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
@@ -1609,6 +1609,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 like '%b%') or (CAST( cint AS 
decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or 
((UDFToShort(ctinyint) >= csmallint) and (cboolean2 = 1) and 
(UDFToInteger(ctinyint) = 3569))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1210980 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1806,6 +1807,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring1 like 'a%') or (cstring1 like 'b%') or 
(cstring1 like 'c%') or ((length(cstring1) < 50) and (cstring1 like '%n') and 
(length(cstring1) > 0))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 862450 Basic stats: 
COMPLETE Column stats: COMPLETE
                   GatherStats: false
                   Filter Operator
@@ -30617,6 +30619,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cint = 49) and (cfloat = 3.5)) or ((cint = 
47) and (cfloat = 2.09)) or ((cint = 45) and (cfloat = 3.02))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3093170 Basic stats: 
COMPLETE Column stats: COMPLETE
                   GatherStats: false
                   Filter Operator
@@ -30734,6 +30737,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (struct(cint,cfloat)) IN (const struct(49,3.5), 
const struct(47,2.09), const struct(45,3.02)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3093170 Basic stats: 
COMPLETE Column stats: COMPLETE
                   GatherStats: false
                   Filter Operator
@@ -30851,6 +30855,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cint = 49) or (cfloat = 3.5)) and ((cint = 
47) or (cfloat = 2.09)) and ((cint = 45) or (cfloat = 3.02))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3093170 Basic stats: 
COMPLETE Column stats: COMPLETE
                   GatherStats: false
                   Filter Operator
@@ -30970,6 +30975,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (cstring1) IN ('biology', 'history', 'topology') 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 862450 Basic stats: 
COMPLETE Column stats: COMPLETE
                   GatherStats: false
                   Filter Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_1.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_1.q.out
index bdc4de4..d2fcbc2 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_1.q.out
@@ -60,6 +60,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cdouble > UDFToDouble(ctinyint)) and 
(cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > 
cbigint) or (cboolean1 < 0)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 330276 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_10.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_10.q.out
index 5cba462..7b004d8 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_10.q.out
@@ -63,6 +63,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > 
cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 
6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 
like '%a')))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2491562 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_11.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_11.q.out
index 45a3e58..41f7dd8 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_11.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_11.q.out
@@ -45,6 +45,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 = cstring1) or (ctimestamp1 is null 
and (cstring1 like '%a'))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2381474 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_12.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_12.q.out
index 7b508a0..b90a7fe 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_12.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_12.q.out
@@ -83,6 +83,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (ctimestamp1 is null and ((cboolean1 >= 
cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or 
((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1647554 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_13.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_13.q.out
index 222d232..173e2cb 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_13.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_13.q.out
@@ -85,6 +85,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cfloat < 3569) and (cdouble <= 10.175D) and 
(cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > 11.0D) and 
(UDFToDouble(ctimestamp2) <> 12.0D) and (CAST( ctinyint AS decimal(11,4)) < 
9763215.5639))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2028982 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -440,6 +441,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cfloat < 3569) and (cdouble <= 10.175D) and 
(cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -1.388D) and 
(UDFToDouble(ctimestamp2) <> -1.3359999999999999D) and (CAST( ctinyint AS 
decimal(11,4)) < 9763215.5639))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2028982 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_14.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_14.q.out
index 6f99dde..ac63435 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_14.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_14.q.out
@@ -85,6 +85,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((UDFToLong(ctinyint) <= cbigint) and 
((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < 
UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 2139070 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_15.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_15.q.out
index 1f13589..db49ad2 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_15.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_15.q.out
@@ -81,6 +81,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') 
or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= 
-3728.0D))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2491562 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_16.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_16.q.out
index 33e72fc..5f7c8c2 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_16.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_16.q.out
@@ -58,6 +58,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 like '%b%') and ((cdouble >= -1.389D) 
or (cstring1 < 'a'))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2308074 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_17.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_17.q.out
index 4d5f2e5..ef47725 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_17.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_17.q.out
@@ -66,6 +66,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or 
(CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or 
(UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: 
boolean)
                   Statistics: Num rows: 12288 Data size: 1647550 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_2.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_2.q.out
index 29850bb..88d7f65 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_2.q.out
@@ -64,6 +64,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 
'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and 
((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2157324 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_3.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_3.q.out
index 97ad680..47b16f7 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_3.q.out
@@ -69,6 +69,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((UDFToFloat(cint) <= cfloat) and (CAST( 
cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = 
-29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS 
decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1276620 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_4.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_4.q.out
index c459a8c..9eabe7e 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_4.q.out
@@ -64,6 +64,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((UDFToInteger(csmallint) >= cint) or 
((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> 
-563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: 
boolean)
                   Statistics: Num rows: 12288 Data size: 256884 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_5.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_5.q.out
index 14a4691..15ee8e0 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_5.q.out
@@ -58,6 +58,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cboolean2 is not null and (cstring1 like 
'%b%')) or ((UDFToDouble(ctinyint) = cdouble) and ctimestamp2 is not null and 
(cstring2 like 'a'))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2454862 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_6.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_6.q.out
index d863334..70542ac 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_6.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_6.q.out
@@ -57,6 +57,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and 
(cboolean2 >= cboolean1)) or (cbigint is not null and ((cstring2 like '%a') or 
(cfloat <= -257))))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2110130 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_7.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_7.q.out
index b0e682a..2bbf611 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_7.q.out
@@ -72,6 +72,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) 
<= 0.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and 
((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -15.0D) and (cdouble <= 
3569.0D)))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3019778 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -322,6 +323,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) 
<= 0.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and 
((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > 7.6850000000000005D) and 
(cdouble <= 3569.0D)))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3019778 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_8.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_8.q.out
index 3a09542..3eeccf8 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_8.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_8.q.out
@@ -68,6 +68,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 is not null and 
(UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D)) or 
(cfloat < -6432) or (cboolean1 is not null and (cdouble = 988888.0D))) (type: 
boolean)
                   Statistics: Num rows: 12288 Data size: 2983078 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -305,6 +306,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 is not null and 
(UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 
11.998D)) or (cfloat < -6432) or (cboolean1 is not null and (cdouble = 
988888.0D))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2983078 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_9.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_9.q.out
index 33e72fc..5f7c8c2 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_9.q.out
@@ -58,6 +58,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring2 like '%b%') and ((cdouble >= -1.389D) 
or (cstring1 < 'a'))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2308074 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out
index f19d8a6..80a6501 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out
@@ -33,6 +33,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: date_decimal_test
+                  filterExpr: (cint is not null and cdouble is not null) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 2101500 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
index 8f4acba..fcb084a 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
@@ -240,6 +240,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint > 0L) and (cbigint < 100000000L)) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 146792 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -459,6 +460,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cdouble >= -500.0D) and (cdouble < -199.0D)) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 146792 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -678,6 +680,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cint > 500000000) or (cdouble > 1.0E9D) or 
(ctinyint = 0Y)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 220184 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
 
b/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
index becc03c..547afa0 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
@@ -73,6 +73,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypes_parquet_n0
+                  filterExpr: (cint = 528534767) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1082638 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (cint = 528534767) (type: boolean)
@@ -409,6 +410,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypes_parquet_n0
+                  filterExpr: (cint = 528534767) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1082638 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (cint = 528534767) (type: boolean)
@@ -735,6 +737,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypes_parquet_n0
+                  filterExpr: (cint = 528534767) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1082638 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (cint = 528534767) (type: boolean)
@@ -1119,6 +1122,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypes_orc_n2
+                  filterExpr: (cint = 528534767) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1082638 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (cint = 528534767) (type: boolean)
@@ -1459,6 +1463,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orctbl
+                  filterExpr: (UDFToInteger((t1 + t2)) > 10) (type: boolean)
                   Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: (UDFToInteger((t1 + t2)) > 10) (type: boolean)
@@ -1537,6 +1542,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: parquettbl
+                  filterExpr: (UDFToInteger((t1 + t2)) > 10) (type: boolean)
                   Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: (UDFToInteger((t1 + t2)) > 10) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
index ded40fd..e79cdf7 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
@@ -25,6 +25,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 
0)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 183488 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 
0)) (type: boolean)
@@ -121,6 +122,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ctinyint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 146796 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -873,6 +875,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ctinyint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 110096 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
index d12e038..b289c92 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
@@ -92,6 +92,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint = 762L) or ((UDFToFloat(csmallint) < 
cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> 
UDFToDouble(cint))) or (cstring1 = 'a') or ((CAST( cbigint AS decimal(22,3)) <= 
-1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and 
(cboolean2 <> cboolean1))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2601650 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -354,6 +355,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cbigint <= 197L) and (UDFToLong(cint) < 
cbigint)) or ((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or 
((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*') or ((cfloat > 
79.553) and (cstring2 like '10%'))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2036734 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -608,6 +610,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((ctimestamp1 = ctimestamp2) or (cfloat = 762) 
or (cstring1 = 'ss') or ((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) 
or (cboolean1 is not null and ctimestamp2 is not null and (cstring2 > 'a'))) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 3093170 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -841,6 +844,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((ctimestamp2 <= ctimestamp1) and 
(UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or ((csmallint < 
UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or (cfloat = 17)) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 2139070 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1082,6 +1086,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cstring1 regexp 'a.*' and (cstring2 like 
'%ss%')) or ((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) 
and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and 
(cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and 
(UDFToLong(ctinyint) > cbigint))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3056470 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1379,6 +1384,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((UDFToInteger(ctinyint) < 197) and 
(UDFToLong(cint) = cbigint)) or (cbigint = 359L) or (cboolean1 < 0) or 
((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2601650 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1625,6 +1631,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((CAST( csmallint AS decimal(7,2)) > -26.28) 
and (cstring2 like 'ss')) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 
>= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = 
-89010) or ((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS 
decimal(7,2)) >= -26.28))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2601650 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1929,6 +1936,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((CAST( cint AS decimal(13,3)) <= -1.389) and 
(csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or 
((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((cstring1 like 
'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2528254 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -2175,6 +2183,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((UDFToInteger(csmallint) >= -257) and 
((UDFToInteger(csmallint) = -6432) or ((UDFToDouble(cint) >= cdouble) and 
(UDFToInteger(ctinyint) <= cint)))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 256884 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -2452,6 +2461,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cdouble > 2563.58D) and (((cbigint >= 
UDFToLong(cint)) and (UDFToInteger(csmallint) < cint) and (cfloat < -5638.15)) 
or (CAST( ctinyint AS decimal(6,2)) = 2563.58) or ((cdouble <= 
UDFToDouble(cbigint)) and (CAST( cbigint AS decimal(21,2)) < -5638.15)))) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 293580 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -2773,6 +2783,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((UDFToDouble(ctimestamp1) <> 0.0D) and 
(((UDFToInteger(ctinyint) <> -257) and cboolean2 is not null and cstring1 
regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D)) or 
(UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and 
(cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null 
and (cfloat < UDFToFloat(cint))))) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 3019778 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -3175,6 +3186,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((((cdouble < UDFToDouble(csmallint)) and 
(cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or 
((cint >= -257) and cstring1 is not null and (cboolean1 >= 1)) or cstring2 
regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null)) 
and cboolean1 is not null) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 2601650 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_bucketmapjoin1.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_bucketmapjoin1.q.out
index 386c8be..d142f09 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_bucketmapjoin1.q.out
@@ -117,6 +117,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: b
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -124,6 +125,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: a
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -192,6 +194,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: b
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -199,6 +202,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: a
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -267,6 +271,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: b
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -274,6 +279,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: a
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_case.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
index fb81501..78098b4 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
@@ -51,6 +51,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((csmallint = 418S) or (csmallint = 12205S) or 
(csmallint = 10583S)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36700 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -200,6 +201,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((csmallint = 418S) or (csmallint = 12205S) or 
(csmallint = 10583S)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36700 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1249,7 +1251,7 @@ where (case when cint % 2 = 0 then cint else 0 end) = 
cint) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-4086
+0
 PREHOOK: query: select count(*)
 from (
 select

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
index 8f5ce87..3141b5a 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
@@ -165,6 +165,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint % 250) = 0) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1684250 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
index 778ba26..6570f74 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
@@ -116,6 +116,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: store_sales
+                  filterExpr: (ss_store_sk is not null and ss_hdemo_sk is not 
null) (type: boolean)
                   Statistics: Num rows: 6075 Data size: 72744 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (ss_hdemo_sk is not null and ss_store_sk is not 
null) (type: boolean)
@@ -173,6 +174,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: household_demographics
+                  filterExpr: hd_demo_sk is not null (type: boolean)
                   Statistics: Num rows: 6075 Data size: 24300 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: hd_demo_sk is not null (type: boolean)
@@ -201,6 +203,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: store
+                  filterExpr: s_store_sk is not null (type: boolean)
                   Statistics: Num rows: 6075 Data size: 615730 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: s_store_sk is not null (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out
index fddf320..e03948f 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out
@@ -197,6 +197,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: test2_n9
+                  filterExpr: key BETWEEN 100 AND 102 (type: boolean)
                   Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key BETWEEN 100 AND 102 (type: boolean)
@@ -304,6 +305,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: test2_n9
+                  filterExpr: key BETWEEN 100 AND 102 (type: boolean)
                   Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
                     predicate: key BETWEEN 100 AND 102 (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
index 53cb943..97e8be6 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
@@ -27,6 +27,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
+                  filterExpr: cint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -103,6 +104,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t2
+                  filterExpr: cint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out
index 053826e..e9aea17 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out
@@ -119,6 +119,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
+                  filterExpr: (decimal0801_col is not null and int_col_1 is 
not null) (type: boolean)
                   Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -323,6 +324,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
+                  filterExpr: (int_col_1 is not null and decimal0801_col is 
not null) (type: boolean)
                   Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -527,6 +529,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
+                  filterExpr: (decimal0801_col is not null and int_col_1 is 
not null) (type: boolean)
                   Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
index 57b5845..aae87d8 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
@@ -119,6 +119,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cbigint % 500) = 0) and (sin(cfloat) >= 
-1.0D)) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 293580 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_multi_output_select.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_multi_output_select.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_multi_output_select.q.out
index 052fda6..d6bad24 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_multi_output_select.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_multi_output_select.q.out
@@ -1,4 +1,4 @@
-Warning: Shuffle Join MERGEJOIN[43][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[63][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
 PREHOOK: query: explain
 select * from (
   select count(*) as h8_30_to_9
@@ -42,6 +42,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -92,6 +93,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src1
+                  filterExpr: ((value = 'val_278') and key is not null) (type: 
boolean)
                   Statistics: Num rows: 25 Data size: 4375 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((value = 'val_278') and key is not null) 
(type: boolean)
@@ -111,6 +113,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src1
+                  filterExpr: ((value = 'val_255') and key is not null) (type: 
boolean)
                   Statistics: Num rows: 25 Data size: 4375 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((value = 'val_255') and key is not null) 
(type: boolean)
@@ -175,7 +178,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[43][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[63][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
 PREHOOK: query: select * from (
   select count(*) as h8_30_to_9
   from src

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
index 7546dbb..27bab20 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
@@ -23,6 +23,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: v2
+                  filterExpr: ctinyint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ctinyint is not null (type: boolean)
@@ -79,6 +80,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: v1
+                  filterExpr: (ctinyint is not null and csmallint is not null) 
(type: boolean)
                   Statistics: Num rows: 12288 Data size: 146796 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (csmallint is not null and ctinyint is not 
null) (type: boolean)
@@ -108,6 +110,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: v3
+                  filterExpr: csmallint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36700 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: csmallint is not null (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
index 59adda0..039c206 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
@@ -70,6 +70,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: alltypes_parquet
+          filterExpr: (cint = 528534767) (type: boolean)
           Filter Operator
             predicate: (cint = 528534767) (type: boolean)
             Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
index 53bd3c9..cc6631e 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
@@ -359,6 +359,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: p1
+                  filterExpr: p_partkey is not null (type: boolean)
                   Statistics: Num rows: 26 Data size: 5902 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -403,6 +404,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: p2
+                  filterExpr: p_partkey is not null (type: boolean)
                   Statistics: Num rows: 26 Data size: 104 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1480,6 +1482,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: p1
+                  filterExpr: p_partkey is not null (type: boolean)
                   Statistics: Num rows: 26 Data size: 104 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -1658,6 +1661,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: p1
+                  filterExpr: p_partkey is not null (type: boolean)
                   Statistics: Num rows: 26 Data size: 104 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -3051,6 +3055,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: p1
+                  filterExpr: p_partkey is not null (type: boolean)
                   Statistics: Num rows: 26 Data size: 104 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
index 68c56ed..597c432 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
@@ -28,6 +28,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
+                  filterExpr: cint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -70,6 +71,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t2
+                  filterExpr: cint is not null (type: boolean)
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
index aecd67e..5281115 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
@@ -59,6 +59,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: (((cbigint % 237) = 0) and 
(length(substr(cstring1, 1, 2)) <= 2) and (cstring1 like '%')) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1816546 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (((cbigint % 237) = 0) and (cstring1 like '%') 
and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
index dfab9db..5b68f00 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
@@ -264,6 +264,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: test_n2
+                  filterExpr: (ts) IN (TIMESTAMP'0001-01-01 00:00:00.0', 
TIMESTAMP'0002-02-02 00:00:00.0') (type: boolean)
                   Statistics: Num rows: 2 Data size: 80 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
index 82d43c1..14ca738 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
@@ -51,6 +51,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint % 250) = 0) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1684250 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
@@ -215,6 +216,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
+                  filterExpr: ((cbigint % 250) = 0) (type: boolean)
                   Statistics: Num rows: 12288 Data size: 1684250 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/windowing_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/windowing_gby.q.out 
b/ql/src/test/results/clientpositive/llap/windowing_gby.q.out
index deaa943..eef7562 100644
--- a/ql/src/test/results/clientpositive/llap/windowing_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/windowing_gby.q.out
@@ -22,42 +22,42 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 4 vectorized, llap
-      File Output Operator [FS_37]
-        Select Operator [SEL_36] (rows=2 width=4)
+      File Output Operator [FS_47]
+        Select Operator [SEL_46] (rows=2 width=4)
           Output:["_col0"]
-          PTF Operator [PTF_35] (rows=2 width=16)
+          PTF Operator [PTF_45] (rows=2 width=16)
             Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"(UDFToDouble(_col1) / UDFToDouble(_col2)) ASC NULLS FIRST","partition 
by:":"0"}]
-            Select Operator [SEL_34] (rows=2 width=16)
+            Select Operator [SEL_44] (rows=2 width=16)
               Output:["_col1","_col2"]
             <-Reducer 3 [SIMPLE_EDGE] vectorized, llap
-              SHUFFLE [RS_33]
+              SHUFFLE [RS_43]
                 PartitionCols:0
-                Select Operator [SEL_32] (rows=2 width=20)
+                Select Operator [SEL_42] (rows=2 width=20)
                   Output:["_col1","_col2"]
-                  Group By Operator [GBY_31] (rows=2 width=20)
+                  Group By Operator [GBY_41] (rows=2 width=20)
                     
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0
                   <-Reducer 2 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_11]
                       PartitionCols:_col0
                       Group By Operator [GBY_10] (rows=3 width=20)
                         
Output:["_col0","_col1","_col2"],aggregations:["sum(_col3)","sum(_col1)"],keys:_col2
-                        Merge Join Operator [MERGEJOIN_24] (rows=36 width=7)
-                          
Conds:RS_27._col0=RS_30._col1(Inner),Output:["_col1","_col2","_col3"]
+                        Merge Join Operator [MERGEJOIN_34] (rows=36 width=7)
+                          
Conds:RS_37._col0=RS_40._col1(Inner),Output:["_col1","_col2","_col3"]
                         <-Map 1 [SIMPLE_EDGE] vectorized, llap
-                          SHUFFLE [RS_27]
+                          SHUFFLE [RS_37]
                             PartitionCols:_col0
-                            Select Operator [SEL_26] (rows=18 width=87)
+                            Select Operator [SEL_36] (rows=18 width=87)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_25] (rows=18 width=87)
+                              Filter Operator [FIL_35] (rows=18 width=87)
                                 predicate:value is not null
                                 TableScan [TS_0] (rows=20 width=88)
                                   
default@cbo_t3,ws,Tbl:COMPLETE,Col:COMPLETE,Output:["value","c_int","c_boolean"]
                         <-Map 5 [SIMPLE_EDGE] vectorized, llap
-                          SHUFFLE [RS_30]
+                          SHUFFLE [RS_40]
                             PartitionCols:_col1
-                            Select Operator [SEL_29] (rows=9174 width=73)
+                            Select Operator [SEL_39] (rows=9174 width=73)
                               Output:["_col0","_col1"]
-                              Filter Operator [FIL_28] (rows=9174 width=73)
+                              Filter Operator [FIL_38] (rows=9174 width=73)
                                 predicate:cstring1 is not null
                                 TableScan [TS_3] (rows=12288 width=73)
                                   
default@alltypesorc,wr,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cstring1"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part10.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part10.q.out
index 38fd78d..5320999 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part10.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part10.q.out
@@ -52,6 +52,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: key (type: string), value (type: string), hr (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part13.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part13.q.out
index 89aa84f..75e1de4 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part13.q.out
@@ -66,6 +66,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src
+            filterExpr: (UDFToDouble(key) < 20.0D) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (UDFToDouble(key) < 20.0D) (type: boolean)
@@ -102,6 +103,7 @@ STAGE PLANS:
                         value expressions: _col2 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>)
           TableScan
             alias: src
+            filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 
40.0D)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((UDFToDouble(key) < 40.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part2.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
index ce33f93..9fb551a 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
@@ -45,6 +45,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: srcpart
+            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: key (type: string), value (type: string), hr (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part3.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part3.q.out
index 823f0c7..41fa54c 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part3.q.out
@@ -50,6 +50,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: srcpart
+            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: key (type: string), value (type: string), ds (type: 
string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part4.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part4.q.out
index 2ff534b..4cdba68 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part4.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part4.q.out
@@ -60,6 +60,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: srcpart
+            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: key (type: string), value (type: string), ds (type: 
string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/load_dyn_part9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/load_dyn_part9.q.out 
b/ql/src/test/results/clientpositive/load_dyn_part9.q.out
index a5af46d..48f1516 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part9.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part9.q.out
@@ -52,6 +52,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: key (type: string), value (type: string), ds (type: 
string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/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 ba1fb0e..df11f51 100644
--- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
@@ -26,6 +26,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            filterExpr: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -47,6 +48,7 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: b
+            filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 
20.0D)) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -324,6 +326,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            filterExpr: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -345,6 +348,7 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: b
+            filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 
20.0D)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -626,6 +630,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            filterExpr: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -647,6 +652,7 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: b
+            filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 
20.0D)) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -924,6 +930,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            filterExpr: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -945,6 +952,7 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: b
+            filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 
20.0D)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/mapjoin46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mapjoin46.q.out 
b/ql/src/test/results/clientpositive/mapjoin46.q.out
index b3d418c..a4f067f 100644
--- a/ql/src/test/results/clientpositive/mapjoin46.q.out
+++ b/ql/src/test/results/clientpositive/mapjoin46.q.out
@@ -162,6 +162,7 @@ STAGE PLANS:
         $hdt$_1:test2_n2 
           TableScan
             alias: test2_n2
+            filterExpr: key BETWEEN 100 AND 102 (type: boolean)
             Statistics: Num rows: 4 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key BETWEEN 100 AND 102 (type: boolean)
@@ -268,6 +269,7 @@ STAGE PLANS:
         $hdt$_1:test2_n2 
           TableScan
             alias: test2_n2
+            filterExpr: key BETWEEN 100 AND 102 (type: boolean)
             Statistics: Num rows: 4 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key BETWEEN 100 AND 102 (type: boolean)

Reply via email to