http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
 
b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
index 22305f5..45b6d5a 100644
--- 
a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
+++ 
b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
@@ -109,9 +109,15 @@ totalSize  326
 PREHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -157,6 +163,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -164,6 +172,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -251,9 +261,13 @@ POSTHOOK: Input: default@cmv_basetable_n10
 PREHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view2_n4
+PREHOOK: Output: default@cmv_mat_view2_n4
 POSTHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view2_n4
+POSTHOOK: Output: default@cmv_mat_view2_n4
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -280,6 +294,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -287,6 +304,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -381,6 +401,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -388,6 +410,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### 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/163caed7/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out 
b/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
index ee07e64..1f529c7 100644
--- a/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
+++ b/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select 'a', 100
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 'a', 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -34,9 +38,13 @@ a    100
 PREHOOK: query: explain
 select 1 + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -67,9 +75,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: query: explain
 select explode(array('a', 'b'))
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select explode(array('a', 'b'))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -120,9 +132,13 @@ b
 PREHOOK: query: explain
 select 'a', 100
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 'a', 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -153,9 +169,13 @@ a  100
 PREHOOK: query: explain
 select 1 + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -186,9 +206,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: query: explain
 select explode(array('a', 'b'))
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select explode(array('a', 'b'))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -227,9 +251,13 @@ b
 PREHOOK: query: explain
 select 2 + 3,x from (select 1 + 2 x) X
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 2 + 3,x from (select 1 + 2 x) X
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
index 122b136..6261017 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
@@ -95,9 +95,15 @@ POSTHOOK: Input: default@smb_bucket_1_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -149,9 +155,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -204,9 +216,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -258,9 +276,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -317,9 +341,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -371,9 +401,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -426,9 +462,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -480,9 +522,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### 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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
index 8b48c7f..0a16f2c 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
@@ -60,6 +60,10 @@ on (a.ds = '1' and b.ds = '2' and
     a.postid = b.postid and
     a.type = b.type)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tmp_smb_bucket_10
+PREHOOK: Input: default@tmp_smb_bucket_10@ds=1
+PREHOOK: Input: default@tmp_smb_bucket_10@ds=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from tmp_smb_bucket_10 a join tmp_smb_bucket_10 b 
 on (a.ds = '1' and b.ds = '2' and
@@ -68,6 +72,10 @@ on (a.ds = '1' and b.ds = '2' and
     a.postid = b.postid and
     a.type = b.type)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmp_smb_bucket_10
+POSTHOOK: Input: default@tmp_smb_bucket_10@ds=1
+POSTHOOK: Input: default@tmp_smb_bucket_10@ds=2
+#### 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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
index de02982..297cb0e 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
@@ -43,9 +43,19 @@ POSTHOOK: Output: default@test_table3_n1
 PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n1 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n1 a JOIN test_table2_n1 b ON 
a.key = b.key AND a.ds = '1' AND b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n1
+PREHOOK: Input: default@test_table1_n1@ds=1
+PREHOOK: Input: default@test_table2_n1
+PREHOOK: Input: default@test_table2_n1@ds=1
+PREHOOK: Output: default@test_table3_n1@ds=1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n1 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n1 a JOIN test_table2_n1 b ON 
a.key = b.key AND a.ds = '1' AND b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n1
+POSTHOOK: Input: default@test_table1_n1@ds=1
+POSTHOOK: Input: default@test_table2_n1
+POSTHOOK: Input: default@test_table2_n1@ds=1
+POSTHOOK: Output: default@test_table3_n1@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1881,8 +1891,14 @@ POSTHOOK: Input: default@test_table3_n1@ds=1
 498    val_498 1
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n1
+PREHOOK: Input: default@test_table1_n1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n1
+POSTHOOK: Input: default@test_table1_n1@ds=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1992,8 +2008,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3_n1
+PREHOOK: Input: default@test_table3_n1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3_n1
+POSTHOOK: Input: default@test_table3_n1@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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
index c626c7e..9b4b4ed 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
@@ -55,9 +55,23 @@ POSTHOOK: Output: default@test_table3_n4
 PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n6 a JOIN test_table2_n6 b ON 
a.key = b.key AND a.ds = '1' AND b.ds >= '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n6
+PREHOOK: Input: default@test_table1_n6@ds=1
+PREHOOK: Input: default@test_table2_n6
+PREHOOK: Input: default@test_table2_n6@ds=1
+PREHOOK: Input: default@test_table2_n6@ds=2
+PREHOOK: Input: default@test_table2_n6@ds=3
+PREHOOK: Output: default@test_table3_n4@ds=1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n6 a JOIN test_table2_n6 b ON 
a.key = b.key AND a.ds = '1' AND b.ds >= '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n6
+POSTHOOK: Input: default@test_table1_n6@ds=1
+POSTHOOK: Input: default@test_table2_n6
+POSTHOOK: Input: default@test_table2_n6@ds=1
+POSTHOOK: Input: default@test_table2_n6@ds=2
+POSTHOOK: Input: default@test_table2_n6@ds=3
+POSTHOOK: Output: default@test_table3_n4@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -256,10 +270,20 @@ PREHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3_n4 a 
JOIN test_table1_n6 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n6
+PREHOOK: Input: default@test_table1_n6@ds=1
+PREHOOK: Input: default@test_table3_n4
+PREHOOK: Input: default@test_table3_n4@ds=1
+PREHOOK: Output: default@test_table3_n4@ds=2
 POSTHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3_n4 a 
JOIN test_table1_n6 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n6
+POSTHOOK: Input: default@test_table1_n6@ds=1
+POSTHOOK: Input: default@test_table3_n4
+POSTHOOK: Input: default@test_table3_n4@ds=1
+POSTHOOK: Output: default@test_table3_n4@ds=2
 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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
index 81e34ee..5286beb 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
@@ -63,9 +63,15 @@ POSTHOOK: Lineage: test_table4_n0.value SIMPLE 
[(src)src.FieldSchema(name:value,
 PREHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table1_n12 a JOIN test_table2_n12 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n12
+PREHOOK: Input: default@test_table2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table1_n12 a JOIN test_table2_n12 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n12
+POSTHOOK: Input: default@test_table2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -219,9 +225,15 @@ POSTHOOK: Input: default@test_table2_n12
 PREHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table3_n6 a JOIN test_table4_n0 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3_n6
+PREHOOK: Input: default@test_table4_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table3_n6 a JOIN test_table4_n0 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3_n6
+POSTHOOK: Input: default@test_table4_n0
+#### 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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
index 3fb1769..fd513c3 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
@@ -35,9 +35,15 @@ POSTHOOK: Lineage: test_table2_n9.value SIMPLE 
[(src)src.FieldSchema(name:value,
 PREHOOK: query: EXPLAIN
 SELECT /*+mapjoin(b)*/ count(*) FROM test_table1_n9 a JOIN test_table2_n9 b ON 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n9
+PREHOOK: Input: default@test_table2_n9
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+mapjoin(b)*/ count(*) FROM test_table1_n9 a JOIN test_table2_n9 b ON 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n9
+POSTHOOK: Input: default@test_table2_n9
+#### 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/163caed7/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
index 480b12e..cd09069 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
@@ -49,9 +49,15 @@ POSTHOOK: Output: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -105,9 +111,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -160,9 +172,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -216,9 +234,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -275,9 +299,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -331,9 +361,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -386,9 +422,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -442,9 +484,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### 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/163caed7/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 ba0a2ce..842ee34 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
@@ -105,9 +111,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
@@ -159,9 +171,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
@@ -215,9 +233,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
@@ -273,9 +297,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
@@ -329,9 +359,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
@@ -383,9 +419,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
@@ -439,9 +481,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/163caed7/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 16137dd..cc66ca7 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/163caed7/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/163caed7/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/163caed7/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/163caed7/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/163caed7/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 ed7da20..3a21cd3 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/163caed7/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 fb99ead..df27e81 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/163caed7/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 3377621..5c7d053 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/163caed7/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 6da9934..f9007b5 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`
@@ -561,12 +571,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/163caed7/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 b086c0e..d6a75f4 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`
@@ -545,12 +555,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/163caed7/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 bd91b44..ba153dd 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`
@@ -545,12 +555,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/163caed7/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 5f0cea5..d923870 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`
@@ -437,10 +445,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/163caed7/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 9bb73e6..663e392 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
@@ -383,8 +395,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/163caed7/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 00164dd..486ef56 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
@@ -367,8 +379,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/163caed7/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 71d4b4d..8d6eb27 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
@@ -364,8 +376,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/163caed7/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 fab4558..674b98d 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
@@ -380,8 +392,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/163caed7/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 e14c61b..f859c5f 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
@@ -242,8 +248,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/163caed7/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 d68438e..4acf220 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
@@ -315,8 +325,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/163caed7/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 e9e22bb..7317bb4 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
@@ -450,8 +464,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/163caed7/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 f5a84e6..9c5d352 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
@@ -450,8 +464,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/163caed7/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 4cdd563..40248eb 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/163caed7/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 9013cc1..1a0fccd 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
@@ -478,11 +492,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/163caed7/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 591a667..927600e 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
@@ -337,11 +347,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/163caed7/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 8aa75e7..137a356 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
@@ -352,11 +364,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
@@ -600,11 +622,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
@@ -848,11 +880,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/163caed7/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 a4d5e4e..72bbf80 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
@@ -772,12 +782,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

Reply via email to