You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2015/12/21 02:06:43 UTC

[02/32] hive git commit: HIVE-11865: Disable Hive PPD optimizer when CBO has optimized the plan (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 33d9457..e2db163 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -719,14 +719,14 @@ Stage-0
       limit:-1
       Stage-1
          Map 2
-         File Output Operator [FS_12]
+         File Output Operator [FS_10]
             compressed:false
             Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Select Operator [SEL_11]
+            Select Operator [SEL_9]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-               Map Join Operator [MAPJOIN_17]
+               Map Join Operator [MAPJOIN_15]
                |  BucketMapJoin:true
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  HybridGraceHashJoin:true
@@ -734,7 +734,7 @@ Stage-0
                |  outputColumnNames:["_col0","_col1","_col3"]
                |  Statistics:Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [CUSTOM_EDGE]
-               |  Reduce Output Operator [RS_7]
+               |  Reduce Output Operator [RS_6]
                |     key expressions:_col0 (type: int)
                |     Map-reduce partition columns:_col0 (type: int)
                |     sort order:+
@@ -743,7 +743,7 @@ Stage-0
                |     Select Operator [SEL_2]
                |        outputColumnNames:["_col0","_col1"]
                |        Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
-               |        Filter Operator [FIL_15]
+               |        Filter Operator [FIL_13]
                |           predicate:key is not null (type: boolean)
                |           Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE
                |           TableScan [TS_0]
@@ -752,7 +752,7 @@ Stage-0
                |<-Select Operator [SEL_5]
                      outputColumnNames:["_col0","_col1"]
                      Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                     Filter Operator [FIL_16]
+                     Filter Operator [FIL_14]
                         predicate:key is not null (type: boolean)
                         Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         TableScan [TS_3]

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
index 3c7b406..012c28e 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
@@ -139,7 +139,6 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: decimal(6,2))
                         Statistics: Num rows: 1049 Data size: 117488 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: decimal(4,0))
         Reducer 2 
             Reduce Operator Tree:
               Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
index 485e1c1..63b9462 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
@@ -490,7 +490,7 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_450') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_450') and key is not null) (type: boolean)
                     Statistics: Num rows: 666 Data size: 7075 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/mergejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mergejoin.q.out b/ql/src/test/results/clientpositive/tez/mergejoin.q.out
index 15c204d..4b2d963 100644
--- a/ql/src/test/results/clientpositive/tez/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mergejoin.q.out
@@ -2711,7 +2711,7 @@ NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
 NULL	NULL	NULL	98	val_98	2008-04-08	98	val_98	2008-04-08
-Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: select * from
 (select * from tab where tab.key = 0)a
 join

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/skewjoin.q.out b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
index 70d2418..fc084cc 100644
--- a/ql/src/test/results/clientpositive/tez/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
@@ -705,7 +705,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and UDFToDouble(substring(value, 5)) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -722,16 +722,16 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value is not null and key is not null) and (UDFToDouble(substring(value, 5)) + 1.0) is not null) (type: boolean)
+                    predicate: (value is not null and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        key expressions: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                        Map-reduce partition columns: _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: string)
         Reducer 2 
@@ -741,7 +741,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: string), UDFToDouble(substring(_col1, 5)) (type: double)
-                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + 1.0) (type: double)
+                  1 _col0 (type: string), (UDFToDouble(substring(_col1, 5)) + UDFToDouble(1)) (type: double)
                 outputColumnNames: _col2, _col3
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
@@ -837,7 +837,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -854,7 +854,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
index 66b48d4..5121a14 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value > 'val_9') and key is not null) and value is not null) (type: boolean)
+                    predicate: ((value > 'val_9') and key is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string), key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_in.q.out b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
index ff75000..a4887e4 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
@@ -149,7 +149,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -166,7 +166,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -282,15 +282,12 @@ STAGE PLANS:
                       expressions: p_name (type: string), p_size (type: int), UDFToDouble(p_size) (type: double)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col2 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col2 (type: double)
+                        sort order: +
+                        Map-reduce partition columns: _col2 (type: double)
                         Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col2 (type: double)
-                          sort order: +
-                          Map-reduce partition columns: _col2 (type: double)
-                          Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col0 (type: string), _col1 (type: int)
+                        value expressions: _col0 (type: string), _col1 (type: int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -632,7 +629,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -649,7 +646,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > '9') and value is not null) and key is not null) (type: boolean)
+                    predicate: ((key > '9') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
index c9e712d..322462b 100644
--- a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -62,7 +62,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -79,7 +79,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -230,7 +230,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -248,7 +248,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -265,7 +265,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -414,7 +414,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -432,7 +432,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -449,7 +449,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
index e71a4ef..d45ff04 100644
--- a/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_vector_dynpart_hashjoin_2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -62,7 +62,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -79,7 +79,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -230,7 +230,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -249,7 +249,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -266,7 +266,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -416,7 +416,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((csmallint < 100) and UDFToInteger(csmallint) is not null) (type: boolean)
+                    predicate: (csmallint < 100) (type: boolean)
                     Statistics: Num rows: 4096 Data size: 880654 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean)
@@ -435,7 +435,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToInteger(key) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -452,7 +452,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (UDFToInteger(key) + 0) is not null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
index 9b62353..51c4ac8 100644
--- a/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_auto_smb_mapjoin_14.q.out
@@ -64,24 +64,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
@@ -89,7 +89,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:key is not null (type: boolean)
                      |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -98,7 +98,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:key is not null (type: boolean)
                               Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -153,40 +153,40 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3 vectorized
-         File Output Operator [FS_21]
+         File Output Operator [FS_19]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_31]
+            Group By Operator [OP_29]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 2 [SIMPLE_EDGE] vectorized
-               Reduce Output Operator [RS_18]
+               Reduce Output Operator [RS_16]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [OP_30]
+                  Group By Operator [OP_28]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Select Operator [OP_29]
+                     Select Operator [OP_27]
                         Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
-                        Group By Operator [OP_28]
+                        Group By Operator [OP_26]
                         |  keys:KEY._col0 (type: int)
                         |  outputColumnNames:["_col0"]
                         |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                         |<-Map 1 [SIMPLE_EDGE]
-                           Reduce Output Operator [RS_13]
+                           Reduce Output Operator [RS_11]
                               key expressions:_col0 (type: int)
                               Map-reduce partition columns:_col0 (type: int)
                               sort order:+
                               Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                              Group By Operator [GBY_12]
+                              Group By Operator [GBY_10]
                                  keys:_col0 (type: int)
                                  outputColumnNames:["_col0"]
                                  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_26]
+                                 Merge Join Operator [MERGEJOIN_24]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col0"]
@@ -195,7 +195,7 @@ Stage-0
                                  |<-Select Operator [SEL_5]
                                  |     outputColumnNames:["_col0"]
                                  |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                 |     Filter Operator [FIL_25]
+                                 |     Filter Operator [FIL_23]
                                  |        predicate:key is not null (type: boolean)
                                  |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                                  |        TableScan [TS_3]
@@ -204,7 +204,7 @@ Stage-0
                                  |<-Select Operator [SEL_2]
                                        outputColumnNames:["_col0"]
                                        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                       Filter Operator [FIL_24]
+                                       Filter Operator [FIL_22]
                                           predicate:key is not null (type: boolean)
                                           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                                           TableScan [TS_0]
@@ -286,43 +286,43 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3
-         File Output Operator [FS_38]
+         File Output Operator [FS_32]
             compressed:false
             Statistics:Num rows: 5 Data size: 511 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Select Operator [SEL_37]
+            Select Operator [SEL_31]
                outputColumnNames:["_col0","_col1","_col2"]
                Statistics:Num rows: 5 Data size: 511 Basic stats: COMPLETE Column stats: NONE
-               Merge Join Operator [MERGEJOIN_55]
+               Merge Join Operator [MERGEJOIN_49]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col3"]
                |  Statistics:Num rows: 5 Data size: 511 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 2 [SIMPLE_EDGE] vectorized
-               |  Reduce Output Operator [RS_57]
+               |  Reduce Output Operator [RS_51]
                |     key expressions:_col0 (type: int)
                |     Map-reduce partition columns:_col0 (type: int)
                |     sort order:+
                |     Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:_col1 (type: bigint)
-               |     Group By Operator [OP_56]
+               |     Group By Operator [OP_50]
                |     |  aggregations:["count(VALUE._col0)"]
                |     |  keys:KEY._col0 (type: int)
                |     |  outputColumnNames:["_col0","_col1"]
                |     |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                |     |<-Map 1 [SIMPLE_EDGE]
-               |        Reduce Output Operator [RS_13]
+               |        Reduce Output Operator [RS_11]
                |           key expressions:_col0 (type: int)
                |           Map-reduce partition columns:_col0 (type: int)
                |           sort order:+
                |           Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                |           value expressions:_col1 (type: bigint)
-               |           Group By Operator [GBY_12]
+               |           Group By Operator [GBY_10]
                |              aggregations:["count()"]
                |              keys:_col0 (type: int)
                |              outputColumnNames:["_col0","_col1"]
                |              Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-               |              Merge Join Operator [MERGEJOIN_51]
+               |              Merge Join Operator [MERGEJOIN_45]
                |              |  condition map:[{"":"Inner Join 0 to 1"}]
                |              |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                |              |  outputColumnNames:["_col0"]
@@ -331,7 +331,7 @@ Stage-0
                |              |<-Select Operator [SEL_5]
                |              |     outputColumnNames:["_col0"]
                |              |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-               |              |     Filter Operator [FIL_48]
+               |              |     Filter Operator [FIL_42]
                |              |        predicate:key is not null (type: boolean)
                |              |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |              |        TableScan [TS_3]
@@ -340,58 +340,58 @@ Stage-0
                |              |<-Select Operator [SEL_2]
                |                    outputColumnNames:["_col0"]
                |                    Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-               |                    Filter Operator [FIL_47]
+               |                    Filter Operator [FIL_41]
                |                       predicate:key is not null (type: boolean)
                |                       Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |                       TableScan [TS_0]
                |                          alias:a
                |                          Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE] vectorized
-                  Reduce Output Operator [RS_59]
+                  Reduce Output Operator [RS_53]
                      key expressions:_col0 (type: int)
                      Map-reduce partition columns:_col0 (type: int)
                      sort order:+
                      Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col1 (type: bigint)
-                     Group By Operator [OP_58]
+                     Group By Operator [OP_52]
                      |  aggregations:["count(VALUE._col0)"]
                      |  keys:KEY._col0 (type: int)
                      |  outputColumnNames:["_col0","_col1"]
                      |  Statistics:Num rows: 5 Data size: 465 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_29]
+                        Reduce Output Operator [RS_25]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col1 (type: bigint)
-                           Group By Operator [GBY_28]
+                           Group By Operator [GBY_24]
                               aggregations:["count()"]
                               keys:_col0 (type: int)
                               outputColumnNames:["_col0","_col1"]
                               Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
-                              Merge Join Operator [MERGEJOIN_53]
+                              Merge Join Operator [MERGEJOIN_47]
                               |  condition map:[{"":"Inner Join 0 to 1"}]
                               |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                               |  outputColumnNames:["_col0"]
                               |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                               |  
-                              |<-Select Operator [SEL_21]
+                              |<-Select Operator [SEL_19]
                               |     outputColumnNames:["_col0"]
                               |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |     Filter Operator [FIL_50]
+                              |     Filter Operator [FIL_44]
                               |        predicate:key is not null (type: boolean)
                               |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |        TableScan [TS_19]
+                              |        TableScan [TS_17]
                               |           alias:b
                               |           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              |<-Select Operator [SEL_18]
+                              |<-Select Operator [SEL_16]
                                     outputColumnNames:["_col0"]
                                     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                    Filter Operator [FIL_49]
+                                    Filter Operator [FIL_43]
                                        predicate:key is not null (type: boolean)
                                        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                       TableScan [TS_16]
+                                       TableScan [TS_14]
                                           alias:a
                                           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
 
@@ -467,24 +467,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -492,7 +492,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -501,7 +501,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -565,24 +565,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -590,8 +590,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:b
@@ -599,8 +599,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a
@@ -687,24 +687,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -712,8 +712,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:a
@@ -721,8 +721,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a
@@ -799,24 +799,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -824,7 +824,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 8) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -833,7 +833,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 8) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -888,63 +888,57 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 3 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_32]
+            Group By Operator [OP_28]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 2 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_23]
+                     Merge Join Operator [MERGEJOIN_21]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 1 [SIMPLE_EDGE] vectorized
-                     |  Reduce Output Operator [RS_27]
+                     |  Reduce Output Operator [RS_24]
                      |     key expressions:_col0 (type: int)
                      |     Map-reduce partition columns:_col0 (type: int)
                      |     sort order:+
                      |     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_26]
-                     |        predicate:_col0 is not null (type: boolean)
+                     |     Select Operator [OP_23]
+                     |        outputColumnNames:["_col0"]
                      |        Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |        Select Operator [OP_25]
-                     |           outputColumnNames:["_col0"]
+                     |        Filter Operator [FIL_22]
+                     |           predicate:(key + 1) is not null (type: boolean)
                      |           Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |           Filter Operator [FIL_24]
-                     |              predicate:(key + 1) is not null (type: boolean)
+                     |           TableScan [TS_0]
+                     |              alias:a
                      |              Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                     |              TableScan [TS_0]
-                     |                 alias:a
-                     |                 Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
                      |<-Map 4 [SIMPLE_EDGE] vectorized
-                        Reduce Output Operator [RS_31]
+                        Reduce Output Operator [RS_27]
                            key expressions:_col0 (type: int)
                            Map-reduce partition columns:_col0 (type: int)
                            sort order:+
                            Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_30]
-                              predicate:_col0 is not null (type: boolean)
+                           Select Operator [OP_26]
+                              outputColumnNames:["_col0"]
                               Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [OP_29]
-                                 outputColumnNames:["_col0"]
+                              Filter Operator [FIL_25]
+                                 predicate:(key + 1) is not null (type: boolean)
                                  Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                 Filter Operator [FIL_28]
-                                    predicate:(key + 1) is not null (type: boolean)
+                                 TableScan [TS_3]
+                                    alias:a
                                     Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
-                                    TableScan [TS_3]
-                                       alias:a
-                                       Statistics:Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: select count(*) from 
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 
@@ -989,24 +983,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 3 Data size: 306 Basic stats: COMPLETE Column stats: NONE
@@ -1014,7 +1008,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
+                     |     Filter Operator [FIL_18]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -1023,7 +1017,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
+                           Filter Operator [FIL_17]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -1079,24 +1073,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_21]
+         File Output Operator [FS_18]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_34]
+            Group By Operator [OP_31]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_18]
+               Reduce Output Operator [RS_15]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_17]
+                  Group By Operator [GBY_14]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_31]
+                     Merge Join Operator [MERGEJOIN_28]
                      |  condition map:[{"":"Inner Join 0 to 1"},{"":"Inner Join 0 to 2"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)","2":"_col0 (type: int)"}
                      |  Statistics:Num rows: 6 Data size: 613 Basic stats: COMPLETE Column stats: NONE
@@ -1104,7 +1098,7 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_29]
+                     |     Filter Operator [FIL_26]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
@@ -1114,7 +1108,7 @@ Stage-0
                      |<-Select Operator [SEL_8]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_30]
+                     |     Filter Operator [FIL_27]
                      |        predicate:(key < 6) (type: boolean)
                      |        Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_6]
@@ -1123,7 +1117,7 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_28]
+                           Filter Operator [FIL_25]
                               predicate:(key < 6) (type: boolean)
                               Statistics:Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
@@ -1195,24 +1189,24 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2 vectorized
-         File Output Operator [FS_16]
+         File Output Operator [FS_14]
             compressed:false
             Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Group By Operator [OP_23]
+            Group By Operator [OP_21]
             |  aggregations:["count(VALUE._col0)"]
             |  outputColumnNames:["_col0"]
             |  Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE]
-               Reduce Output Operator [RS_13]
+               Reduce Output Operator [RS_11]
                   sort order:
                   Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col0 (type: bigint)
-                  Group By Operator [GBY_12]
+                  Group By Operator [GBY_10]
                      aggregations:["count()"]
                      outputColumnNames:["_col0"]
                      Statistics:Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_21]
+                     Merge Join Operator [MERGEJOIN_19]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |  Statistics:Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE
@@ -1220,8 +1214,8 @@ Stage-0
                      |<-Select Operator [SEL_5]
                      |     outputColumnNames:["_col0"]
                      |     Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                     |     Filter Operator [FIL_20]
-                     |        predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                     |     Filter Operator [FIL_18]
+                     |        predicate:((key < 8) and (key < 6)) (type: boolean)
                      |        Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                      |        TableScan [TS_3]
                      |           alias:b
@@ -1229,8 +1223,8 @@ Stage-0
                      |<-Select Operator [SEL_2]
                            outputColumnNames:["_col0"]
                            Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
-                           Filter Operator [FIL_19]
-                              predicate:(((key < 8) and (key < 6)) and key is not null) (type: boolean)
+                           Filter Operator [FIL_17]
+                              predicate:((key < 8) and (key < 6)) (type: boolean)
                               Statistics:Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: NONE
                               TableScan [TS_0]
                                  alias:a

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out b/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
index 972d694..7fe20a6 100644
--- a/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_between_columns.q.out
@@ -60,7 +60,7 @@ POSTHOOK: Input: default@tint_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@TINT
 tint_txt.rnum	tint_txt.cint
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: -- We DO NOT expect the following to vectorized because the BETWEEN range expressions
 -- are not constants.  We currently do not support the range expressions being columns.
 explain
@@ -137,7 +137,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[13][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: select tint.rnum, tsint.rnum from tint , tsint where tint.cint between tsint.csint and tsint.csint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tint

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
index 2392fa2..c13ac6c 100644
--- a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
@@ -193,7 +193,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(*))
 FROM hundredorc t1 JOIN hundredorc t2 ON t2.bin = t2.bin
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
index 6e266af..6a74408 100644
--- a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
@@ -257,7 +257,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col1 (type: char(20))
                         Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: int), _col1 (type: char(10))
+                        value expressions: _col0 (type: int)
             Execution mode: vectorized
         Map 2 
             Map Operator Tree:
@@ -352,7 +352,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (c2 is not null and UDFToString(c2) is not null) (type: boolean)
+                    predicate: c2 is not null (type: boolean)
                     Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: c1 (type: int), c2 (type: char(10))

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
index ec8d0b0..0c76602 100644
--- a/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
@@ -137,7 +137,6 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: decimal(6,2))
                         Statistics: Num rows: 1049 Data size: 117488 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: decimal(4,0))
             Execution mode: vectorized
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
index cc9103d..42ce499 100644
--- a/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_interval_mapjoin.q.out
@@ -177,31 +177,28 @@ STAGE PLANS:
                       expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col1 is not null (type: boolean)
-                        Statistics: Num rows: 1000 Data size: 460264 Basic stats: COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col1 (type: interval_day_time), _col0 (type: string)
-                            1 _col1 (type: interval_day_time), _col0 (type: string)
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col1 (type: interval_day_time), _col0 (type: string)
+                          1 _col1 (type: interval_day_time), _col0 (type: string)
+                        outputColumnNames: _col0, _col1, _col2
+                        input vertices:
+                          1 Map 2
+                        Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
+                        HybridGraceHashJoin: true
+                        Select Operator
+                          expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
                           outputColumnNames: _col0, _col1, _col2
-                          input vertices:
-                            1 Map 2
                           Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
-                          Select Operator
-                            expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time)
-                            outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
                             Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                            File Output Operator
-                              compressed: false
-                              Statistics: Num rows: 1100 Data size: 506290 Basic stats: COMPLETE Column stats: NONE
-                              table:
-                                  input format: org.apache.hadoop.mapred.TextInputFormat
-                                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                            table:
+                                input format: org.apache.hadoop.mapred.TextInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Execution mode: vectorized
         Map 2 
             Map Operator Tree:
@@ -215,14 +212,11 @@ STAGE PLANS:
                       expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col1 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: interval_day_time), _col0 (type: string)
+                        sort order: ++
+                        Map-reduce partition columns: _col1 (type: interval_day_time), _col0 (type: string)
                         Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col1 (type: interval_day_time), _col0 (type: string)
-                          sort order: ++
-                          Map-reduce partition columns: _col1 (type: interval_day_time), _col0 (type: string)
-                          Statistics: Num rows: 1000 Data size: 458448 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out b/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
index fb73843..cc8122a 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_filters.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value))  FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out b/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
index 2d84f42..3c9ce0a 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_nulls.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@myinput1_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@myinput1
-Warning: Map Join MAPJOIN[16][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[15][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
index 0b087be..c7ce2b7 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
@@ -111,46 +111,46 @@ Stage-0
       limit:-1
       Stage-1
          Reducer 2
-         File Output Operator [FS_12]
+         File Output Operator [FS_10]
             compressed:false
             Statistics:Num rows: 2 Data size: 224 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Merge Join Operator [MERGEJOIN_23]
+            Merge Join Operator [MERGEJOIN_21]
             |  condition map:[{"":"Inner Join 0 to 1"}]
             |  keys:{"0":"_col2 (type: char(50))","1":"_col2 (type: char(50))"}
             |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
             |  Statistics:Num rows: 2 Data size: 224 Basic stats: COMPLETE Column stats: NONE
             |<-Map 1 [SIMPLE_EDGE] vectorized
-            |  Reduce Output Operator [RS_25]
+            |  Reduce Output Operator [RS_23]
             |     key expressions:_col2 (type: char(50))
             |     Map-reduce partition columns:_col2 (type: char(50))
             |     sort order:+
             |     Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
             |     value expressions:_col0 (type: string), _col1 (type: int)
-            |     Select Operator [OP_24]
+            |     Select Operator [OP_22]
             |        outputColumnNames:["_col0","_col1","_col2"]
             |        Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
             |        TableScan [TS_0]
             |           alias:c1
             |           Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |  Dynamic Partitioning Event Operator [EVENT_22]
+            |  Dynamic Partitioning Event Operator [EVENT_20]
             |     Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |     Group By Operator [OP_27]
+            |     Group By Operator [OP_25]
             |        keys:_col0 (type: char(50))
             |        outputColumnNames:["_col0"]
             |        Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |        Select Operator [OP_26]
+            |        Select Operator [OP_24]
             |           outputColumnNames:["_col0"]
             |           Statistics:Num rows: 2 Data size: 204 Basic stats: COMPLETE Column stats: NONE
-            |            Please refer to the previous Select Operator [OP_24]
+            |            Please refer to the previous Select Operator [OP_22]
             |<-Map 3 [SIMPLE_EDGE] vectorized
-               Reduce Output Operator [RS_29]
+               Reduce Output Operator [RS_27]
                   key expressions:_col2 (type: char(50))
                   Map-reduce partition columns:_col2 (type: char(50))
                   sort order:+
                   Statistics:Num rows: 2 Data size: 203 Basic stats: COMPLETE Column stats: NONE
-                  value expressions:_col0 (type: string), _col1 (type: int), _col2 (type: char(5))
-                  Select Operator [OP_28]
+                  value expressions:_col0 (type: string), _col1 (type: int)
+                  Select Operator [OP_26]
                      outputColumnNames:["_col0","_col1","_col2"]
                      Statistics:Num rows: 2 Data size: 203 Basic stats: COMPLETE Column stats: NONE
                      TableScan [TS_3]