http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/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 9fa225c..6170c31 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
@@ -311,11 +321,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/163caed7/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 90bd8f9..753761a 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
@@ -344,11 +354,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/163caed7/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 10c91cd..6854a90 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/163caed7/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 3009c47..c436065 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/163caed7/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 500a516..bd6b45f 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
@@ -297,8 +301,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
@@ -450,8 +458,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
@@ -595,8 +607,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
@@ -740,8 +758,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
@@ -885,8 +909,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
@@ -1030,8 +1060,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
@@ -1175,8 +1211,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
@@ -1320,8 +1362,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/163caed7/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 910ba1f..a410806 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
@@ -148,6 +154,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 
@@ -155,6 +164,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
@@ -259,6 +271,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 
@@ -266,6 +281,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
@@ -319,6 +337,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 
@@ -326,6 +347,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
@@ -436,6 +460,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 
@@ -443,6 +470,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/163caed7/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 6db8bfb..bb7d1dd 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
@@ -148,11 +154,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/163caed7/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 638eaf6..cdf9030 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
@@ -260,12 +270,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/163caed7/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 aa3d451..7fbd930 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
@@ -244,6 +254,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) 
@@ -253,6 +268,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/163caed7/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 1d3a8ad..9fa361c 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
@@ -242,12 +252,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/163caed7/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 6382115..cd16098 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

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cast1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast1.q.out 
b/ql/src/test/results/clientpositive/cast1.q.out
index d349132..5f6e00c 100644
--- a/ql/src/test/results/clientpositive/cast1.q.out
+++ b/ql/src/test/results/clientpositive/cast1.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n151
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n151 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 
+ 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS 
BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n151
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n151 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 
+ 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS 
BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n151
 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/cast_on_constant.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast_on_constant.q.out 
b/ql/src/test/results/clientpositive/cast_on_constant.q.out
index bdb03f7..1541304 100644
--- a/ql/src/test/results/clientpositive/cast_on_constant.q.out
+++ b/ql/src/test/results/clientpositive/cast_on_constant.q.out
@@ -8,8 +8,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1_n138
 PREHOOK: query: explain select * from t1_n138 where ts_field = "2016-01-23 
00:00:00"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where ts_field = "2016-01-23 
00:00:00"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -46,8 +50,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = "2016-01-23"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = "2016-01-23"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -84,8 +92,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where ts_field = timestamp 
'2016-01-23 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where ts_field = timestamp 
'2016-01-23 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -122,8 +134,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = date 
'2016-01-23'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = date 
'2016-01-23'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -160,8 +176,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = ts_field
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = ts_field
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### 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/cbo_SortUnionTransposeRule.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out 
b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
index 6900f62..d454991 100644
--- a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
+++ b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
@@ -16,12 +16,16 @@ union all
 select key from s_n3 b
 order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -81,12 +85,16 @@ union all
 select key from s_n3 b
 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -103,12 +111,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -169,6 +181,8 @@ select key from s_n3 b
 order by key
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
@@ -176,6 +190,8 @@ select key from s_n3 b
 order by key
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -248,6 +264,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from(
 select src1.key, src2.value
@@ -262,6 +280,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -465,12 +485,16 @@ union all
 select key from s_n3 b
 order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -530,12 +554,16 @@ union all
 select key from s_n3 b
 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -552,12 +580,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -676,6 +708,8 @@ select key from s_n3 b
 order by key
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
@@ -683,6 +717,8 @@ select key from s_n3 b
 order by key
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -807,6 +843,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from(
 select src1.key, src2.value
@@ -821,6 +859,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-1 depends on stages: Stage-4
@@ -1082,12 +1122,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1147,12 +1191,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_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/cbo_const.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_const.q.out 
b/ql/src/test/results/clientpositive/cbo_const.q.out
index 302c60d..080eb55 100644
--- a/ql/src/test/results/clientpositive/cbo_const.q.out
+++ b/ql/src/test/results/clientpositive/cbo_const.q.out
@@ -109,8 +109,12 @@ key1       value1  2011-10-15
 key1   value1  2011-10-15
 PREHOOK: query: explain select array(1,2,3) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select array(1,2,3) from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -144,9 +148,13 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 select key from (SELECT key from src where key = 1+3)s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 select key from (SELECT key from src where key = 1+3)s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -220,11 +228,19 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key and y.key = 1+2)
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11+3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key and y.key = 1+2)
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11+3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_input26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_input26.q.out 
b/ql/src/test/results/clientpositive/cbo_input26.q.out
index 9431cd8..bdd63bb 100644
--- a/ql/src/test/results/clientpositive/cbo_input26.q.out
+++ b/ql/src/test/results/clientpositive/cbo_input26.q.out
@@ -5,6 +5,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select * from srcpart a where a.ds = '2008-04-08' and a.hr = 
'11' order by a.key limit 5)pa
@@ -12,6 +15,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -166,6 +172,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.ds, a.key, a.hr from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.key limit 5)pa
@@ -173,6 +182,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -326,6 +338,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.ds, a.key, a.hr from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.hr,a.key limit 5)pa
@@ -333,6 +348,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -486,6 +504,9 @@ select * from (
   select * from (select b.key, b.ds, b.value from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.key, a.ds, a.value from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.ds limit 5)pa
@@ -493,6 +514,9 @@ select * from (
   select * from (select b.key, b.ds, b.value from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out 
b/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
index bdcd208..5cd0356 100644
--- a/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
+++ b/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
@@ -99,11 +99,17 @@ select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testa
+PREHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (
 select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testa
+POSTHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -149,11 +155,17 @@ select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testa
+PREHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (
 select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testa
+POSTHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### 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/cbo_rp_annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
index 3af4b85..9136967 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
@@ -54,8 +54,12 @@ POSTHOOK: Lineage: loc_orc_n1.year SIMPLE 
[(loc_staging_n1)loc_staging_n1.FieldS
 POSTHOOK: Lineage: loc_orc_n1.zip SIMPLE 
[(loc_staging_n1)loc_staging_n1.FieldSchema(name:zip, type:bigint, 
comment:null), ]
 PREHOOK: query: explain select * from loc_orc_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -90,6 +94,8 @@ from ( select state as a, locid as b, count(*) as c
      ) sq1
 group by a,c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, c, min(b)
 from ( select state as a, locid as b, count(*) as c
        from loc_orc_n1
@@ -97,6 +103,8 @@ from ( select state as a, locid as b, count(*) as c
      ) sq1
 group by a,c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -190,8 +198,12 @@ POSTHOOK: Output: default@loc_orc_n1
 #### A masked pattern was here ####
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -240,8 +252,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by state,locid
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -290,8 +306,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -340,8 +360,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -390,8 +414,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -440,8 +468,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -490,8 +522,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -540,8 +576,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -590,8 +630,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -640,8 +684,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -690,8 +738,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -740,8 +792,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,zip from loc_orc_n1 group by state,zip
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,zip from loc_orc_n1 group by state,zip
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -790,8 +846,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -840,8 +900,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -890,8 +954,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -940,8 +1008,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -990,8 +1062,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1040,8 +1116,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1090,8 +1170,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1140,8 +1224,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1190,8 +1278,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_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/cbo_rp_auto_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
index 5d3fd9f..7e47728 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
@@ -10,6 +10,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -21,6 +23,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5
@@ -125,6 +129,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -136,6 +142,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
index c0b6707..5341f86 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
@@ -79,11 +79,17 @@ select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1_n13 a join 
tbl2_n12 b on a.key = b.key
 ) subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1_n13 a join 
tbl2_n12 b on a.key = b.key
 ) subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -226,6 +232,9 @@ select count(*) from
   group by key
 ) subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from
 (
@@ -236,6 +245,9 @@ select count(*) from
   group by key
 ) subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -377,6 +389,9 @@ join
 ) src2
 on src1.key = src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -394,6 +409,9 @@ join
 ) src2
 on src1.key = src2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -617,6 +635,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
@@ -624,6 +645,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -706,6 +730,9 @@ select count(*) from
   join tbl2_n12 b
   on subq2.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -718,6 +745,9 @@ select count(*) from
   join tbl2_n12 b
   on subq2.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -817,6 +847,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -836,6 +868,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -935,6 +969,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2_n12 a 
where key < 8) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, concat(a.value, a.value) as value from tbl1_n13 a 
where key < 8) subq1 
@@ -942,6 +979,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2_n12 a 
where key < 8) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1019,6 +1059,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2_n12 a) 
subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl1_n13 a) 
subq1 
@@ -1026,6 +1069,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2_n12 a) 
subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-4
@@ -1211,11 +1257,17 @@ select count(*) from
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
     join tbl2_n12 a on subq1.key = a.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
     join tbl2_n12 a on subq1.key = a.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1292,6 +1344,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq3
   on (subq1.key = subq3.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
@@ -1302,6 +1357,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq3
   on (subq1.key = subq3.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1393,6 +1451,9 @@ select count(*) from (
 join tbl2_n12 b
 on subq2.key = b.key) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select subq2.key as key, subq2.value as value1, b.value as value2 from
@@ -1406,6 +1467,9 @@ select count(*) from (
 join tbl2_n12 b
 on subq2.key = b.key) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1490,8 +1554,14 @@ POSTHOOK: Input: default@tbl2_n12
 20
 PREHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1568,8 +1638,14 @@ POSTHOOK: Input: default@tbl2_n12
 9      val_9   val_9
 PREHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### 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/cbo_rp_auto_join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
index 74022ae..74b29e5 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n112 SELECT src1.*, src2.*
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n112
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n112 SELECT src1.*, src2.*
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n112
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
index cbb1d05..a960b06 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n14.value SIMPLE 
[(src)src.FieldSchema(name:value, type:str
 Warning: Map Join MAPJOIN[8][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n18 join B_n14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join B_n14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4
@@ -97,8 +103,14 @@ STAGE PLANS:
 Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from B_n14 d1 join B_n14 d2 on d1.key = 
d2.key join A_n18
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n14 d1 join B_n14 d2 on d1.key = 
d2.key join A_n18
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -197,11 +209,17 @@ PREHOOK: query: explain select * from A_n18 join
           from B_n14 d1 join B_n14 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join 
          (select d1.key 
           from B_n14 d1 join B_n14 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -339,8 +357,14 @@ Warning: Map Join MAPJOIN[21][bigTable=?] in task 
'Stage-5:MAPRED' is a cross pr
 Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n18 join (select d1.key from B_n14 d1 
join B_n14 d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join (select d1.key from B_n14 d1 
join B_n14 d2 where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -471,10 +495,16 @@ PREHOOK: query: explain select * from
 (select A_n18.key from A_n18 group by key) ss join 
 (select d1.key from B_n14 d1 join B_n14 d2 on d1.key = d2.key where 1 = 1 
group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n18.key from A_n18 group by key) ss join 
 (select d1.key from B_n14 d1 join B_n14 d2 on d1.key = d2.key where 1 = 1 
group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1, Stage-4 , consists of Stage-10, 
Stage-11, Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
index 3fb7f4a..58bb2a7 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
@@ -12,12 +12,16 @@ INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n166
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n166
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -170,12 +174,16 @@ INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n166
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n166
 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/cbo_rp_groupby3_noskew_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
 
b/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
index 34cf06e..7d0a2a0 100644
--- 
a/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
+++ 
b/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
@@ -21,6 +21,8 @@ INSERT OVERWRITE TABLE dest1_n123 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n123
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n123 SELECT
@@ -36,6 +38,8 @@ INSERT OVERWRITE TABLE dest1_n123 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n123
 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/cbo_rp_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
index f8709d3..76eaa52 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
@@ -2,10 +2,22 @@ PREHOOK: query: explain select key, cbo_t1.c_int, cbo_t2.p, q 
from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select key as a, c_int as b, cbo_t3.c_float as c from cbo_t3) cbo_t3 on 
cbo_t1.key=a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, cbo_t1.c_int, cbo_t2.p, q from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select key as a, c_int as b, cbo_t3.c_float as c from cbo_t3) cbo_t3 on 
cbo_t1.key=a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -650,11 +662,23 @@ PREHOOK: query: explain select key, c_int, cbo_t2.p, 
cbo_t2.q, cbo_t3.x, cbo_t4.
 (select cbo_t3.key as x, cbo_t3.c_int as y, c_float as z from cbo_t3) cbo_t3 
on cbo_t1.key=x left outer join
 (select key as a, c_int as b, c_float as c from cbo_t1) cbo_t4 on cbo_t1.key=a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, c_int, cbo_t2.p, cbo_t2.q, cbo_t3.x, 
cbo_t4.b from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select cbo_t3.key as x, cbo_t3.c_int as y, c_float as z from cbo_t3) cbo_t3 
on cbo_t1.key=x left outer join
 (select key as a, c_int as b, c_float as c from cbo_t1) cbo_t4 on cbo_t1.key=a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+POSTHOOK: Input: default@cbo_t3
+#### 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/cbo_rp_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
index 38cb34d..f24f0ad 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
@@ -17,8 +17,12 @@ POSTHOOK: Output: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -120,8 +124,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.value = 40 AND 
a.key = a.value AND b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.value = 40 AND 
a.key = a.value AND b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -223,8 +231,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.key = b.key AND 
b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.key = b.key AND 
b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -326,8 +338,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key > 40 AND a.value > 50 AND 
a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key > 40 AND a.value > 50 AND 
a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
index cfc2dfc..59712b0 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
@@ -7,6 +7,11 @@ PREHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
  FROM 
   src a
@@ -16,6 +21,11 @@ POSTHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -311,6 +321,11 @@ PREHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 AND b.ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
  FROM 
   src a
@@ -320,6 +335,11 @@ POSTHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 AND b.ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to