http://git-wip-us.apache.org/repos/asf/hive/blob/cf492a8c/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
index fe3f79b..e810222 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
@@ -114,56 +114,56 @@ PREHOOK: Input: default@srcbucket_mapjoin_n18
 PREHOOK: Input: default@srcbucket_mapjoin_n18@ds=2008-04-08
 PREHOOK: Output: default@srcbucket_mapjoin_n18
 PREHOOK: Output: default@srcbucket_mapjoin_n18@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table srcbucket_mapjoin_n18 compute statistics for 
columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@srcbucket_mapjoin_n18
 POSTHOOK: Input: default@srcbucket_mapjoin_n18@ds=2008-04-08
 POSTHOOK: Output: default@srcbucket_mapjoin_n18
 POSTHOOK: Output: default@srcbucket_mapjoin_n18@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: analyze table srcbucket_mapjoin_part_n20 compute statistics 
for columns
 PREHOOK: type: ANALYZE_TABLE
 PREHOOK: Input: default@srcbucket_mapjoin_part_n20
 PREHOOK: Input: default@srcbucket_mapjoin_part_n20@ds=2008-04-08
 PREHOOK: Output: default@srcbucket_mapjoin_part_n20
 PREHOOK: Output: default@srcbucket_mapjoin_part_n20@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table srcbucket_mapjoin_part_n20 compute statistics 
for columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@srcbucket_mapjoin_part_n20
 POSTHOOK: Input: default@srcbucket_mapjoin_part_n20@ds=2008-04-08
 POSTHOOK: Output: default@srcbucket_mapjoin_part_n20
 POSTHOOK: Output: default@srcbucket_mapjoin_part_n20@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: analyze table tab_n10 compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
 PREHOOK: Input: default@tab_n10
 PREHOOK: Input: default@tab_n10@ds=2008-04-08
 PREHOOK: Output: default@tab_n10
 PREHOOK: Output: default@tab_n10@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table tab_n10 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@tab_n10
 POSTHOOK: Input: default@tab_n10@ds=2008-04-08
 POSTHOOK: Output: default@tab_n10
 POSTHOOK: Output: default@tab_n10@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: analyze table tab_part_n11 compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
 PREHOOK: Input: default@tab_part_n11
 PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
 PREHOOK: Output: default@tab_part_n11
 PREHOOK: Output: default@tab_part_n11@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table tab_part_n11 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@tab_part_n11
 POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
 POSTHOOK: Output: default@tab_part_n11
 POSTHOOK: Output: default@tab_part_n11@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
@@ -178,7 +178,7 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Edges:
         Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE)
-        Reducer 3 <- Map 1 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+        Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -194,11 +194,18 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
-                        key expressions: _col0 (type: int)
+                        key expressions: _col1 (type: string)
                         sort order: +
-                        Map-reduce partition columns: _col0 (type: int)
+                        Map-reduce partition columns: _col1 (type: string)
                         Statistics: Num rows: 500 Data size: 47500 Basic 
stats: COMPLETE Column stats: COMPLETE
-                        value expressions: _col1 (type: string)
+                        value expressions: _col0 (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
+        Map 4 
+            Map Operator Tree:
+                TableScan
+                  alias: b
+                  Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: value is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -214,7 +221,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: int)
             Execution mode: vectorized, llap
             LLAP IO: no inputs
-        Map 4 
+        Map 5 
             Map Operator Tree:
                 TableScan
                   alias: c
@@ -240,16 +247,16 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 _col0 (type: int)
-                  1 _col0 (type: int)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 809 Data size: 76855 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  0 _col1 (type: string)
+                  1 _col1 (type: string)
+                outputColumnNames: _col0, _col2
+                Statistics: Num rows: 814 Data size: 6512 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col1 (type: string)
+                  key expressions: _col0 (type: int)
                   sort order: +
-                  Map-reduce partition columns: _col1 (type: string)
-                  Statistics: Num rows: 809 Data size: 76855 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  value expressions: _col0 (type: int)
+                  Map-reduce partition columns: _col0 (type: int)
+                  Statistics: Num rows: 814 Data size: 6512 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  value expressions: _col2 (type: int)
         Reducer 3 
             Execution mode: llap
             Reduce Operator Tree:
@@ -257,17 +264,17 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 _col1 (type: string)
-                  1 _col1 (type: string)
-                outputColumnNames: _col0, _col3
-                Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col2
+                Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
-                  expressions: _col0 (type: int), _col3 (type: int)
+                  expressions: _col0 (type: int), _col2 (type: int)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -292,8 +299,8 @@ STAGE PLANS:
     Tez
 #### A masked pattern was here ####
       Edges:
-        Map 1 <- Map 3 (CUSTOM_EDGE)
         Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE)
+        Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -308,41 +315,12 @@ STAGE PLANS:
                       expressions: key (type: int), value (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 _col0 (type: int)
-                          1 _col0 (type: int)
-                        outputColumnNames: _col0, _col1
-                        input vertices:
-                          1 Map 3
-                        Statistics: Num rows: 809 Data size: 76855 Basic 
stats: COMPLETE Column stats: COMPLETE
-                        Reduce Output Operator
-                          key expressions: _col1 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col1 (type: string)
-                          Statistics: Num rows: 809 Data size: 76855 Basic 
stats: COMPLETE Column stats: COMPLETE
-                          value expressions: _col0 (type: int)
-            Execution mode: vectorized, llap
-            LLAP IO: no inputs
-        Map 3 
-            Map Operator Tree:
-                TableScan
-                  alias: c
-                  Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Select Operator
-                      expressions: key (type: int)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
-                        key expressions: _col0 (type: int)
+                        key expressions: _col1 (type: string)
                         sort order: +
-                        Map-reduce partition columns: _col0 (type: int)
-                        Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Map-reduce partition columns: _col1 (type: string)
+                        Statistics: Num rows: 500 Data size: 47500 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        value expressions: _col0 (type: int)
             Execution mode: vectorized, llap
             LLAP IO: no inputs
         Map 4 
@@ -365,6 +343,25 @@ STAGE PLANS:
                         value expressions: _col0 (type: int)
             Execution mode: vectorized, llap
             LLAP IO: no inputs
+        Map 5 
+            Map Operator Tree:
+                TableScan
+                  alias: c
+                  Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Select Operator
+                      expressions: key (type: int)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 500 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
@@ -374,15 +371,32 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: string)
                   1 _col1 (type: string)
-                outputColumnNames: _col0, _col3
-                Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                outputColumnNames: _col0, _col2
+                Statistics: Num rows: 814 Data size: 6512 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Reduce Output Operator
+                  key expressions: _col0 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: int)
+                  Statistics: Num rows: 814 Data size: 6512 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  value expressions: _col2 (type: int)
+        Reducer 3 
+            Execution mode: llap
+            Reduce Operator Tree:
+              Merge Join Operator
+                condition map:
+                     Inner Join 0 to 1
+                keys:
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col2
+                Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
-                  expressions: _col0 (type: int), _col3 (type: int)
+                  expressions: _col0 (type: int), _col2 (type: int)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1309 Data size: 10472 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1343 Data size: 10744 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -420,12 +434,12 @@ PREHOOK: query: analyze table tab1_n5 compute statistics 
for columns
 PREHOOK: type: ANALYZE_TABLE
 PREHOOK: Input: default@tab1_n5
 PREHOOK: Output: default@tab1_n5
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table tab1_n5 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@tab1_n5
 POSTHOOK: Output: default@tab1_n5
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain
 select a.key, a.value, b.value
 from tab1_n5 a join src b on a.key = b.key
@@ -496,14 +510,14 @@ STAGE PLANS:
                   0 UDFToDouble(_col0) (type: double)
                   1 UDFToDouble(_col0) (type: double)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: string), _col3 
(type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -585,14 +599,14 @@ STAGE PLANS:
                   0 UDFToDouble(_col0) (type: double)
                   1 UDFToDouble(_col0) (type: double)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: string), _col3 
(type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 382 Data size: 71052 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -670,10 +684,10 @@ STAGE PLANS:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -724,10 +738,10 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1
                         input vertices:
                           1 Map 2
-                        Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                         File Output Operator
                           compressed: false
-                          Statistics: Num rows: 267 Data size: 2136 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 272 Data size: 2176 Basic 
stats: COMPLETE Column stats: COMPLETE
                           table:
                               input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                               output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -826,10 +840,10 @@ STAGE PLANS:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -880,10 +894,10 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1
                         input vertices:
                           1 Map 2
-                        Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                         File Output Operator
                           compressed: false
-                          Statistics: Num rows: 267 Data size: 2136 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 272 Data size: 2176 Basic 
stats: COMPLETE Column stats: COMPLETE
                           table:
                               input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                               output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -982,10 +996,10 @@ STAGE PLANS:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1055,10 +1069,10 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1
                         input vertices:
                           0 Map 1
-                        Statistics: Num rows: 267 Data size: 2136 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 272 Data size: 2176 Basic stats: 
COMPLETE Column stats: COMPLETE
                         File Output Operator
                           compressed: false
-                          Statistics: Num rows: 267 Data size: 2136 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 272 Data size: 2176 Basic 
stats: COMPLETE Column stats: COMPLETE
                           table:
                               input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                               output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1141,10 +1155,10 @@ STAGE PLANS:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 191 Data size: 1528 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 200 Data size: 1600 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 191 Data size: 1528 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 200 Data size: 1600 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1214,10 +1228,10 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1
                         input vertices:
                           0 Reducer 2
-                        Statistics: Num rows: 191 Data size: 1528 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 200 Data size: 1600 Basic stats: 
COMPLETE Column stats: COMPLETE
                         File Output Operator
                           compressed: false
-                          Statistics: Num rows: 191 Data size: 1528 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 200 Data size: 1600 Basic 
stats: COMPLETE Column stats: COMPLETE
                           table:
                               input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                               output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1472,14 +1486,14 @@ PREHOOK: Input: default@tab_part1
 PREHOOK: Input: default@tab_part1@ds=2008-04-08
 PREHOOK: Output: default@tab_part1
 PREHOOK: Output: default@tab_part1@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table tab_part1 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@tab_part1
 POSTHOOK: Input: default@tab_part1@ds=2008-04-08
 POSTHOOK: Output: default@tab_part1
 POSTHOOK: Output: default@tab_part1@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain
 select count(*)
 from
@@ -1565,7 +1579,7 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int), _col1 (type: string)
                   1 _col0 (type: int), _col1 (type: string)
-                Statistics: Num rows: 195 Data size: 1560 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 197 Data size: 1576 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   mode: hash
@@ -1675,7 +1689,7 @@ STAGE PLANS:
                     1 _col0 (type: int), _col1 (type: string)
                   input vertices:
                     1 Map 4
-                  Statistics: Num rows: 195 Data size: 1560 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 197 Data size: 1576 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: count()
                     mode: hash
@@ -1829,14 +1843,14 @@ PREHOOK: Input: default@big
 PREHOOK: Input: default@big@k=1
 PREHOOK: Input: default@big@k=2
 PREHOOK: Input: default@small
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select small.i, big.i from small,big where small.i=big.i 
order by small.i, big.i
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@big
 POSTHOOK: Input: default@big@k=1
 POSTHOOK: Input: default@big@k=2
 POSTHOOK: Input: default@small
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      1
 2      2
 3      3

http://git-wip-us.apache.org/repos/asf/hive/blob/cf492a8c/ql/src/test/results/clientpositive/llap/check_constraint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/check_constraint.q.out 
b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
index fda46c9..085b003 100644
--- a/ql/src/test/results/clientpositive/llap/check_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
@@ -1536,11 +1536,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 268 Data size: 71020 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 262 Data size: 69430 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: UDFToInteger(_col0) (type: int), CAST( _col2 AS 
decimal(5,2)) (type: decimal(5,2)), _col1 (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 268 Data size: 55476 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 262 Data size: 54234 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Limit
                     Number of rows: 10
                     Statistics: Num rows: 10 Data size: 2070 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/cf492a8c/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out 
b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
index e91b699..99f3c56 100644
--- a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
+++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
@@ -72,7 +72,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -220,7 +220,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -360,7 +360,7 @@ STAGE PLANS:
                         outputColumnNames: _col0
                         input vertices:
                           0 Map 1
-                        Statistics: Num rows: 40 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 39 Data size: 3354 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Group By Operator
                           aggregations: count()
                           keys: _col0 (type: string)
@@ -515,18 +515,18 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 20 Data size: 1720 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 1634 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 9 Data size: 846 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -536,11 +536,11 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 940 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1)
                     mode: hash
@@ -668,18 +668,18 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 20 Data size: 1720 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 1634 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 9 Data size: 846 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -689,11 +689,11 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 940 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 940 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 9 Data size: 846 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1)
                     mode: hash
@@ -810,7 +810,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -952,7 +952,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -1094,7 +1094,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3480 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3393 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -1236,7 +1236,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3480 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3393 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -1375,18 +1375,18 @@ STAGE PLANS:
                   0 _col0 (type: string), _col1 (type: string)
                   1 _col0 (type: string), _col1 (type: string)
                 outputColumnNames: _col0, _col3
-                Statistics: Num rows: 40 Data size: 7080 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6903 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string), _col3 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                    Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -1396,10 +1396,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 20 Data size: 3700 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 3515 Basic stats: COMPLETE 
Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1506,18 +1506,18 @@ STAGE PLANS:
                   0 _col0 (type: string), _col1 (type: string)
                   1 _col0 (type: string), _col1 (type: string)
                 outputColumnNames: _col0, _col3
-                Statistics: Num rows: 40 Data size: 7080 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6903 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string), _col3 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                    Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -1527,10 +1527,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 20 Data size: 3700 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 3515 Basic stats: COMPLETE 
Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 20 Data size: 3700 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3515 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1924,7 +1924,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 500 Data size: 3526 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 500 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -2066,7 +2066,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 500 Data size: 3526 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 500 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -2208,7 +2208,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 525 Data size: 3526 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 525 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -2350,7 +2350,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 525 Data size: 3526 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 525 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -2499,18 +2499,18 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string), _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                    Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -2520,11 +2520,11 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 20 Data size: 3660 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 3477 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: 
int), hash(_col2) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -2648,18 +2648,18 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string), _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                    Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: bigint)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -2669,11 +2669,11 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 20 Data size: 3660 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 19 Data size: 3477 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: 
int), hash(_col2) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 20 Data size: 3660 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 19 Data size: 3477 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -2796,7 +2796,7 @@ STAGE PLANS:
                   0 _col0 (type: string), _col1 (type: string)
                   1 _col0 (type: string), _col1 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
@@ -2944,7 +2944,7 @@ STAGE PLANS:
                   0 _col0 (type: string), _col1 (type: string)
                   1 _col0 (type: string), _col1 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/cf492a8c/ql/src/test/results/clientpositive/llap/correlationoptimizer2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/correlationoptimizer2.q.out 
b/ql/src/test/results/clientpositive/llap/correlationoptimizer2.q.out
index 0f839ea..8e17d95 100644
--- a/ql/src/test/results/clientpositive/llap/correlationoptimizer2.q.out
+++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer2.q.out
@@ -1804,16 +1804,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -1825,11 +1825,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 30 Data size: 8070 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 29 Data size: 7801 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: 
int), hash(_col2) (type: int), hash(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3
-                  Statistics: Num rows: 30 Data size: 8070 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 29 Data size: 7801 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2), 
sum(_col3)
                     mode: hash
@@ -1985,16 +1985,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -2006,11 +2006,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 30 Data size: 8070 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 29 Data size: 7801 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col1) (type: 
int), hash(_col2) (type: int), hash(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3
-                  Statistics: Num rows: 30 Data size: 8070 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 29 Data size: 7801 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2), 
sum(_col3)
                     mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/cf492a8c/ql/src/test/results/clientpositive/llap/correlationoptimizer3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/correlationoptimizer3.q.out 
b/ql/src/test/results/clientpositive/llap/correlationoptimizer3.q.out
index 852f391..2e4010e 100644
--- a/ql/src/test/results/clientpositive/llap/correlationoptimizer3.q.out
+++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer3.q.out
@@ -101,16 +101,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -122,11 +122,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 40 Data size: 7320 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 7137 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col3) (type: 
int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 40 Data size: 7320 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 7137 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -161,7 +161,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -318,16 +318,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -339,11 +339,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 40 Data size: 7320 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 7137 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col0) (type: int), hash(_col3) (type: 
int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 40 Data size: 7320 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 7137 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -378,7 +378,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -482,11 +482,11 @@ STAGE PLANS:
                         outputColumnNames: _col1, _col2
                         input vertices:
                           1 Map 3
-                        Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Select Operator
                           expressions: _col1 (type: string), _col2 (type: 
string)
                           outputColumnNames: _col0, _col1
-                          Statistics: Num rows: 40 Data size: 7000 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 39 Data size: 6825 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Map Join Operator
                             condition map:
                                  Inner Join 0 to 1
@@ -496,11 +496,11 @@ STAGE PLANS:
                             outputColumnNames: _col0, _col1, _col3
                             input vertices:
                               1 Reducer 5
-                            Statistics: Num rows: 40 Data size: 7320 Basic 
stats: COMPLETE Column stats: COMPLETE
+                            Statistics: Num rows: 39 Data size: 7137 Basic 
stats: COMPLETE Column stats: COMPLETE
                             Select Operator
                               expressions: hash(_col0) (type: int), 
hash(_col3) (type: int), hash(_col1) (type: int)
                               outputColumnNames: _col0, _col1, _col2
-                              Statistics: Num rows: 40 Data size: 7320 Basic 
stats: COMPLETE Column stats: COMPLETE
+                              Statistics: Num rows: 39 Data size: 7137 Basic 
stats: COMPLETE Column stats: COMPLETE
                               Group By Operator
                                 aggregations: sum(_col0), sum(_col1), 
sum(_col2)
                                 mode: hash
@@ -553,7 +553,7 @@ STAGE PLANS:
                         outputColumnNames: _col1
                         input vertices:
                           1 Map 6
-                        Statistics: Num rows: 40 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 39 Data size: 3354 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Group By Operator
                           aggregations: count()
                           keys: _col1 (type: string)
@@ -746,16 +746,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -767,11 +767,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2, _col3
-                Statistics: Num rows: 40 Data size: 7320 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 7137 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col2) (type: int), hash(_col3) (type: 
int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 40 Data size: 7320 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 7137 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -806,7 +806,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -963,16 +963,16 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 40 Data size: 7000 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 6825 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: string), _col2 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: string)
         Reducer 3 
             Execution mode: llap
@@ -984,11 +984,11 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2, _col3
-                Statistics: Num rows: 40 Data size: 7320 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 7137 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
                   expressions: hash(_col2) (type: int), hash(_col3) (type: 
int), hash(_col1) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 40 Data size: 7320 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 39 Data size: 7137 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), sum(_col1), sum(_col2)
                     mode: hash
@@ -1023,7 +1023,7 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1
-                Statistics: Num rows: 40 Data size: 3440 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 39 Data size: 3354 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: _col1 (type: string)
@@ -1127,11 +1127,11 @@ STAGE PLANS:
                         outputColumnNames: _col1, _col2
                         input vertices:
                           1 Map 3
-                        Statistics: Num rows: 40 Data size: 7000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 39 Data size: 6825 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Select Operator
                           expressions: _col1 (type: string), _col2 (type: 
string)
                           outputColumnNames: _col0, _col1
-                          Statistics: Num rows: 40 Data size: 7000 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 39 Data size: 6825 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Map Join Operator
                             condition map:
                                  Inner Join 0 to 1
@@ -1141,11 +1141,11 @@ STAGE PLANS:
                             outputColumnNames: _col1, _col2, _col3
                             input vertices:
                               1 Reducer 5
-                            Statistics: Num rows: 40 Data size: 7320 Basic 
stats: COMPLETE Column stats: COMPLETE
+                            Statistics: Num rows: 39 Data size: 7137 Basic 
stats: COMPLETE Column stats: COMPLETE
                             Select Operator
                               expressions: hash(_col2) (type: int), 
hash(_col3) (type: int), hash(_col1) (type: int)
                               outputColumnNames: _col0, _col1, _col2
-                              Statistics: Num rows: 40 Data size: 7320 Basic 
stats: COMPLETE Column stats: COMPLETE
+                              Statistics: Num rows: 39 Data size: 7137 Basic 
stats: COMPLETE Column stats: COMPLETE
                               Group By Operator
                                 aggregations: sum(_col0), sum(_col1), 
sum(_col2)
                                 mode: hash
@@ -1198,7 +1198,7 @@ STAGE PLANS:
                         outputColumnNames: _col1
                         input vertices:
                           1 Map 6
-                        Statistics: Num rows: 40 Data size: 3440 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 39 Data size: 3354 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Group By Operator
                           aggregations: count()
                           keys: _col1 (type: string)

Reply via email to