You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2018/06/25 16:04:43 UTC

[40/51] [partial] hive git commit: HIVE-12342 : Set default value of hive.optimize.index.filter to true (Igor Kryvenko via Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
index b1a44b0..615ce83 100644
--- a/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
@@ -100,7 +100,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[21][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[31][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key join A_n8
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key join A_n8
@@ -122,6 +122,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -142,6 +143,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -213,7 +215,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[36][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n8 join 
          (select d1.key 
           from B_n6 d1 join B_n6 d2 on d1.key = d2.key
@@ -257,6 +259,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -276,6 +279,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -469,7 +473,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[40][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from 
 (select A_n8.key from A_n8  group by key) ss join
 (select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1
@@ -518,6 +522,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -537,6 +542,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   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/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
index 221bff1..89af13c 100644
--- a/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
@@ -100,7 +100,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[21][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[31][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key join A_n2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key join A_n2
@@ -122,6 +122,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -150,6 +151,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -206,7 +208,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[36][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n2 join 
          (select d1.key 
           from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
@@ -250,6 +252,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -284,6 +287,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -456,7 +460,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[40][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from 
 (select A_n2.key from A_n2 group by key) ss join 
 (select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1
@@ -505,6 +509,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d1
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -539,6 +544,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: d2
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 10 Data size: 1840 Basic stats: COMPLETE Column stats: NONE
                   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/cte_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_1.q.out b/ql/src/test/results/clientpositive/llap/cte_1.q.out
index d98862c..0a76503 100644
--- a/ql/src/test/results/clientpositive/llap/cte_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_1.q.out
@@ -18,6 +18,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: src
+          filterExpr: (key = '5') (type: boolean)
           Filter Operator
             predicate: (key = '5') (type: boolean)
             Select Operator
@@ -58,6 +59,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: src
+          filterExpr: (key = '5') (type: boolean)
           Filter Operator
             predicate: (key = '5') (type: boolean)
             Select Operator
@@ -98,6 +100,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: src
+          filterExpr: (key = '5') (type: boolean)
           Filter Operator
             predicate: (key = '5') (type: boolean)
             Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
index d5efe61..c90eb21 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
@@ -21,23 +21,23 @@ Stage-3
     Stage-4
       Reducer 3 llap
       File Output Operator [FS_18]
-        Merge Join Operator [MERGEJOIN_23] (rows=1 width=202)
-          Conds:RS_26._col0=RS_29._col0(Inner),Output:["_col0"]
+        Merge Join Operator [MERGEJOIN_33] (rows=1 width=202)
+          Conds:RS_36._col0=RS_39._col0(Inner),Output:["_col0"]
         <-Map 2 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_26]
+          SHUFFLE [RS_36]
             PartitionCols:_col0
-            Select Operator [SEL_25] (rows=1 width=184)
+            Select Operator [SEL_35] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_24] (rows=1 width=184)
+              Filter Operator [FIL_34] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_8] (rows=1 width=184)
                   default@q1,a,Tbl:COMPLETE,Col:NONE,Output:["key"]
         <-Map 4 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_29]
+          SHUFFLE [RS_39]
             PartitionCols:_col0
-            Select Operator [SEL_28] (rows=1 width=184)
+            Select Operator [SEL_38] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_27] (rows=1 width=184)
+              Filter Operator [FIL_37] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_11] (rows=1 width=184)
                   default@q1,b,Tbl:COMPLETE,Col:NONE,Output:["key"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
index d2917ee..1ad8585 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
@@ -46,23 +46,23 @@ Stage-3
     Stage-4
       Reducer 3 llap
       File Output Operator [FS_18]
-        Merge Join Operator [MERGEJOIN_23] (rows=1 width=202)
-          Conds:RS_26._col0=RS_29._col0(Inner),Output:["_col0"]
+        Merge Join Operator [MERGEJOIN_33] (rows=1 width=202)
+          Conds:RS_36._col0=RS_39._col0(Inner),Output:["_col0"]
         <-Map 2 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_26]
+          SHUFFLE [RS_36]
             PartitionCols:_col0
-            Select Operator [SEL_25] (rows=1 width=184)
+            Select Operator [SEL_35] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_24] (rows=1 width=184)
+              Filter Operator [FIL_34] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_8] (rows=1 width=184)
                   default@q1,a,Tbl:COMPLETE,Col:NONE,Output:["key"]
         <-Map 4 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_29]
+          SHUFFLE [RS_39]
             PartitionCols:_col0
-            Select Operator [SEL_28] (rows=1 width=184)
+            Select Operator [SEL_38] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_27] (rows=1 width=184)
+              Filter Operator [FIL_37] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_11] (rows=1 width=184)
                   default@q1,b,Tbl:COMPLETE,Col:NONE,Output:["key"]
@@ -164,23 +164,23 @@ Stage-3
     Stage-4
       Reducer 3 llap
       File Output Operator [FS_18]
-        Merge Join Operator [MERGEJOIN_23] (rows=1 width=202)
-          Conds:RS_26._col0=RS_29._col0(Inner),Output:["_col0"]
+        Merge Join Operator [MERGEJOIN_33] (rows=1 width=202)
+          Conds:RS_36._col0=RS_39._col0(Inner),Output:["_col0"]
         <-Map 2 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_26]
+          SHUFFLE [RS_36]
             PartitionCols:_col0
-            Select Operator [SEL_25] (rows=1 width=184)
+            Select Operator [SEL_35] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_24] (rows=1 width=184)
+              Filter Operator [FIL_34] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_8] (rows=1 width=184)
                   default@q1,a,Tbl:COMPLETE,Col:NONE,Output:["key"]
         <-Map 4 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_29]
+          SHUFFLE [RS_39]
             PartitionCols:_col0
-            Select Operator [SEL_28] (rows=1 width=184)
+            Select Operator [SEL_38] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_27] (rows=1 width=184)
+              Filter Operator [FIL_37] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_11] (rows=1 width=184)
                   default@q1,b,Tbl:COMPLETE,Col:NONE,Output:["key"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
index f08cd09..bccedcd 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
@@ -64,23 +64,23 @@ Stage-3
     Stage-4
       Reducer 3 llap
       File Output Operator [FS_18]
-        Merge Join Operator [MERGEJOIN_23] (rows=1 width=4)
-          Conds:RS_26.UDFToDouble(_col0)=RS_29.UDFToDouble(_col0)(Inner),Output:["_col0"]
+        Merge Join Operator [MERGEJOIN_33] (rows=1 width=4)
+          Conds:RS_36.UDFToDouble(_col0)=RS_39.UDFToDouble(_col0)(Inner),Output:["_col0"]
         <-Map 2 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_26]
+          SHUFFLE [RS_36]
             PartitionCols:UDFToDouble(_col0)
-            Select Operator [SEL_25] (rows=1 width=4)
+            Select Operator [SEL_35] (rows=1 width=4)
               Output:["_col0"]
-              Filter Operator [FIL_24] (rows=1 width=4)
+              Filter Operator [FIL_34] (rows=1 width=4)
                 predicate:colnum is not null
                 TableScan [TS_8] (rows=1 width=4)
                   mydb@q1,a,Tbl:COMPLETE,Col:COMPLETE,Output:["colnum"]
         <-Map 4 [SIMPLE_EDGE] vectorized, llap
-          SHUFFLE [RS_29]
+          SHUFFLE [RS_39]
             PartitionCols:UDFToDouble(_col0)
-            Select Operator [SEL_28] (rows=1 width=184)
+            Select Operator [SEL_38] (rows=1 width=184)
               Output:["_col0"]
-              Filter Operator [FIL_27] (rows=1 width=184)
+              Filter Operator [FIL_37] (rows=1 width=184)
                 predicate:key is not null
                 TableScan [TS_11] (rows=1 width=184)
                   default@q1,b,Tbl:COMPLETE,Col:NONE,Output:["key"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
index bf82b32..8abc460 100644
--- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
@@ -171,23 +171,23 @@ Stage-0
       File Output Operator [FS_10]
         Select Operator [SEL_9] (rows=1 width=228)
           Output:["_col0","_col1","_col2"]
-          Merge Join Operator [MERGEJOIN_15] (rows=1 width=228)
-            Conds:RS_18._col1=RS_21._col3(Inner),Output:["_col0","_col3","_col4"]
+          Merge Join Operator [MERGEJOIN_25] (rows=1 width=228)
+            Conds:RS_28._col1=RS_31._col3(Inner),Output:["_col0","_col3","_col4"]
           <-Map 1 [SIMPLE_EDGE] vectorized, llap
-            SHUFFLE [RS_18]
+            SHUFFLE [RS_28]
               PartitionCols:_col1
-              Select Operator [SEL_17] (rows=1 width=88)
+              Select Operator [SEL_27] (rows=1 width=88)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_16] (rows=1 width=88)
+                Filter Operator [FIL_26] (rows=1 width=88)
                   predicate:item is not null
                   TableScan [TS_0] (rows=1 width=88)
                     default@testdeci2_n0,s,Tbl:COMPLETE,Col:COMPLETE,Output:["id","item"]
           <-Map 3 [SIMPLE_EDGE] vectorized, llap
-            SHUFFLE [RS_21]
+            SHUFFLE [RS_31]
               PartitionCols:_col3
-              Select Operator [SEL_20] (rows=1 width=312)
+              Select Operator [SEL_30] (rows=1 width=312)
                 Output:["_col1","_col2","_col3"]
-                Filter Operator [FIL_19] (rows=1 width=312)
+                Filter Operator [FIL_29] (rows=1 width=312)
                   predicate:((id = 2) and item is not null)
                   TableScan [TS_3] (rows=1 width=312)
                     default@testdeci2_n0,d,Tbl:COMPLETE,Col:COMPLETE,Output:["id","amount","sales_tax","item"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
index 29be9a4..3b72fc4 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
@@ -173,6 +173,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -253,6 +254,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -350,6 +352,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -428,6 +431,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -574,6 +578,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -654,6 +659,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -751,6 +757,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -829,6 +836,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1362,6 +1370,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1475,6 +1484,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1655,6 +1665,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1774,6 +1785,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -2163,6 +2175,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -2276,6 +2289,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_orc
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
index 600f452..21fc2c5 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
@@ -130,6 +130,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -210,6 +211,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -307,6 +309,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -385,6 +388,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -531,6 +535,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -611,6 +616,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -708,6 +714,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -786,6 +793,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1319,6 +1327,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1432,6 +1441,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1612,6 +1622,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -1731,6 +1742,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -2120,6 +2132,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -2233,6 +2246,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t is null or (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((t = 27Y) or t is null) (type: boolean)
@@ -2605,6 +2619,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (s = 'foo') (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (s = 'foo') (type: boolean)
@@ -2685,6 +2700,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (t = 27Y) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (t = 27Y) (type: boolean)
@@ -2765,6 +2781,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: (i = 100) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (i = 100) (type: boolean)
@@ -2845,6 +2862,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: ((i = 100) and (t = 27Y)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((i = 100) and (t = 27Y)) (type: boolean)
@@ -2925,6 +2943,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: ((i = 100) and (s = 'foo')) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((i = 100) and (s = 'foo')) (type: boolean)
@@ -3005,6 +3024,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: ((t = 27Y) and (s = 'foo')) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((s = 'foo') and (t = 27Y)) (type: boolean)
@@ -3085,6 +3105,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: over1k_n3
+                  filterExpr: ((i = 100) and (t = 27Y) and (s = 'foo')) (type: boolean)
                   Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((i = 100) and (s = 'foo') and (t = 27Y)) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
index 0b57fbc..c730427 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
@@ -90,6 +90,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_n0
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)
@@ -334,6 +335,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_n0
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)
@@ -573,6 +575,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_n0
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)
@@ -837,6 +840,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_n0
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)
@@ -1151,6 +1155,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_orc
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 24 Data size: 288 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)
@@ -1415,6 +1420,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: ss_orc
+                  filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean)
                   Statistics: Num rows: 24 Data size: 288 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
index 49e5e25..7a9e200 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
@@ -94,6 +94,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 160 Data size: 61001 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -189,6 +190,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part
+                  filterExpr: ((key = 'foo') and (ds) IN ('2008-04-08')) (type: boolean)
                   Statistics: Num rows: 159 Data size: 104317 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -380,6 +382,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part_sdpo
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 176 Data size: 67063 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -475,6 +478,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part_sdpo
+                  filterExpr: ((key = 'foo') and (ds) IN ('2008-04-08')) (type: boolean)
                   Statistics: Num rows: 171 Data size: 112152 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -675,6 +679,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr = 11)) (type: boolean)
                   Statistics: Num rows: 157 Data size: 60527 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -771,6 +776,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr >= 11)) (type: boolean)
                   Statistics: Num rows: 1600 Data size: 156727 Basic stats: PARTIAL Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -897,6 +903,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part
+                  filterExpr: (value = 'bar') (type: boolean)
                   Statistics: Num rows: 1600 Data size: 451127 Basic stats: PARTIAL Column stats: PARTIAL
                   Filter Operator
                     predicate: (value = 'bar') (type: boolean)
@@ -1095,6 +1102,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr = 11)) (type: boolean)
                   Statistics: Num rows: 157 Data size: 60527 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -1191,6 +1199,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr >= 11)) (type: boolean)
                   Statistics: Num rows: 1600 Data size: 156727 Basic stats: PARTIAL Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -1317,6 +1326,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo
+                  filterExpr: (value = 'bar') (type: boolean)
                   Statistics: Num rows: 1600 Data size: 451127 Basic stats: PARTIAL Column stats: PARTIAL
                   Filter Operator
                     predicate: (value = 'bar') (type: boolean)
@@ -1515,6 +1525,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo_no_cp
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr = 11)) (type: boolean)
                   Statistics: Num rows: 97 Data size: 82922 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
@@ -1613,6 +1624,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo_no_cp
+                  filterExpr: ((key = 'foo') and (ds = '2008-04-08') and (hr >= 11)) (type: boolean)
                   Statistics: Num rows: 1600 Data size: 598664 Basic stats: PARTIAL Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/empty_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/empty_join.q.out b/ql/src/test/results/clientpositive/llap/empty_join.q.out
index bd3381b..f7fba0b 100644
--- a/ql/src/test/results/clientpositive/llap/empty_join.q.out
+++ b/ql/src/test/results/clientpositive/llap/empty_join.q.out
@@ -62,30 +62,30 @@ Stage-0
     limit:-1
     Stage-1
       Map 1 vectorized, llap
-      File Output Operator [FS_34]
-        Map Join Operator [MAPJOIN_33] (rows=2 width=4)
-          Conds:SEL_32._col0=RS_27._col0(Left Outer),SEL_32._col0=RS_30._col0(Inner),Output:["_col0","_col1","_col2"]
+      File Output Operator [FS_46]
+        Map Join Operator [MAPJOIN_45] (rows=2 width=4)
+          Conds:SEL_44._col0=RS_39._col0(Left Outer),SEL_44._col0=RS_42._col0(Inner),Output:["_col0","_col1","_col2"]
         <-Map 2 [BROADCAST_EDGE] vectorized, llap
-          BROADCAST [RS_27]
+          BROADCAST [RS_39]
             PartitionCols:_col0
-            Select Operator [SEL_26] (rows=1 width=4)
+            Select Operator [SEL_38] (rows=1 width=4)
               Output:["_col0"]
-              Filter Operator [FIL_25] (rows=1 width=4)
+              Filter Operator [FIL_37] (rows=1 width=4)
                 predicate:id is not null
                 TableScan [TS_3] (rows=1 width=4)
                   default@test_2_n2,t2,Tbl:COMPLETE,Col:NONE,Output:["id"]
         <-Map 3 [BROADCAST_EDGE] vectorized, llap
-          BROADCAST [RS_30]
+          BROADCAST [RS_42]
             PartitionCols:_col0
-            Select Operator [SEL_29] (rows=1 width=4)
+            Select Operator [SEL_41] (rows=1 width=4)
               Output:["_col0"]
-              Filter Operator [FIL_28] (rows=1 width=4)
+              Filter Operator [FIL_40] (rows=1 width=4)
                 predicate:id is not null
                 TableScan [TS_6] (rows=1 width=4)
                   default@test_3_n0,t3,Tbl:COMPLETE,Col:NONE,Output:["id"]
-        <-Select Operator [SEL_32] (rows=1 width=4)
+        <-Select Operator [SEL_44] (rows=1 width=4)
             Output:["_col0"]
-            Filter Operator [FIL_31] (rows=1 width=4)
+            Filter Operator [FIL_43] (rows=1 width=4)
               predicate:id is not null
               TableScan [TS_0] (rows=1 width=4)
                 default@test_1_n2,t1,Tbl:COMPLETE,Col:NONE,Output:["id"]

http://git-wip-us.apache.org/repos/asf/hive/blob/f2c4f319/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
index 7a880dd..8a5a326 100644
--- a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
+++ b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
@@ -255,6 +255,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src
+                  filterExpr: enforce_constraint((key is not null and value is not null)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: enforce_constraint((key is not null and value is not null)) (type: boolean)
@@ -866,6 +867,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src
+                  filterExpr: enforce_constraint((key is not null and value is not null)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: enforce_constraint((key is not null and value is not null)) (type: boolean)
@@ -1475,6 +1477,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src
+                  filterExpr: enforce_constraint((key is not null and value is not null)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: enforce_constraint((key is not null and value is not null)) (type: boolean)
@@ -3233,6 +3236,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_uami_n1
+                  filterExpr: (((de = 109.23) or (de = 119.23)) and enforce_constraint(vc is not null)) (type: boolean)
                   Statistics: Num rows: 281 Data size: 87904 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (((de = 109.23) or (de = 119.23)) and enforce_constraint(vc is not null)) (type: boolean)
@@ -3326,6 +3330,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_uami_n1
+                  filterExpr: ((de = 3.14) and enforce_constraint((i is not null and vc is not null))) (type: boolean)
                   Statistics: Num rows: 320 Data size: 100040 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((de = 3.14) and enforce_constraint((i is not null and vc is not null))) (type: boolean)
@@ -5238,6 +5243,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
@@ -5254,6 +5260,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: s
+                  filterExpr: key is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)