http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out 
b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
index 7be8eca..f2c7b08 100644
--- a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
+++ b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
@@ -277,7 +277,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -296,7 +296,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key,val
 Table:default@t2
@@ -330,7 +330,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -351,7 +351,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -369,7 +369,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -390,7 +390,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val
 Table:default@t2
@@ -411,7 +411,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -435,7 +435,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:key
 Table:default@t2
@@ -472,7 +472,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
@@ -503,13 +503,13 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2
 Keys:key
 
-Operator:GBY_18
+Operator:GBY_16
 Table:default@t3
 Keys:val
 
@@ -541,7 +541,7 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Operator:JOIN_10
+Operator:JOIN_8
 Table:default@t1
 Keys:val,key
 Table:default@t2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out 
b/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
index d44fff3..1559d4b 100644
--- a/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_join_filters.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
'../../data/files/in3.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 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
@@ -300,7 +300,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
'../../data/files/in2.txt' into table sm
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_input2
-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
@@ -310,7 +310,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-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 
LEFT OUTER 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
@@ -320,7 +320,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 2' is a cross product
+Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Map 2' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a 
RIGHT OUTER 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
@@ -330,7 +330,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 3078400
-Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a 
FULL OUTER 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/auto_join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out 
b/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
index a390851..5b68bb7 100644
--- a/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_join_nulls.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
'../../data/files/in1.txt' INTO TABLE my
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 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/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out 
b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
index 17f0229..09a10bd 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
@@ -138,7 +138,7 @@ POSTHOOK: query: load data local inpath 
'../../data/files/smallsrcsortbucket3out
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@bucket_medium@ds=2008-04-08
-Warning: Map Join MAPJOIN[39][bigTable=?] in task 'Map 3' is a cross product
+Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Map 3' is a cross product
 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN 
bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN 
bucket_medium d ON c.key = b.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select count(*) FROM bucket_small a JOIN 
bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN 
bucket_medium d ON c.key = b.key
@@ -619,7 +619,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[39][bigTable=?] in task 'Map 3' is a cross product
+Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Map 3' is a cross product
 PREHOOK: query: select count(*) FROM bucket_small a JOIN bucket_medium b ON 
a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key 
= b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket_big

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out 
b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
index 2956bf8..521485a 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
@@ -483,7 +483,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 UDFToDouble(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: int)
@@ -494,7 +494,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(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: int)
@@ -519,7 +519,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(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)
@@ -955,7 +955,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 UDFToDouble(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: int)
@@ -966,7 +966,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(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: int)
@@ -991,7 +991,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(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)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out 
b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
index fbd0bb8..98cc8cc 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
@@ -840,7 +840,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -871,7 +871,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -992,7 +992,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1023,7 +1023,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1258,28 +1258,25 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col0 (type: int)
-                            1 _col0 (type: int)
-                          input vertices:
-                            1 Map 3
-                          Statistics: Num rows: 11 Data size: 77 Basic stats: 
COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
-                          Group By Operator
-                            aggregations: count()
-                            mode: hash
-                            outputColumnNames: _col0
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
+                        input vertices:
+                          1 Map 3
+                        Statistics: Num rows: 11 Data size: 77 Basic stats: 
COMPLETE Column stats: NONE
+                        HybridGraceHashJoin: true
+                        Group By Operator
+                          aggregations: count()
+                          mode: hash
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                          Reduce Output Operator
+                            sort order: 
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            Reduce Output Operator
-                              sort order: 
-                              Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
-                              value expressions: _col0 (type: bigint)
+                            value expressions: _col0 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1292,14 +1289,11 @@ STAGE PLANS:
                       expressions: (key + 1) (type: int)
                       outputColumnNames: _col0
                       Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: int)
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: int)
-                          Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Group By Operator
@@ -1762,7 +1756,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -1793,7 +1787,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2654,7 +2648,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2685,7 +2679,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2806,7 +2800,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -2837,7 +2831,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3452,7 +3446,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -3483,7 +3477,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+                    predicate: ((key < 8) and (key < 6)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out 
b/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
index 6adf820..c5cb360 100644
--- a/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
@@ -257,7 +257,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not 
null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -275,7 +275,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 UDFToDouble(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), value (type: string)
@@ -333,7 +333,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 1) and (key > 2)) and key is not null) 
(type: boolean)
+                    predicate: ((key > 1) and (key > 2)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -363,7 +363,7 @@ STAGE PLANS:
                   alias: tab_part
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key > 2) and (key > 1)) and key is not null) 
(type: boolean)
+                    predicate: ((key > 2) and (key > 1)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int)
@@ -626,7 +626,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and UDFToDouble(value) is 
not null) (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: value (type: string)
@@ -644,7 +644,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and UDFToDouble(key) is not 
null) (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 242 Data size: 2566 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_join.q.out 
b/ql/src/test/results/clientpositive/tez/cross_join.q.out
index de3edbb..d397bd4 100644
--- a/ql/src/test/results/clientpositive/tez/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_join.q.out
@@ -1,4 +1,4 @@
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: -- current
 explain select src.key from src join src src2
 PREHOOK: type: QUERY
@@ -63,7 +63,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: -- ansi cross join
 explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
@@ -203,7 +203,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src join src src2
@@ -262,7 +262,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select src.key from src cross join src src2

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out 
b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
index 0e7c681..ca44973 100644
--- a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[10][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -94,7 +94,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[25][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -198,7 +198,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[27][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key
@@ -324,8 +324,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Reducer 4' is a cross product
-Warning: Shuffle Join MERGEJOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Reducer 4' is a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B 
d2 where 1 = 1  group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B 
d2 where 1 = 1  group by d1.key) od1
@@ -434,7 +434,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
+Warning: Shuffle Join MERGEJOIN[31][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A  group by key) ss join
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by 
d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
index efd8b5d..ecd7f6b 100644
--- a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@B
-Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select * from A join B
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
@@ -90,7 +90,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
@@ -184,7 +184,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[30][bigTable=?] in task 'Reducer 3' is a cross 
product
+Warning: Map Join MAPJOIN[27][bigTable=?] in task 'Reducer 3' is a cross 
product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key 
@@ -301,8 +301,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 2' is a cross product
-Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Reducer 3' is a cross 
product
+Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Map 2' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Reducer 3' is a cross 
product
 PREHOOK: query: explain select * from A join (select d1.key from B d1 join B 
d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B 
d2 where 1 = 1 group by d1.key) od1
@@ -402,7 +402,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[34][bigTable=?] in task 'Reducer 4' is a cross 
product
+Warning: Map Join MAPJOIN[31][bigTable=?] in task 'Reducer 4' is a cross 
product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by 
d1.key) od1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f44fc81/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out 
b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
index d4b670d..caa4398 100644
--- a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
@@ -1284,28 +1284,25 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToDouble(_col0) (type: double)
+                      sort order: +
+                      Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToDouble(_col0) (type: double)
-                        sort order: +
-                        Map-reduce partition columns: UDFToDouble(_col0) 
(type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1409,20 +1406,17 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: (UDFToDouble(_col0) * UDFToDouble(2)) 
(type: double)
+                      sort order: +
+                      Map-reduce partition columns: (UDFToDouble(_col0) * 
UDFToDouble(2)) (type: double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: (UDFToDouble(_col0) * 2.0) (type: 
double)
-                        sort order: +
-                        Map-reduce partition columns: (UDFToDouble(_col0) * 
2.0) (type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1462,7 +1456,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 (UDFToDouble(_col0) * 2.0) (type: double)
+                  0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
                   1 _col0 (type: double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -1534,28 +1528,25 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (hr is not null and UDFToDouble(hr) is not null) 
(type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToDouble(_col0) (type: double)
+                      sort order: +
+                      Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToDouble(_col0) (type: double)
-                        sort order: +
-                        Map-reduce partition columns: UDFToDouble(_col0) 
(type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1644,20 +1635,17 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (hr is not null and (UDFToDouble(hr) * 2.0) is 
not null) (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: (UDFToDouble(_col0) * UDFToDouble(2)) 
(type: double)
+                      sort order: +
+                      Map-reduce partition columns: (UDFToDouble(_col0) * 
UDFToDouble(2)) (type: double)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: (UDFToDouble(_col0) * 2.0) (type: 
double)
-                        sort order: +
-                        Map-reduce partition columns: (UDFToDouble(_col0) * 
2.0) (type: double)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1682,7 +1670,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 (UDFToDouble(_col0) * 2.0) (type: double)
+                  0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
                   1 _col0 (type: double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -1767,28 +1755,25 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToString((UDFToDouble(hr) * 2.0)) is not null 
(type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToString((UDFToDouble(hr) * 2.0)) is not 
null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
+                    Reduce Output Operator
+                      key expressions: UDFToString((UDFToDouble(_col0) * 
UDFToDouble(2))) (type: string)
+                      sort order: +
+                      Map-reduce partition columns: 
UDFToString((UDFToDouble(_col0) * UDFToDouble(2))) (type: string)
                       Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: UDFToString((UDFToDouble(_col0) * 
2.0)) (type: string)
-                        sort order: +
-                        Map-reduce partition columns: 
UDFToString((UDFToDouble(_col0) * 2.0)) (type: string)
-                        Statistics: Num rows: 2000 Data size: 21248 Basic 
stats: COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToString(hr) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToString(hr) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -1820,7 +1805,7 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 UDFToString((UDFToDouble(_col0) * 2.0)) (type: string)
+                  0 UDFToString((UDFToDouble(_col0) * UDFToDouble(2))) (type: 
string)
                   1 UDFToString(_col0) (type: string)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
@@ -2035,7 +2020,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 1000
-Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: -- non-equi join
 EXPLAIN select count(*) from srcpart, srcpart_date_hour where 
(srcpart_date_hour.`date` = '2008-04-08' and srcpart_date_hour.hour = 11) and 
(srcpart.ds = srcpart_date_hour.ds or srcpart.hr = srcpart_date_hour.hr)
 PREHOOK: type: QUERY
@@ -2129,7 +2114,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: select count(*) from srcpart, srcpart_date_hour where 
(srcpart_date_hour.`date` = '2008-04-08' and srcpart_date_hour.hour = 11) and 
(srcpart.ds = srcpart_date_hour.ds or srcpart.hr = srcpart_date_hour.hr)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -4138,42 +4123,39 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 UDFToDouble(_col0) (type: double)
-                          1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: 
double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 UDFToDouble(_col0) (type: double)
+                        1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: 
double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_double_hour
-                  filterExpr: (((UDFToDouble(hour) = 11.0) and hr is not null) 
and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                  filterExpr: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(hour) = 11.0) and hr is not 
null) and UDFToDouble(UDFToInteger((hr / 2.0))) is not null) (type: boolean)
+                    predicate: ((UDFToDouble(hour) = 11.0) and hr is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: hr (type: double)
@@ -4259,34 +4241,31 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart
-                  filterExpr: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  filterExpr: hr is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: (UDFToDouble(hr) * 2.0) is not null (type: 
boolean)
+                  Select Operator
+                    expressions: hr (type: string)
+                    outputColumnNames: _col0
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: hr (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 (UDFToDouble(_col0) * 2.0) (type: double)
-                          1 _col0 (type: double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 (UDFToDouble(_col0) * UDFToDouble(2)) (type: double)
+                        1 _col0 (type: double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -5297,42 +5276,38 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: srcpart_orc
-                  filterExpr: UDFToDouble(hr) is not null (type: boolean)
                   Statistics: Num rows: 2000 Data size: 188000 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: UDFToDouble(hr) is not null (type: boolean)
+                  Select Operator
+                    expressions: ds (type: string), hr (type: int)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 2000 Data size: 188000 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: ds (type: string), hr (type: int)
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 2000 Data size: 188000 Basic 
stats: COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 _col0 (type: string), UDFToDouble(_col1) (type: 
double)
-                          1 _col0 (type: string), UDFToDouble(_col2) (type: 
double)
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 2200 Data size: 206800 Basic 
stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          aggregations: count()
-                          mode: hash
-                          outputColumnNames: _col0
+                    Map Join Operator
+                      condition map:
+                           Inner Join 0 to 1
+                      keys:
+                        0 _col0 (type: string), UDFToDouble(_col1) (type: 
double)
+                        1 _col0 (type: string), UDFToDouble(_col2) (type: 
double)
+                      input vertices:
+                        1 Map 3
+                      Statistics: Num rows: 2200 Data size: 206800 Basic 
stats: COMPLETE Column stats: NONE
+                      HybridGraceHashJoin: true
+                      Group By Operator
+                        aggregations: count()
+                        mode: hash
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          sort order: 
                           Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          value expressions: _col0 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: srcpart_date_hour
-                  filterExpr: (((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) and UDFToDouble(hr) is not null) (type: boolean)
+                  filterExpr: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) and UDFToDouble(hr) is not null) (type: boolean)
+                    predicate: ((((UDFToDouble(hour) = 11.0) and ((date = 
'2008-04-08') or (date = '2008-04-09'))) and hr is not null) and ds is not 
null) (type: boolean)
                     Statistics: Num rows: 2 Data size: 54 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ds (type: string), hr (type: string)

Reply via email to