http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
index e116fa7..60cd166 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
@@ -49,9 +49,15 @@ POSTHOOK: Output: default@smb_bucket_3_n0
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a join smb_bucket_3_n0 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a join smb_bucket_3_n0 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -104,9 +110,15 @@ POSTHOOK: Input: default@smb_bucket_3_n0
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a left outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a left outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -158,9 +170,15 @@ POSTHOOK: Input: default@smb_bucket_3_n0
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a right outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a right outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -214,9 +232,15 @@ NULL       NULL    4       val_4
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a full outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2_n0 a full outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -272,9 +296,15 @@ NULL       NULL    4       val_4
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a join smb_bucket_3_n0 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a join smb_bucket_3_n0 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -327,9 +357,15 @@ POSTHOOK: Input: default@smb_bucket_3_n0
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a left outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a left outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -381,9 +417,15 @@ POSTHOOK: Input: default@smb_bucket_3_n0
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a right outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a right outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -437,9 +479,15 @@ NULL       NULL    4       val_4
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a full outer join 
smb_bucket_3_n0 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_2_n0
+PREHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2_n0 a full outer join 
smb_bucket_3_n0 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_2_n0
+POSTHOOK: Input: default@smb_bucket_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_7.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_7.q.out
index 4b1313d..66401f6 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_7.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_7.q.out
@@ -610,10 +610,16 @@ PREHOOK: query: explain
 insert overwrite table smb_join_results
 select /*+mapjoin(a)*/ * from smb_bucket4_1 a full outer join smb_bucket4_2 b 
on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket4_1
+PREHOOK: Input: default@smb_bucket4_2
+PREHOOK: Output: default@smb_join_results
 POSTHOOK: query: explain
 insert overwrite table smb_join_results
 select /*+mapjoin(a)*/ * from smb_bucket4_1 a full outer join smb_bucket4_2 b 
on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket4_1
+POSTHOOK: Input: default@smb_bucket4_2
+POSTHOOK: Output: default@smb_join_results
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/binary_output_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/binary_output_format.q.out 
b/ql/src/test/results/clientpositive/binary_output_format.q.out
index 9b0ee6b..e875257 100644
--- a/ql/src/test/results/clientpositive/binary_output_format.q.out
+++ b/ql/src/test/results/clientpositive/binary_output_format.q.out
@@ -35,6 +35,8 @@ SELECT TRANSFORM(*)
     RECORDREADER 'org.apache.hadoop.hive.ql.exec.BinaryRecordReader'
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n109
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1_n109
 SELECT TRANSFORM(*)
@@ -48,6 +50,8 @@ SELECT TRANSFORM(*)
     RECORDREADER 'org.apache.hadoop.hive.ql.exec.BinaryRecordReader'
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n109
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/binarysortable_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/binarysortable_1.q.out 
b/ql/src/test/results/clientpositive/binarysortable_1.q.out
index f073949..f9464c5 100644
Binary files a/ql/src/test/results/clientpositive/binarysortable_1.q.out and 
b/ql/src/test/results/clientpositive/binarysortable_1.q.out differ

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket1.q.out 
b/ql/src/test/results/clientpositive/bucket1.q.out
index f39af86..8d69455 100644
--- a/ql/src/test/results/clientpositive/bucket1.q.out
+++ b/ql/src/test/results/clientpositive/bucket1.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket1_1
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket1_1
 POSTHOOK: query: explain extended
 insert overwrite table bucket1_1
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket1_1
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket2.q.out 
b/ql/src/test/results/clientpositive/bucket2.q.out
index 8d1d066..aec4cea 100644
--- a/ql/src/test/results/clientpositive/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/bucket2.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket2_1
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket2_1
 POSTHOOK: query: explain extended
 insert overwrite table bucket2_1
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket2_1
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -226,9 +230,13 @@ POSTHOOK: Lineage: bucket2_1.value SIMPLE 
[(src)src.FieldSchema(name:value, type
 PREHOOK: query: explain
 select * from bucket2_1 tablesample (bucket 1 out of 2) s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket2_1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket2_1 tablesample (bucket 1 out of 2) s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket2_1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket3.q.out 
b/ql/src/test/results/clientpositive/bucket3.q.out
index 0becf0a..260ae51 100644
--- a/ql/src/test/results/clientpositive/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/bucket3.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket3_1 partition (ds='1')
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket3_1@ds=1
 POSTHOOK: query: explain extended
 insert overwrite table bucket3_1 partition (ds='1')
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket3_1@ds=1
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -306,9 +310,15 @@ POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).value SIMPLE 
[(src)src.FieldSchema(
 PREHOOK: query: explain
 select * from bucket3_1 tablesample (bucket 1 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket3_1
+PREHOOK: Input: default@bucket3_1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket3_1 tablesample (bucket 1 out of 2) s where ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket3_1
+POSTHOOK: Input: default@bucket3_1@ds=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
index 6d837a3..0bfa6d6 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
@@ -45,9 +45,15 @@ POSTHOOK: Output: default@table2_n5
 PREHOOK: query: explain extended
 select /*+ mapjoin(b) */ count(*) from table1_n9 a join table2_n5 b on 
a.key=b.key and a.value=b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1_n9
+PREHOOK: Input: default@table2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select /*+ mapjoin(b) */ count(*) from table1_n9 a join table2_n5 b on 
a.key=b.key and a.value=b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1_n9
+POSTHOOK: Input: default@table2_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
index 0761f2f..29b60e8 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
@@ -45,9 +45,15 @@ POSTHOOK: Output: default@table2
 PREHOOK: query: explain extended
 select /*+ mapjoin(b) */ count(*) from table1 a join table2 b on a.key=b.key 
and a.value=b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1
+PREHOOK: Input: default@table2
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select /*+ mapjoin(b) */ count(*) from table1 a join table2 b on a.key=b.key 
and a.value=b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1
+POSTHOOK: Input: default@table2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
index 14d4cc0..cad932a 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
@@ -110,12 +110,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n19 a join srcbucket_mapjoin_part_2_n16 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n16
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n16@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n19
+PREHOOK: Input: default@srcbucket_mapjoin_part_n19@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n9
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n9
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n19 a join srcbucket_mapjoin_part_2_n16 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n16
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n16@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n19
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n19@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n9
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n19`
@@ -559,12 +569,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n19 a join srcbucket_mapjoin_part_2_n16 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n16
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n16@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n19
+PREHOOK: Input: default@srcbucket_mapjoin_part_n19@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n9
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n9
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n19 a join srcbucket_mapjoin_part_2_n16 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n16
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n16@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n19
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n19@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n9
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n19`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
index 050fada..df0e4b2 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
@@ -94,12 +94,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n12 a join srcbucket_mapjoin_part_2_n10 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n10
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n10@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n12
+PREHOOK: Input: default@srcbucket_mapjoin_part_n12@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n5
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n5
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n12 a join srcbucket_mapjoin_part_2_n10 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n10
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n10@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n12
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n12@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n5
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n12`
@@ -543,12 +553,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n12 a join srcbucket_mapjoin_part_2_n10 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n10
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n10@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n12
+PREHOOK: Input: default@srcbucket_mapjoin_part_n12@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n5
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n5
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n12 a join srcbucket_mapjoin_part_2_n10 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n10
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n10@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n12
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n12@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n5
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n12`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
index 6d927e1..169c249 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
@@ -94,12 +94,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n4 a join srcbucket_mapjoin_part_2_n3 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n3
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n3@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n4
+PREHOOK: Input: default@srcbucket_mapjoin_part_n4@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n1
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n1
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n4 a join srcbucket_mapjoin_part_2_n3 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n3
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n3@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n4
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n4@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n1
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n4`
@@ -543,12 +553,22 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n4 a join srcbucket_mapjoin_part_2_n3 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n3
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n3@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n4
+PREHOOK: Input: default@srcbucket_mapjoin_part_n4@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n1
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n1
 select a.key, a.value, b.value
 from srcbucket_mapjoin_part_n4 a join srcbucket_mapjoin_part_2_n3 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n3
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n3@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n4
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n4@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n1
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n4`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
index 5f29ee7..211c067 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
@@ -62,10 +62,18 @@ PREHOOK: query: explain extended
 select a.key as key, a.value as val1, b.value as val2, c.value as val3
 from tbl1_n0 a join tbl2_n0 b on a.key = b.key join tbl3 c on a.value = c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n0
+PREHOOK: Input: default@tbl2_n0
+PREHOOK: Input: default@tbl3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select a.key as key, a.value as val1, b.value as val2, c.value as val3
 from tbl1_n0 a join tbl2_n0 b on a.key = b.key join tbl3 c on a.value = c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n0
+POSTHOOK: Input: default@tbl2_n0
+POSTHOOK: Input: default@tbl3
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value` AS `val1`, `t2`.`value` AS 
`val2`, `t4`.`value` AS `val3`
 FROM (SELECT `key`, `value`
 FROM `default`.`tbl1_n0`
@@ -434,10 +442,18 @@ PREHOOK: query: explain extended
 select a.key as key, a.value as val1, b.value as val2, c.value as val3
 from tbl1_n0 a join tbl2_n0 b on a.key = b.key join tbl3 c on a.value = c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n0
+PREHOOK: Input: default@tbl2_n0
+PREHOOK: Input: default@tbl3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select a.key as key, a.value as val1, b.value as val2, c.value as val3
 from tbl1_n0 a join tbl2_n0 b on a.key = b.key join tbl3 c on a.value = c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n0
+POSTHOOK: Input: default@tbl2_n0
+POSTHOOK: Input: default@tbl3
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value` AS `val1`, `t2`.`value` AS 
`val2`, `t4`.`value` AS `val3`
 FROM (SELECT `key`, `value`
 FROM `default`.`tbl1_n0`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
index 3ea4529..93f9046 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
@@ -99,8 +99,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n14@ds=2008-04-09
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n14 a JOIN bucket_big_n14 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n14
+PREHOOK: Input: default@bucket_big_n14@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n14@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n14
+PREHOOK: Input: default@bucket_small_n14@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n14 a JOIN bucket_big_n14 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n14
+POSTHOOK: Input: default@bucket_big_n14@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n14@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n14
+POSTHOOK: Input: default@bucket_small_n14@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -381,8 +393,20 @@ POSTHOOK: Input: default@bucket_small_n14@ds=2008-04-08
 928
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n14 a JOIN bucket_big_n14 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n14
+PREHOOK: Input: default@bucket_big_n14@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n14@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n14
+PREHOOK: Input: default@bucket_small_n14@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n14 a JOIN bucket_big_n14 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n14
+POSTHOOK: Input: default@bucket_big_n14@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n14@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n14
+POSTHOOK: Input: default@bucket_small_n14@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
index df6a9e8..9986ead 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
@@ -83,8 +83,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n8@ds=2008-04-09
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n8 a JOIN bucket_big_n8 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n8
+PREHOOK: Input: default@bucket_big_n8@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n8@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n8
+PREHOOK: Input: default@bucket_small_n8@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n8 a JOIN bucket_big_n8 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n8
+POSTHOOK: Input: default@bucket_big_n8@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n8@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n8
+POSTHOOK: Input: default@bucket_small_n8@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -365,8 +377,20 @@ POSTHOOK: Input: default@bucket_small_n8@ds=2008-04-08
 928
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n8 a JOIN bucket_big_n8 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n8
+PREHOOK: Input: default@bucket_big_n8@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n8@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n8
+PREHOOK: Input: default@bucket_small_n8@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n8 a JOIN bucket_big_n8 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n8
+POSTHOOK: Input: default@bucket_big_n8@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n8@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n8
+POSTHOOK: Input: default@bucket_small_n8@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
index e640cce..f180fe8 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
@@ -83,8 +83,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n4@ds=2008-04-08
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n4 a JOIN bucket_big_n4 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n4
+PREHOOK: Input: default@bucket_big_n4@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n4
+PREHOOK: Input: default@bucket_small_n4@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n4@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n4 a JOIN bucket_big_n4 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n4
+POSTHOOK: Input: default@bucket_big_n4@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n4
+POSTHOOK: Input: default@bucket_small_n4@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n4@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -362,8 +374,20 @@ POSTHOOK: Input: default@bucket_small_n4@ds=2008-04-09
 928
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n4 a JOIN bucket_big_n4 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n4
+PREHOOK: Input: default@bucket_big_n4@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n4
+PREHOOK: Input: default@bucket_small_n4@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n4@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n4 a JOIN bucket_big_n4 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n4
+POSTHOOK: Input: default@bucket_big_n4@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n4
+POSTHOOK: Input: default@bucket_small_n4@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n4@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
index 79f66c0..83ca352 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -99,8 +99,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big@ds=2008-04-08
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small a JOIN bucket_big b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big
+PREHOOK: Input: default@bucket_big@ds=2008-04-08
+PREHOOK: Input: default@bucket_small
+PREHOOK: Input: default@bucket_small@ds=2008-04-08
+PREHOOK: Input: default@bucket_small@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small a JOIN bucket_big b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big
+POSTHOOK: Input: default@bucket_big@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small
+POSTHOOK: Input: default@bucket_small@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -378,8 +390,20 @@ POSTHOOK: Input: default@bucket_small@ds=2008-04-09
 928
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small a JOIN bucket_big b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big
+PREHOOK: Input: default@bucket_big@ds=2008-04-08
+PREHOOK: Input: default@bucket_small
+PREHOOK: Input: default@bucket_small@ds=2008-04-08
+PREHOOK: Input: default@bucket_small@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small a JOIN bucket_big b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big
+POSTHOOK: Input: default@bucket_big@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small
+POSTHOOK: Input: default@bucket_small@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
index 629c364..5dccb25 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -64,8 +64,14 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n13
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n13 a JOIN bucket_big_n13 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n13
+PREHOOK: Input: default@bucket_small_n13
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n13 a JOIN bucket_big_n13 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n13
+POSTHOOK: Input: default@bucket_small_n13
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -240,8 +246,14 @@ POSTHOOK: Input: default@bucket_small_n13
 464
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n13 a JOIN bucket_big_n13 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n13
+PREHOOK: Input: default@bucket_small_n13
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n13 a JOIN bucket_big_n13 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n13
+POSTHOOK: Input: default@bucket_small_n13
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
index 7cfcec0..471288a 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -82,8 +82,18 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n7@ds=2008-04-09
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n7 a JOIN bucket_big_n7 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n7
+PREHOOK: Input: default@bucket_big_n7@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n7@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n7 a JOIN bucket_big_n7 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n7
+POSTHOOK: Input: default@bucket_big_n7@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n7@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n7
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -313,8 +323,18 @@ POSTHOOK: Input: default@bucket_small_n7
 928
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n7 a JOIN bucket_big_n7 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n7
+PREHOOK: Input: default@bucket_big_n7@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n7@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n7 a JOIN bucket_big_n7 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n7
+POSTHOOK: Input: default@bucket_big_n7@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n7@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n7
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
index 47d568f..a87d058 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -116,8 +116,22 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n2@ds=2008-04-09
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n2 a JOIN bucket_big_n2 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n2
+PREHOOK: Input: default@bucket_big_n2@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n2@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n2
+PREHOOK: Input: default@bucket_small_n2@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n2@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n2 a JOIN bucket_big_n2 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n2
+POSTHOOK: Input: default@bucket_big_n2@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n2@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n2
+POSTHOOK: Input: default@bucket_small_n2@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n2@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -448,8 +462,22 @@ POSTHOOK: Input: default@bucket_small_n2@ds=2008-04-09
 1856
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n2 a JOIN bucket_big_n2 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n2
+PREHOOK: Input: default@bucket_big_n2@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n2@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n2
+PREHOOK: Input: default@bucket_small_n2@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n2@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n2 a JOIN bucket_big_n2 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n2
+POSTHOOK: Input: default@bucket_big_n2@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n2@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n2
+POSTHOOK: Input: default@bucket_small_n2@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n2@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketcontext_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
index 1468453..53a9771 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -116,8 +116,22 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n10@ds=2008-04-09
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n10 a JOIN bucket_big_n10 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n10
+PREHOOK: Input: default@bucket_big_n10@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n10@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n10
+PREHOOK: Input: default@bucket_small_n10@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n10@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n10 a JOIN bucket_big_n10 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n10
+POSTHOOK: Input: default@bucket_big_n10@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n10@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n10
+POSTHOOK: Input: default@bucket_small_n10@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n10@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -448,8 +462,22 @@ POSTHOOK: Input: default@bucket_small_n10@ds=2008-04-09
 1856
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n10 a JOIN bucket_big_n10 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n10
+PREHOOK: Input: default@bucket_big_n10@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n10@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n10
+PREHOOK: Input: default@bucket_small_n10@ds=2008-04-08
+PREHOOK: Input: default@bucket_small_n10@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) FROM 
bucket_small_n10 a JOIN bucket_big_n10 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n10
+POSTHOOK: Input: default@bucket_big_n10@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n10@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n10
+POSTHOOK: Input: default@bucket_small_n10@ds=2008-04-08
+POSTHOOK: Input: default@bucket_small_n10@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
index 728a44b..5c8706f 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
@@ -131,11 +131,25 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n6 a JOIN srcbucket_mapjoin_part_2_n13 b
 ON a.key = b.key AND a.part IS NOT NULL AND b.part IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n6@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n6@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n13
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n13@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n13@part=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n6 a JOIN srcbucket_mapjoin_part_2_n13 b
 ON a.key = b.key AND a.part IS NOT NULL AND b.part IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n6@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n6@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n13
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n13@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n13@part=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
index 1cb95b3..177ae48 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
@@ -139,11 +139,25 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n2 a JOIN srcbucket_mapjoin_part_2_n6 b
 ON a.key = b.key AND a.part IS NOT NULL AND b.part IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n2 a JOIN srcbucket_mapjoin_part_2_n6 b
 ON a.key = b.key AND a.part IS NOT NULL AND b.part IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -476,11 +490,25 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n2 a JOIN srcbucket_mapjoin_part_2_n6 b
 ON a.key = b.key AND a.part = b.part AND a.part IS NOT NULL AND b.part IS NOT 
NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n2 a JOIN srcbucket_mapjoin_part_2_n6 b
 ON a.key = b.key AND a.part = b.part AND a.part IS NOT NULL AND b.part IS NOT 
NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n2@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n6@part=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
index b360261..59d7ee5 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
@@ -100,11 +100,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1 a JOIN srcbucket_mapjoin_part_2_n0 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n0
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n0@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1 a JOIN srcbucket_mapjoin_part_2_n0 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n0
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n0@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -335,11 +345,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1 a JOIN srcbucket_mapjoin_part_3 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_3
+PREHOOK: Input: default@srcbucket_mapjoin_part_3@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1 a JOIN srcbucket_mapjoin_part_3 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_3
+POSTHOOK: Input: default@srcbucket_mapjoin_part_3@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
index 2f9b3ca..72064ef 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
@@ -67,11 +67,23 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -350,11 +362,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key and a.part = '2'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key and a.part = '2'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -596,11 +618,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -842,11 +874,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n8 a JOIN srcbucket_mapjoin_part_2_n18 b
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n8@part=2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n18@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
index 7f0b1ed..0abc2fc 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
@@ -168,12 +168,22 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n0 a join srcbucket_mapjoin_part_n0 b 
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n0
+PREHOOK: Input: default@srcbucket_mapjoin_part_n0
+PREHOOK: Input: default@srcbucket_mapjoin_part_n0@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n0@ds=2008-04-09
+PREHOOK: Output: default@bucketmapjoin_tmp_result
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result 
 select /*+mapjoin(a)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n0 a join srcbucket_mapjoin_part_n0 b 
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n0
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n0
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n0@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n0@ds=2008-04-09
+POSTHOOK: Output: default@bucketmapjoin_tmp_result
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-1 depends on stages: Stage-9
@@ -770,12 +780,22 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n0 a join srcbucket_mapjoin_part_2 b 
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n0
+PREHOOK: Input: default@srcbucket_mapjoin_part_2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-09
+PREHOOK: Output: default@bucketmapjoin_tmp_result
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result 
 select /*+mapjoin(a)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n0 a join srcbucket_mapjoin_part_2 b 
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n0
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-09
+POSTHOOK: Output: default@bucketmapjoin_tmp_result
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-1 depends on stages: Stage-9

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
index 4ec58eb..87b3d34 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
@@ -65,11 +65,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n1 a JOIN srcbucket_mapjoin_part_2_n4 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n1@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n4
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n4@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n1 a JOIN srcbucket_mapjoin_part_2_n4 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n1@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n4
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n4@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -309,11 +319,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n1 a JOIN srcbucket_mapjoin_part_2_n4 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n1@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n4
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n4@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n1 a JOIN srcbucket_mapjoin_part_2_n4 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n1@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n4
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n4@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
index 1b23e0b..70440e0 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
@@ -73,11 +73,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n5 a JOIN srcbucket_mapjoin_part_2_n12 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n5@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n12
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n12@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n5 a JOIN srcbucket_mapjoin_part_2_n12 b
 ON a.key = b.key AND a.part = '1' and b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n5@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n12
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n12@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -342,11 +352,21 @@ SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n5 a JOIN srcbucket_mapjoin_part_2_n12 b
 ON a.key = b.key AND a.part = '1' AND b.part = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n5@part=1
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n12
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n12@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ count(*)
 FROM srcbucket_mapjoin_part_1_n5 a JOIN srcbucket_mapjoin_part_2_n12 b
 ON a.key = b.key AND a.part = '1' AND b.part = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n5@part=1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n12
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n12@part=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
index f7c1cfc..785d9cd 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
@@ -69,12 +69,20 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n10 a join srcbucket_mapjoin_part_n10 b 
 on a.key=b.key where b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n10
+PREHOOK: Input: default@srcbucket_mapjoin_part_n10
+PREHOOK: Input: default@srcbucket_mapjoin_part_n10@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n4
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n4 
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n10 a join srcbucket_mapjoin_part_n10 b 
 on a.key=b.key where b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n10
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n10
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n10@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n4
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-1 depends on stages: Stage-9

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
index c92d0e5..ac8a182 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
@@ -78,12 +78,22 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n5 a join srcbucket_mapjoin_part_2_n7 b 
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n7
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n7@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n7@ds=2008-04-09
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n3
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n3 
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n5 a join srcbucket_mapjoin_part_2_n7 b 
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n7
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n7@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n7@ds=2008-04-09
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n3
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-1 depends on stages: Stage-9

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
index 7d3db6a..89e3b32 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
@@ -144,8 +144,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@test4
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test1_n11 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test1_n11 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -295,8 +299,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test2_n7 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test2_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test2_n7 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test2_n7
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -446,8 +454,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test1_n11 R on L.key+L.key=R.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test1_n11 R on L.key+L.key=R.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -589,8 +601,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test2_n7 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n11
+PREHOOK: Input: default@test2_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test2_n7 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n11
+POSTHOOK: Input: default@test2_n7
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -732,8 +750,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test3 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n11
+PREHOOK: Input: default@test3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test3 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n11
+POSTHOOK: Input: default@test3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -875,8 +899,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test4 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n11
+PREHOOK: Input: default@test4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test1_n11 L 
join test4 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n11
+POSTHOOK: Input: default@test4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -1018,8 +1048,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test3 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test2_n7
+PREHOOK: Input: default@test3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test3 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test2_n7
+POSTHOOK: Input: default@test3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -1161,8 +1197,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test4 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test2_n7
+PREHOOK: Input: default@test4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test2_n7 L 
join test4 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test2_n7
+POSTHOOK: Input: default@test4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -1304,8 +1346,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test3 L join 
test4 R on L.key=R.key AND L.value=R.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test3
+PREHOOK: Input: default@test4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(R) */ * from test3 L join 
test4 R on L.key=R.key AND L.value=R.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test3
+POSTHOOK: Input: default@test4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
index fe2c7c2..66633f0 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
@@ -37,6 +37,9 @@ SELECT x.key, x.value from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n5
+PREHOOK: Input: default@test_table1_n5@ds=1
+PREHOOK: Output: default@test_table2_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n5 PARTITION (ds = '1')
 SELECT x.key, x.value from 
@@ -44,6 +47,9 @@ SELECT x.key, x.value from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n5
+POSTHOOK: Input: default@test_table1_n5@ds=1
+POSTHOOK: Output: default@test_table2_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -147,6 +153,9 @@ SELECT * from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n5
+PREHOOK: Input: default@test_table1_n5@ds=1
+PREHOOK: Output: default@test_table2_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n5 PARTITION (ds = '1')
 SELECT * from 
@@ -154,6 +163,9 @@ SELECT * from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n5
+POSTHOOK: Input: default@test_table1_n5@ds=1
+POSTHOOK: Output: default@test_table2_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -257,6 +269,9 @@ SELECT x.key, concat(x.value, x.value) from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n5
+PREHOOK: Input: default@test_table1_n5@ds=1
+PREHOOK: Output: default@test_table2_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n5 PARTITION (ds = '1')
 SELECT x.key, concat(x.value, x.value) from 
@@ -264,6 +279,9 @@ SELECT x.key, concat(x.value, x.value) from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n5
+POSTHOOK: Input: default@test_table1_n5@ds=1
+POSTHOOK: Output: default@test_table2_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -316,6 +334,9 @@ SELECT x.key+x.key, x.value from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n5
+PREHOOK: Input: default@test_table1_n5@ds=1
+PREHOOK: Output: default@test_table2_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n5 PARTITION (ds = '1')
 SELECT x.key+x.key, x.value from 
@@ -323,6 +344,9 @@ SELECT x.key+x.key, x.value from
 SELECT a.key, a.value FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n5
+POSTHOOK: Input: default@test_table1_n5@ds=1
+POSTHOOK: Output: default@test_table2_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -432,6 +456,9 @@ SELECT x.k1, concat(x.v1, x.v1) from
 SELECT a.key as k1, a.value as v1 FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n5
+PREHOOK: Input: default@test_table1_n5@ds=1
+PREHOOK: Output: default@test_table2_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n5 PARTITION (ds = '1')
 SELECT x.k1, concat(x.v1, x.v1) from 
@@ -439,6 +466,9 @@ SELECT x.k1, concat(x.v1, x.v1) from
 SELECT a.key as k1, a.value as v1 FROM test_table1_n5 a WHERE a.ds = '1'
 )x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n5
+POSTHOOK: Input: default@test_table1_n5@ds=1
+POSTHOOK: Output: default@test_table2_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
index 085f8f4..e0d5bfc 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
@@ -35,11 +35,17 @@ INSERT OVERWRITE TABLE test_table2_n18 PARTITION (ds = '1')
 SELECT x.value, x.key from 
 (SELECT a.key, a.value FROM test_table1_n19 a WHERE a.ds = '1')x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n19
+PREHOOK: Input: default@test_table1_n19@ds=1
+PREHOOK: Output: default@test_table2_n18@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n18 PARTITION (ds = '1')
 SELECT x.value, x.key from 
 (SELECT a.key, a.value FROM test_table1_n19 a WHERE a.ds = '1')x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n19
+POSTHOOK: Input: default@test_table1_n19@ds=1
+POSTHOOK: Output: default@test_table2_n18@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -147,11 +153,17 @@ INSERT OVERWRITE TABLE test_table2_n18 PARTITION (ds = 
'1')
 SELECT x.key, x.value from 
 (SELECT a.key, a.value FROM test_table1_n19 a WHERE a.ds = '1')x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n19
+PREHOOK: Input: default@test_table1_n19@ds=1
+PREHOOK: Output: default@test_table2_n18@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2_n18 PARTITION (ds = '1')
 SELECT x.key, x.value from 
 (SELECT a.key, a.value FROM test_table1_n19 a WHERE a.ds = '1')x
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n19
+POSTHOOK: Input: default@test_table1_n19@ds=1
+POSTHOOK: Output: default@test_table2_n18@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
index cbcac68..76f5c50 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
@@ -58,12 +58,22 @@ SELECT a.key, a.key, concat(a.value, b.value)
 FROM test_table1_n16 a JOIN test_table2_n15 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n16
+PREHOOK: Input: default@test_table1_n16@ds=1
+PREHOOK: Input: default@test_table2_n15
+PREHOOK: Input: default@test_table2_n15@ds=1
+PREHOOK: Output: default@test_table3_n8@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n8 PARTITION (ds = '1')
 SELECT a.key, a.key, concat(a.value, b.value) 
 FROM test_table1_n16 a JOIN test_table2_n15 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n16
+POSTHOOK: Input: default@test_table1_n16@ds=1
+POSTHOOK: Input: default@test_table2_n15
+POSTHOOK: Input: default@test_table2_n15@ds=1
+POSTHOOK: Output: default@test_table3_n8@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -255,12 +265,22 @@ SELECT a.key, a.value
 FROM test_table1_n16 a JOIN test_table2_n15 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n16
+PREHOOK: Input: default@test_table1_n16@ds=1
+PREHOOK: Input: default@test_table2_n15
+PREHOOK: Input: default@test_table2_n15@ds=1
+PREHOOK: Output: default@test_table3_n8@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n8 PARTITION (ds = '1')
 SELECT a.key, a.value
 FROM test_table1_n16 a JOIN test_table2_n15 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n16
+POSTHOOK: Input: default@test_table1_n16@ds=1
+POSTHOOK: Input: default@test_table2_n15
+POSTHOOK: Input: default@test_table2_n15@ds=1
+POSTHOOK: Output: default@test_table3_n8@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
index 97c4d96..9eef0db 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
@@ -58,12 +58,22 @@ SELECT a.key, concat(a.value, b.value)
 FROM test_table1_n8 a JOIN test_table2_n8 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n8
+PREHOOK: Input: default@test_table1_n8@ds=1
+PREHOOK: Input: default@test_table2_n8
+PREHOOK: Input: default@test_table2_n8@ds=1
+PREHOOK: Output: default@test_table3_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n5 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
 FROM test_table1_n8 a JOIN test_table2_n8 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n8
+POSTHOOK: Input: default@test_table1_n8@ds=1
+POSTHOOK: Input: default@test_table2_n8
+POSTHOOK: Input: default@test_table2_n8@ds=1
+POSTHOOK: Output: default@test_table3_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -243,6 +253,11 @@ JOIN
 (select key, value from test_table2_n8 where ds = '1') b 
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n8
+PREHOOK: Input: default@test_table1_n8@ds=1
+PREHOOK: Input: default@test_table2_n8
+PREHOOK: Input: default@test_table2_n8@ds=1
+PREHOOK: Output: default@test_table3_n5@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n5 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -252,6 +267,11 @@ JOIN
 (select key, value from test_table2_n8 where ds = '1') b 
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n8
+POSTHOOK: Input: default@test_table1_n8@ds=1
+POSTHOOK: Input: default@test_table2_n8
+POSTHOOK: Input: default@test_table2_n8@ds=1
+POSTHOOK: Output: default@test_table3_n5@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
index 0b9485a..9b2ac8d 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
@@ -58,12 +58,22 @@ SELECT a.key, b.key, concat(a.value, b.value)
 FROM test_table1_n2 a JOIN test_table2_n2 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n2
+PREHOOK: Input: default@test_table1_n2@ds=1
+PREHOOK: Input: default@test_table2_n2
+PREHOOK: Input: default@test_table2_n2@ds=1
+PREHOOK: Output: default@test_table3_n2@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n2 PARTITION (ds = '1')
 SELECT a.key, b.key, concat(a.value, b.value) 
 FROM test_table1_n2 a JOIN test_table2_n2 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n2
+POSTHOOK: Input: default@test_table1_n2@ds=1
+POSTHOOK: Input: default@test_table2_n2
+POSTHOOK: Input: default@test_table2_n2@ds=1
+POSTHOOK: Output: default@test_table3_n2@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -241,12 +251,22 @@ SELECT b.key, a.key, concat(a.value, b.value)
 FROM test_table1_n2 a JOIN test_table2_n2 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n2
+PREHOOK: Input: default@test_table1_n2@ds=1
+PREHOOK: Input: default@test_table2_n2
+PREHOOK: Input: default@test_table2_n2@ds=1
+PREHOOK: Output: default@test_table3_n2@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n2 PARTITION (ds = '1')
 SELECT b.key, a.key, concat(a.value, b.value) 
 FROM test_table1_n2 a JOIN test_table2_n2 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n2
+POSTHOOK: Input: default@test_table1_n2@ds=1
+POSTHOOK: Input: default@test_table2_n2
+POSTHOOK: Input: default@test_table2_n2@ds=1
+POSTHOOK: Output: default@test_table3_n2@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/case_sensitivity.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/case_sensitivity.q.out 
b/ql/src/test/results/clientpositive/case_sensitivity.q.out
index a8d5d50..87d7c82 100644
--- a/ql/src/test/results/clientpositive/case_sensitivity.q.out
+++ b/ql/src/test/results/clientpositive/case_sensitivity.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM SRC_THRIFT
 INSERT OVERWRITE TABLE dest1_n129 SELECT src_Thrift.LINT[1], 
src_thrift.lintstring[0].MYSTRING where src_thrift.liNT[0] > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest1_n129
 POSTHOOK: query: EXPLAIN
 FROM SRC_THRIFT
 INSERT OVERWRITE TABLE dest1_n129 SELECT src_Thrift.LINT[1], 
src_thrift.lintstring[0].MYSTRING where src_thrift.liNT[0] > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest1_n129
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

Reply via email to