http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/count_dist_rewrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/count_dist_rewrite.q.out 
b/ql/src/test/results/clientpositive/count_dist_rewrite.q.out
index 68f4c5d..31e0d9e 100644
--- a/ql/src/test/results/clientpositive/count_dist_rewrite.q.out
+++ b/ql/src/test/results/clientpositive/count_dist_rewrite.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select count(distinct key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(distinct key) from src
 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
@@ -87,8 +91,12 @@ POSTHOOK: Input: default@src
 309
 PREHOOK: query: explain select max(key), count(distinct key) B1_CNTD from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key) B1_CNTD from src
 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
@@ -177,8 +185,12 @@ POSTHOOK: Input: default@src
 98     309
 PREHOOK: query: explain select max(key), count(distinct key), min(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(key) from 
src
 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
@@ -267,8 +279,12 @@ POSTHOOK: Input: default@src
 98     309     0
 PREHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src
 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
@@ -360,8 +376,12 @@ POSTHOOK: Input: default@src
 98     309     0       260.182
 PREHOOK: query: explain select count(1), count(distinct key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(distinct key) from src
 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
@@ -456,6 +476,8 @@ PREHOOK: query: explain select
   max(key) as max_ss_promo_sk
 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 
   count(*) as total,
   count(key) as not_null_total,
@@ -464,6 +486,8 @@ POSTHOOK: query: explain select
   max(key) as max_ss_promo_sk
 from src
 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
@@ -564,8 +588,12 @@ POSTHOOK: Input: default@src
 500    500     309     val_98  98
 PREHOOK: query: explain select count(1), count(distinct key), cast(STDDEV(key) 
as int) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(distinct key), 
cast(STDDEV(key) as int) from src
 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
@@ -676,6 +704,8 @@ PREHOOK: query: explain SELECT
   cast(variance(substr(src.value,5)) as int),
   cast(var_samp(substr(src.value,5)) as int)  from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT
   sum(substr(src.value,5)),
   avg(substr(src.value,5)),
@@ -687,6 +717,8 @@ POSTHOOK: query: explain SELECT
   cast(variance(substr(src.value,5)) as int),
   cast(var_samp(substr(src.value,5)) as int)  from src
 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
@@ -796,8 +828,12 @@ POSTHOOK: Input: default@src
 130091.0       260.182 309     98      0       142     143     20428   20469
 PREHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src group by value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src group by value
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cp_sel.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cp_sel.q.out 
b/ql/src/test/results/clientpositive/cp_sel.q.out
index dfb1f3d..a043a5d 100644
--- a/ql/src/test/results/clientpositive/cp_sel.q.out
+++ b/ql/src/test/results/clientpositive/cp_sel.q.out
@@ -1,9 +1,17 @@
 PREHOOK: query: explain
 select key,value,'hello' as ds, 'world' as hr from srcpart where hr=11 order 
by 1 limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key,value,'hello' as ds, 'world' as hr from srcpart where hr=11 order 
by 1 limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -76,9 +84,16 @@ POSTHOOK: Output: default@testpartbucket
 PREHOOK: query: explain
 insert overwrite table testpartbucket partition(ds,hr) select 
key,value,'hello' as ds, 'world' as hr from srcpart where hr=11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Output: default@testpartbucket
 POSTHOOK: query: explain
 insert overwrite table testpartbucket partition(ds,hr) select 
key,value,'hello' as ds, 'world' as hr from srcpart where hr=11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_genericudaf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_genericudaf.q.out 
b/ql/src/test/results/clientpositive/create_genericudaf.q.out
index dd2ce7f..3fa8cc0 100644
--- a/ql/src/test/results/clientpositive/create_genericudaf.q.out
+++ b/ql/src/test/results/clientpositive/create_genericudaf.q.out
@@ -1,9 +1,11 @@
 PREHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_avg AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage'
 PREHOOK: type: CREATEFUNCTION
+PREHOOK: Output: test_avg
 POSTHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_avg AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage'
 POSTHOOK: type: CREATEFUNCTION
+POSTHOOK: Output: test_avg
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -22,12 +24,16 @@ SELECT
     test_avg(substr(value,5))
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT
     test_avg(1),
     test_avg(substr(value,5))
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_genericudf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_genericudf.q.out 
b/ql/src/test/results/clientpositive/create_genericudf.q.out
index 7af111d..cfe14f5 100644
--- a/ql/src/test/results/clientpositive/create_genericudf.q.out
+++ b/ql/src/test/results/clientpositive/create_genericudf.q.out
@@ -1,9 +1,11 @@
 PREHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 PREHOOK: type: CREATEFUNCTION
+PREHOOK: Output: test_translate
 POSTHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 POSTHOOK: type: CREATEFUNCTION
+POSTHOOK: Output: test_translate
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_udaf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_udaf.q.out 
b/ql/src/test/results/clientpositive/create_udaf.q.out
index d097020..8e20b30 100644
--- a/ql/src/test/results/clientpositive/create_udaf.q.out
+++ b/ql/src/test/results/clientpositive/create_udaf.q.out
@@ -1,9 +1,11 @@
 PREHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 PREHOOK: type: CREATEFUNCTION
+PREHOOK: Output: test_max
 POSTHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 POSTHOOK: type: CREATEFUNCTION
+POSTHOOK: Output: test_max
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_union_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_union_table.q.out 
b/ql/src/test/results/clientpositive/create_union_table.q.out
index f2aedd1..f773f34 100644
--- a/ql/src/test/results/clientpositive/create_union_table.q.out
+++ b/ql/src/test/results/clientpositive/create_union_table.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain create table abc(mydata 
uniontype<int,double,array<string>,struct<a:int,b:string>>,
 strct struct<a:int, b:string, c:string>)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@abc
 POSTHOOK: query: explain create table abc(mydata 
uniontype<int,double,array<string>,struct<a:int,b:string>>,
 strct struct<a:int, b:string, c:string>)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@abc
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out 
b/ql/src/test/results/clientpositive/create_view.q.out
index edd9b70..84507da 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -158,9 +158,15 @@ VAL_86
 PREHOOK: query: EXPLAIN
 CREATE VIEW view0(valoo) AS SELECT upper(value) FROM src WHERE key=86
 PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@view0
 POSTHOOK: query: EXPLAIN
 CREATE VIEW view0(valoo) AS SELECT upper(value) FROM src WHERE key=86
 POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@view0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
 
@@ -176,9 +182,15 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 SELECT * from view2 where key=18
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@view2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * from view2 where key=18
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@view2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/create_view_translate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out 
b/ql/src/test/results/clientpositive/create_view_translate.q.out
index 7a9863f..34ffb33 100644
--- a/ql/src/test/results/clientpositive/create_view_translate.q.out
+++ b/ql/src/test/results/clientpositive/create_view_translate.q.out
@@ -125,9 +125,15 @@ POSTHOOK: Output: default@items
 PREHOOK: query: explain
 CREATE VIEW priceview AS SELECT items.id, items.info['price'] FROM items
 PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@items
+PREHOOK: Output: database:default
+PREHOOK: Output: default@priceview
 POSTHOOK: query: explain
 CREATE VIEW priceview AS SELECT items.id, items.info['price'] FROM items
 POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@items
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@priceview
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_join.q.out 
b/ql/src/test/results/clientpositive/cross_join.q.out
index 40fb2e1..02c9675 100644
--- a/ql/src/test/results/clientpositive/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/cross_join.q.out
@@ -1,8 +1,12 @@
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src join src src2
 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
@@ -56,8 +60,12 @@ STAGE PLANS:
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2
 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
@@ -110,8 +118,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 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
@@ -176,8 +188,12 @@ STAGE PLANS:
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src join src src2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4
@@ -240,8 +256,12 @@ STAGE PLANS:
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4
@@ -303,8 +323,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cross_join_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_join_merge.q.out 
b/ql/src/test/results/clientpositive/cross_join_merge.q.out
index 3389638..d934d36 100644
--- a/ql/src/test/results/clientpositive/cross_join_merge.q.out
+++ b/ql/src/test/results/clientpositive/cross_join_merge.q.out
@@ -2,9 +2,13 @@ Warning: Shuffle Join JOIN[9][tables = [$hdt$_0, $hdt$_1, 
$hdt$_2]] in Stage 'St
 PREHOOK: query: explain
 select src1.key from src src1 join src src2 join src src3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 join src src2 join src src3
 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
@@ -68,9 +72,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select src1.key from src src1 join src src2 on src1.key=src2.key join src src3 
on src1.key=src3.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 join src src2 on src1.key=src2.key join src src3 
on src1.key=src3.key
 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
@@ -152,9 +160,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select src1.key from src src1 join src src2 join src src3 where 
src1.key=src2.key and src1.key=src3.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 join src src2 join src src3 where 
src1.key=src2.key and src1.key=src3.key
 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
@@ -237,9 +249,13 @@ Warning: Shuffle Join JOIN[14][tables = [$hdt$_0, $hdt$_1, 
$hdt$_2]] in Stage 'S
 PREHOOK: query: explain
 select src1.key from src src1 join src src2 on 5 = src2.key join src src3 on 
src1.key=src3.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 join src src2 on 5 = src2.key join src src3 on 
src1.key=src3.key
 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
@@ -342,9 +358,13 @@ Warning: Shuffle Join JOIN[8][tables = [$hdt$_0, $hdt$_1]] 
in Stage 'Stage-1:MAP
 PREHOOK: query: explain
 select src1.key from src src1 left outer join src src2 join src src3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 left outer join src src2 join src src3
 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
@@ -431,9 +451,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select src1.key from src src1 left outer join src src2 on src1.key=src2.key 
join src src3 on src1.key=src3.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key from src src1 left outer join src src2 on src1.key=src2.key 
join src src3 on src1.key=src3.key
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_product_check_1.q.out 
b/ql/src/test/results/clientpositive/cross_product_check_1.q.out
index 7fbcbe4..ae14fc6 100644
--- a/ql/src/test/results/clientpositive/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/cross_product_check_1.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n6.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from A_n8 join B_n6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join B_n6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -89,8 +95,14 @@ STAGE PLANS:
 Warning: Shuffle Join JOIN[13][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 
'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key 
join A_n8
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key 
join A_n8
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -196,11 +208,17 @@ PREHOOK: query: explain select * from A_n8 join
           from B_n6 d1 join B_n6 d2 on d1.key = d2.key
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join 
          (select d1.key 
           from B_n6 d1 join B_n6 d2 on d1.key = d2.key
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -331,8 +349,14 @@ Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, 
$hdt$_1]] in Stage 'Stage-1:MA
 Warning: Shuffle Join JOIN[8][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select * from A_n8 join (select d1.key from B_n6 d1 
join B_n6 d2 where 1 = 1  group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join (select d1.key from B_n6 d1 
join B_n6 d2 where 1 = 1  group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -453,10 +477,16 @@ PREHOOK: query: explain select * from
 (select A_n8.key from A_n8  group by key) ss join
 (select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n8.key from A_n8  group by key) ss join
 (select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/cross_product_check_2.q.out
index 6143431..b847d7c 100644
--- a/ql/src/test/results/clientpositive/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cross_product_check_2.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n2.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n2 join B_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join B_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### 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[20][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
join A_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
join A_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -195,11 +207,17 @@ PREHOOK: query: explain select * from A_n2 join
           from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join 
          (select d1.key 
           from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -331,8 +349,14 @@ Warning: Map Join MAPJOIN[23][bigTable=?] in task 
'Stage-5:MAPRED' is a cross pr
 Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n2 join (select d1.key from B_n2 d1 
join B_n2 d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join (select d1.key from B_n2 d1 
join B_n2 d2 where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -459,10 +483,16 @@ PREHOOK: query: explain select * from
 (select A_n2.key from A_n2 group by key) ss join 
 (select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n2.key from A_n2 group by key) ss join 
 (select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### 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/b356aae0/ql/src/test/results/clientpositive/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas.q.out 
b/ql/src/test/results/clientpositive/ctas.q.out
index 5f1a379..f414c68 100644
--- a/ql/src/test/results/clientpositive/ctas.q.out
+++ b/ql/src/test/results/clientpositive/ctas.q.out
@@ -16,8 +16,14 @@ POSTHOOK: Input: default@nzhang_tmp
 #### A masked pattern was here ####
 PREHOOK: query: explain create table nzhang_CTAS1 as select key k, value from 
src sort by k, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_CTAS1
 POSTHOOK: query: explain create table nzhang_CTAS1 as select key k, value from 
src sort by k, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_CTAS1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -170,8 +176,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas2 as select * from src sort by 
key, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas2
 POSTHOOK: query: explain create table nzhang_ctas2 as select * from src sort 
by key, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -324,8 +336,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas3 row format serde 
"org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as RCFile as 
select key/2 half_key, concat(value, "_con") conb  from src sort by half_key, 
conb limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas3
 POSTHOOK: query: explain create table nzhang_ctas3 row format serde 
"org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as RCFile as 
select key/2 half_key, concat(value, "_con") conb  from src sort by half_key, 
conb limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas3
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -542,8 +560,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas4 row format delimited fields 
terminated by ',' stored as textfile as select key, value from src sort by key, 
value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas4
 POSTHOOK: query: explain create table nzhang_ctas4 row format delimited fields 
terminated by ',' stored as textfile as select key, value from src sort by key, 
value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas4
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -698,8 +722,14 @@ Storage Desc Params:
        serialization.format    ,                   
 PREHOOK: query: explain create table nzhang_ctas5 row format delimited fields 
terminated by ',' lines terminated by '\012' stored as textfile as select key, 
value from src sort by key, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas5
 POSTHOOK: query: explain create table nzhang_ctas5 row format delimited fields 
terminated by ',' lines terminated by '\012' stored as textfile as select key, 
value from src sort by key, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas5
 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/b356aae0/ql/src/test/results/clientpositive/ctas_colname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out 
b/ql/src/test/results/clientpositive/ctas_colname.q.out
index 05e3f76..86a179d 100644
--- a/ql/src/test/results/clientpositive/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/ctas_colname.q.out
@@ -1,9 +1,15 @@
 PREHOOK: query: explain
 create table summary as select *, key + 1, concat(value, value) from src limit 
20
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@summary
 POSTHOOK: query: explain
 create table summary as select *, key + 1, concat(value, value) from src limit 
20
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@summary
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -148,9 +154,15 @@ POSTHOOK: Input: default@summary
 PREHOOK: query: explain
 create table x4 as select *, rank() over(partition by key order by value) as 
rr from src1
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x4
 POSTHOOK: query: explain
 create table x4 as select *, rank() over(partition by key order by value) as 
rr from src1
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x4
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -313,9 +325,15 @@ POSTHOOK: Input: default@x4
 PREHOOK: query: explain
 create table x5 as select *, lead(key,1) over(partition by key order by value) 
as lead1 from src limit 20
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x5
 POSTHOOK: query: explain
 create table x5 as select *, lead(key,1) over(partition by key order by value) 
as lead1 from src limit 20
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x5
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -502,9 +520,15 @@ POSTHOOK: Input: default@x5
 PREHOOK: query: explain
 create table x6 as select * from (select *, key + 1 from src1) a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x6
 POSTHOOK: query: explain
 create table x6 as select * from (select *, key + 1 from src1) a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -680,9 +704,15 @@ POSTHOOK: Input: default@x6
 PREHOOK: query: explain
 create table x7 as select * from (select *, count(value) from src group by 
key, value) a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x7
 POSTHOOK: query: explain
 create table x7 as select * from (select *, count(value) from src group by 
key, value) a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x7
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1117,9 +1147,15 @@ POSTHOOK: Input: default@x7
 PREHOOK: query: explain
 create table x8 as select * from (select *, count(value) from src group by 
key, value having key < 9) a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x8
 POSTHOOK: query: explain
 create table x8 as select * from (select *, count(value) from src group by 
key, value having key < 9) a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x8
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1249,9 +1285,15 @@ POSTHOOK: Input: default@x8
 PREHOOK: query: explain
 create table x9 as select * from (select max(value),key from src group by key 
having key < 9 AND max(value) IS NOT NULL) a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@x9
 POSTHOOK: query: explain
 create table x9 as select * from (select max(value),key from src group by key 
having key < 9 AND max(value) IS NOT NULL) a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@x9
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out 
b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
index 68bc015..8cf7fe1 100644
--- a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
+++ b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
@@ -16,8 +16,14 @@ POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:db1
 PREHOOK: query: EXPLAIN CREATE TABLE table_db1 AS SELECT * FROM default.src
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@table_db1
 POSTHOOK: query: EXPLAIN CREATE TABLE table_db1 AS SELECT * FROM default.src
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@table_db1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_1.q.out 
b/ql/src/test/results/clientpositive/cte_1.q.out
index ecace0f..b4e433c 100644
--- a/ql/src/test/results/clientpositive/cte_1.q.out
+++ b/ql/src/test/results/clientpositive/cte_1.q.out
@@ -3,11 +3,15 @@ with q1 as ( select key from src where key = '5')
 select *
 from q1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select *
 from q1
 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
@@ -60,10 +64,14 @@ PREHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 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
@@ -115,11 +123,15 @@ with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_3.q.out 
b/ql/src/test/results/clientpositive/cte_3.q.out
index 9f5e0aa..3ee87ee 100644
--- a/ql/src/test/results/clientpositive/cte_3.q.out
+++ b/ql/src/test/results/clientpositive/cte_3.q.out
@@ -3,11 +3,15 @@ with q1 as ( select key from src where key = '5')
 select *
 from q1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select *
 from q1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4
@@ -125,10 +129,14 @@ PREHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4
@@ -245,11 +253,15 @@ with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_5.q.out 
b/ql/src/test/results/clientpositive/cte_5.q.out
index 885aa0e..c129e13 100644
--- a/ql/src/test/results/clientpositive/cte_5.q.out
+++ b/ql/src/test/results/clientpositive/cte_5.q.out
@@ -70,12 +70,18 @@ select a.colnum
 from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: mydb@q1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1_n0 as (select * from src where key= '5')
 select a.colnum
 from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: mydb@q1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_6.q.out 
b/ql/src/test/results/clientpositive/cte_6.q.out
index 629b8ba..689916f 100644
--- a/ql/src/test/results/clientpositive/cte_6.q.out
+++ b/ql/src/test/results/clientpositive/cte_6.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: explain
 with Q1 as ( select key from sRc where key = '5')
 select CPS.key from Q1 CPS
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with Q1 as ( select key from sRc where key = '5')
 select CPS.key from Q1 CPS
 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
@@ -44,11 +48,15 @@ with Q1 as ( select key from q2 where key = '5'),
 Q2 as ( select key from sRc where key = '5')
 select CPS.key from Q1 CPS
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with Q1 as ( select key from q2 where key = '5'),
 Q2 as ( select key from sRc where key = '5')
 select CPS.key from Q1 CPS
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_mat_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_1.q.out 
b/ql/src/test/results/clientpositive/cte_mat_1.q.out
index 6ac57fd..4071acf 100644
--- a/ql/src/test/results/clientpositive/cte_mat_1.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_1.q.out
@@ -5,12 +5,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_mat_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_2.q.out 
b/ql/src/test/results/clientpositive/cte_mat_2.q.out
index 6ac57fd..4071acf 100644
--- a/ql/src/test/results/clientpositive/cte_mat_2.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_2.q.out
@@ -5,12 +5,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_mat_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_3.q.out 
b/ql/src/test/results/clientpositive/cte_mat_3.q.out
index a075a95..70c97a8 100644
--- a/ql/src/test/results/clientpositive/cte_mat_3.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_3.q.out
@@ -4,12 +4,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_mat_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_4.q.out 
b/ql/src/test/results/clientpositive/cte_mat_4.q.out
index a121a97..7bf3ea8 100644
--- a/ql/src/test/results/clientpositive/cte_mat_4.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_4.q.out
@@ -45,12 +45,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4
@@ -284,12 +288,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cte_mat_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_5.q.out 
b/ql/src/test/results/clientpositive/cte_mat_5.q.out
index 4fcfa55..f1db99b 100644
--- a/ql/src/test/results/clientpositive/cte_mat_5.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_5.q.out
@@ -69,12 +69,18 @@ select a.colnum
 from mydb.q1 as a join q1 as b
 on a.colnum=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+PREHOOK: Input: mydb@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.colnum
 from mydb.q1 as a join q1 as b
 on a.colnum=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+POSTHOOK: Input: mydb@q1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/decimal_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_join2.q.out 
b/ql/src/test/results/clientpositive/decimal_join2.q.out
index ce45274..8fc4faf 100644
--- a/ql/src/test/results/clientpositive/decimal_join2.q.out
+++ b/ql/src/test/results/clientpositive/decimal_join2.q.out
@@ -43,9 +43,13 @@ POSTHOOK: Lineage: decimal_3_n0.value SIMPLE 
[(decimal_3_txt)decimal_3_txt.Field
 PREHOOK: query: EXPLAIN
 SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -207,9 +211,13 @@ POSTHOOK: Input: default@decimal_3_n0
 PREHOOK: query: EXPLAIN
 SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_3_n0
+#### 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/b356aae0/ql/src/test/results/clientpositive/decimal_precision.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_precision.q.out 
b/ql/src/test/results/clientpositive/decimal_precision.q.out
index fb59c4f..e5393ae 100644
--- a/ql/src/test/results/clientpositive/decimal_precision.q.out
+++ b/ql/src/test/results/clientpositive/decimal_precision.q.out
@@ -524,8 +524,12 @@ NULL       NULL
 NULL   NULL
 PREHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_precision_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM 
DECIMAL_PRECISION_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_precision_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/decimal_precision2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_precision2.q.out 
b/ql/src/test/results/clientpositive/decimal_precision2.q.out
index 3185c38..3ec620c 100644
--- a/ql/src/test/results/clientpositive/decimal_precision2.q.out
+++ b/ql/src/test/results/clientpositive/decimal_precision2.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select 100.001BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 100.001BD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -22,8 +26,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 100.000BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 100.000BD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -44,8 +52,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 0.000BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 0.000BD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -66,8 +78,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 0.100BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 0.100BD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -88,8 +104,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 0.010BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 0.010BD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -110,8 +130,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast(0.010 as decimal(6,3))
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast(0.010 as decimal(6,3))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -132,8 +156,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 0.09765625BD * 0.09765625BD * 0.0125BD * 
578992BD
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 0.09765625BD * 0.09765625BD * 0.0125BD * 
578992BD
 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/b356aae0/ql/src/test/results/clientpositive/decimal_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_stats.q.out 
b/ql/src/test/results/clientpositive/decimal_stats.q.out
index de3b66d..27abe6e 100644
--- a/ql/src/test/results/clientpositive/decimal_stats.q.out
+++ b/ql/src/test/results/clientpositive/decimal_stats.q.out
@@ -63,8 +63,12 @@ comment              from deserializer
 COLUMN_STATS_ACCURATE  
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"t\":\"true\",\"u\":\"true\",\"v\":\"true\"}}
                                                                               
 PREHOOK: query: explain select * from decimal_1_n1 order by t limit 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from decimal_1_n1 order by t limit 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_1_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/b356aae0/ql/src/test/results/clientpositive/decimal_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_udf.q.out 
b/ql/src/test/results/clientpositive/decimal_udf.q.out
index 044fede..85adf73 100644
--- a/ql/src/test/results/clientpositive/decimal_udf.q.out
+++ b/ql/src/test/results/clientpositive/decimal_udf.q.out
@@ -26,8 +26,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@decimal_udf
 PREHOOK: query: EXPLAIN SELECT key + key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key + key FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -93,8 +97,12 @@ NULL
 2469135780.2469135600
 PREHOOK: query: EXPLAIN SELECT key + value FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key + value FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -160,8 +168,12 @@ NULL
 2469135780.1234567800
 PREHOOK: query: EXPLAIN SELECT key + (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key + (value/2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -227,8 +239,12 @@ NULL
 1.8518518351234567E9
 PREHOOK: query: EXPLAIN SELECT key + '1.0' FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key + '1.0' FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -294,8 +310,12 @@ NULL
 1.2345678911234567E9
 PREHOOK: query: EXPLAIN SELECT key - key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key - key FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -361,8 +381,12 @@ NULL
 0.0000000000
 PREHOOK: query: EXPLAIN SELECT key - value FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key - value FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -428,8 +452,12 @@ NULL
 0.1234567800
 PREHOOK: query: EXPLAIN SELECT key - (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key - (value/2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -495,8 +523,12 @@ NULL
 6.172839451234567E8
 PREHOOK: query: EXPLAIN SELECT key - '1.0' FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key - '1.0' FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -562,8 +594,12 @@ NULL
 1.2345678891234567E9
 PREHOOK: query: EXPLAIN SELECT key * key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key * key FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -629,8 +665,12 @@ NULL
 1524157875323883652.79682997652796840
 PREHOOK: query: EXPLAIN SELECT key, value FROM DECIMAL_UDF where key * value > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, value FROM DECIMAL_UDF where key * value 
> 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -684,8 +724,12 @@ POSTHOOK: Input: default@decimal_udf
 1234567890.1234567800  1234567890
 PREHOOK: query: EXPLAIN SELECT key * value FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key * value FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -751,8 +795,12 @@ NULL
 1524157875171467876.3907942000
 PREHOOK: query: EXPLAIN SELECT key * (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key * (value/2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -818,8 +866,12 @@ NULL
 7.6207893758573389E17
 PREHOOK: query: EXPLAIN SELECT key * '2.0' FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key * '2.0' FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -885,8 +937,12 @@ NULL
 2.4691357802469134E9
 PREHOOK: query: EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -918,8 +974,12 @@ POSTHOOK: Input: default@decimal_udf
 NULL
 PREHOOK: query: EXPLAIN SELECT key / NULL FROM DECIMAL_UDF limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key / NULL FROM DECIMAL_UDF limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -951,8 +1011,12 @@ POSTHOOK: Input: default@decimal_udf
 NULL
 PREHOOK: query: EXPLAIN SELECT key / key FROM DECIMAL_UDF WHERE key is not 
null and key <> 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key / key FROM DECIMAL_UDF WHERE key is not 
null and key <> 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1017,8 +1081,12 @@ POSTHOOK: Input: default@decimal_udf
 1.000000000000000000
 PREHOOK: query: EXPLAIN SELECT key / value FROM DECIMAL_UDF WHERE value is not 
null and value <> 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key / value FROM DECIMAL_UDF WHERE value is 
not null and value <> 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1073,8 +1141,12 @@ POSTHOOK: Input: default@decimal_udf
 1.000000000099999992710
 PREHOOK: query: EXPLAIN SELECT key / (value/2) FROM DECIMAL_UDF  WHERE value 
is not null and value <> 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key / (value/2) FROM DECIMAL_UDF  WHERE value 
is not null and value <> 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1129,8 +1201,12 @@ POSTHOOK: Input: default@decimal_udf
 2.0000000002
 PREHOOK: query: EXPLAIN SELECT 1 + (key / '2.0') FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT 1 + (key / '2.0') FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1196,8 +1272,12 @@ NULL
 6.172839460617284E8
 PREHOOK: query: EXPLAIN SELECT abs(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT abs(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1263,8 +1343,12 @@ NULL
 1234567890.1234567800
 PREHOOK: query: EXPLAIN SELECT value, sum(key) / count(key), avg(key), 
sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, sum(key) / count(key), avg(key), 
sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1368,8 +1452,12 @@ POSTHOOK: Input: default@decimal_udf
 1234567890     1234567890.123456780000000000   
1234567890.1234567800000000000000000000 1234567890.1234567800
 PREHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1435,8 +1523,12 @@ NULL
 -1234567890.1234567800
 PREHOOK: query: EXPLAIN SELECT +key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT +key FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1502,8 +1594,12 @@ NULL
 1234567890.1234567800
 PREHOOK: query: EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1569,8 +1665,12 @@ NULL
 1234567891
 PREHOOK: query: EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1636,8 +1736,12 @@ NULL
 1234567890
 PREHOOK: query: EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1703,8 +1807,12 @@ NULL
 1234567890.12
 PREHOOK: query: EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1770,8 +1878,12 @@ NULL
 1.52415787532388352E18
 PREHOOK: query: EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1837,8 +1949,12 @@ NULL
 1.000000000000
 PREHOOK: query: EXPLAIN SELECT value, stddev(key), variance(key) FROM 
DECIMAL_UDF GROUP BY value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, stddev(key), variance(key) FROM 
DECIMAL_UDF GROUP BY value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1919,8 +2035,12 @@ POSTHOOK: Input: default@decimal_udf
 1234567890     0.0     0.0
 PREHOOK: query: EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM 
DECIMAL_UDF GROUP BY value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM 
DECIMAL_UDF GROUP BY value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2001,8 +2121,12 @@ POSTHOOK: Input: default@decimal_udf
 1234567890     NULL    NULL
 PREHOOK: query: EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2058,8 +2182,12 @@ POSTHOOK: Input: default@decimal_udf
 
[{"x":-1.2345678901234567E9,"y":1.0},{"x":-144.50057142857142,"y":35.0},{"x":1.2345678901234567E9,"y":1.0}]
 PREHOOK: query: EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2116,8 +2244,12 @@ POSTHOOK: Input: default@decimal_udf
 -1234567890.1234567890
 PREHOOK: query: EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2174,8 +2306,12 @@ POSTHOOK: Input: default@decimal_udf
 1234567890.1234567800
 PREHOOK: query: EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/decimal_udf2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_udf2.q.out 
b/ql/src/test/results/clientpositive/decimal_udf2.q.out
index 2006e48..5751784 100644
--- a/ql/src/test/results/clientpositive/decimal_udf2.q.out
+++ b/ql/src/test/results/clientpositive/decimal_udf2.q.out
@@ -28,10 +28,14 @@ PREHOOK: query: EXPLAIN
 SELECT acos(key), asin(key), atan(key), cos(key), sin(key), tan(key), 
radians(key)
 FROM DECIMAL_UDF2 WHERE key = 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT acos(key), asin(key), atan(key), cos(key), sin(key), tan(key), 
radians(key)
 FROM DECIMAL_UDF2 WHERE key = 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -83,6 +87,8 @@ SELECT
   log10(key), sqrt(key)
 FROM DECIMAL_UDF2 WHERE key = 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_udf2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT
   exp(key), ln(key),
@@ -90,6 +96,8 @@ SELECT
   log10(key), sqrt(key)
 FROM DECIMAL_UDF2 WHERE key = 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_udf2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/deleteAnalyze.q.out 
b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
index 0661885..aeaa8db 100644
--- a/ql/src/test/results/clientpositive/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
@@ -151,6 +151,8 @@ coalesce(d.sales_tax,0) as tax
 from testdeci2_n0 s join testdeci2_n0 d
 on s.item=d.item and d.id=2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testdeci2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select s.id,
 coalesce(d.amount,0) as sales,
@@ -158,6 +160,8 @@ coalesce(d.sales_tax,0) as tax
 from testdeci2_n0 s join testdeci2_n0 d
 on s.item=d.item and d.id=2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testdeci2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
index 4d5144c..930cdd2 100644
--- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
@@ -66,9 +66,15 @@ comment              from deserializer
 PREHOOK: query: explain
 analyze table UserVisits_web_text_none_n0 compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@uservisits_web_text_none_n0
+PREHOOK: Output: default@uservisits_web_text_none_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 analyze table UserVisits_web_text_none_n0 compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@uservisits_web_text_none_n0
+POSTHOOK: Output: default@uservisits_web_text_none_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -118,9 +124,15 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 analyze table UserVisits_web_text_none_n0 compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@uservisits_web_text_none_n0
+PREHOOK: Output: default@uservisits_web_text_none_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 analyze table UserVisits_web_text_none_n0 compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@uservisits_web_text_none_n0
+POSTHOOK: Output: default@uservisits_web_text_none_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -352,9 +364,15 @@ COLUMN_STATS_ACCURATE      
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"
 PREHOOK: query: explain
 analyze table empty_tab_n0 compute statistics for columns a,b,c,d,e
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@empty_tab_n0
+PREHOOK: Output: default@empty_tab_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 analyze table empty_tab_n0 compute statistics for columns a,b,c,d,e
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@empty_tab_n0
+POSTHOOK: Output: default@empty_tab_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/distinct_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/distinct_stats.q.out 
b/ql/src/test/results/clientpositive/distinct_stats.q.out
index aa89d10..3192cb3 100644
--- a/ql/src/test/results/clientpositive/distinct_stats.q.out
+++ b/ql/src/test/results/clientpositive/distinct_stats.q.out
@@ -29,9 +29,13 @@ POSTHOOK: Output: default@t1_n11
 PREHOOK: query: explain 
 select count(distinct b) from t1_n11 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(distinct b) from t1_n11 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -86,9 +90,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select distinct(b) from t1_n11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select distinct(b) from t1_n11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -138,9 +146,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select a, count(*) from t1_n11 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select a, count(*) from t1_n11 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/distinct_windowing.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/distinct_windowing.q.out 
b/ql/src/test/results/clientpositive/distinct_windowing.q.out
index b32786e..bffc841 100644
--- a/ql/src/test/results/clientpositive/distinct_windowing.q.out
+++ b/ql/src/test/results/clientpositive/distinct_windowing.q.out
@@ -47,9 +47,13 @@ POSTHOOK: Output: default@over10k_n15
 PREHOOK: query: explain
 select distinct first_value(t) over ( partition by si order by i ) from 
over10k_n15 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n15
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct first_value(t) over ( partition by si order by i ) from 
over10k_n15 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n15
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -166,10 +170,14 @@ PREHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i )
 from over10k_n15 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n15
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i )
 from over10k_n15 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n15
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -288,11 +296,15 @@ select distinct last_value(i) over ( partition by si 
order by i ),
                 first_value(t)  over ( partition by si order by i )
 from over10k_n15 limit 50
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n15
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i ),
                 first_value(t)  over ( partition by si order by i )
 from over10k_n15 limit 50
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n15
+#### 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/b356aae0/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out 
b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
index 6196b28..1e0de3c 100644
--- a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
+++ b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
@@ -47,9 +47,13 @@ POSTHOOK: Output: default@over10k_n14
 PREHOOK: query: explain
 select distinct first_value(t) over ( partition by si order by i ) from 
over10k_n14 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct first_value(t) over ( partition by si order by i ) from 
over10k_n14 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -166,10 +170,14 @@ PREHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i )
 from over10k_n14 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i )
 from over10k_n14 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -288,11 +296,15 @@ select distinct last_value(i) over ( partition by si 
order by i ),
                 first_value(t)  over ( partition by si order by i )
 from over10k_n14 limit 50
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct last_value(i) over ( partition by si order by i ),
                 first_value(t)  over ( partition by si order by i )
 from over10k_n14 limit 50
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -462,6 +474,8 @@ GROUP BY si
 HAVING max(f) > 0
 limit 50
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select si, max(f) mf, rank() over ( partition by si order by mf )
 FROM over10k_n14
@@ -469,6 +483,8 @@ GROUP BY si
 HAVING max(f) > 0
 limit 50
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -643,11 +659,15 @@ select distinct si, rank() over ( partition by si order 
by i )
 FROM over10k_n14
 limit 50
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct si, rank() over ( partition by si order by i )
 FROM over10k_n14
 limit 50
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_n14
+#### 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/b356aae0/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out 
b/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out
index e543158..85f4f53 100644
--- a/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out
+++ b/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out
@@ -31,8 +31,12 @@ b=1/c=1
 #### A masked pattern was here ####
 PREHOOK: query: explain extended alter table dmp.mp drop partition (b='1')
 PREHOOK: type: ALTERTABLE_DROPPARTS
+PREHOOK: Input: dmp@mp
+PREHOOK: Output: dmp@mp@b=1/c=1
 POSTHOOK: query: explain extended alter table dmp.mp drop partition (b='1')
 POSTHOOK: type: ALTERTABLE_DROPPARTS
+POSTHOOK: Input: dmp@mp
+POSTHOOK: Output: dmp@mp@b=1/c=1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/drop_multi_partitions.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_multi_partitions.q.out 
b/ql/src/test/results/clientpositive/drop_multi_partitions.q.out
index d1f0116..6b59749 100644
--- a/ql/src/test/results/clientpositive/drop_multi_partitions.q.out
+++ b/ql/src/test/results/clientpositive/drop_multi_partitions.q.out
@@ -44,8 +44,14 @@ b=1/c=2
 b=2/c=2
 PREHOOK: query: explain extended alter table dmp.mp_n0 drop partition (b='1')
 PREHOOK: type: ALTERTABLE_DROPPARTS
+PREHOOK: Input: dmp@mp_n0
+PREHOOK: Output: dmp@mp_n0@b=1/c=1
+PREHOOK: Output: dmp@mp_n0@b=1/c=2
 POSTHOOK: query: explain extended alter table dmp.mp_n0 drop partition (b='1')
 POSTHOOK: type: ALTERTABLE_DROPPARTS
+POSTHOOK: Input: dmp@mp_n0
+POSTHOOK: Output: dmp@mp_n0@b=1/c=1
+POSTHOOK: Output: dmp@mp_n0@b=1/c=2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/drop_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_udf.q.out 
b/ql/src/test/results/clientpositive/drop_udf.q.out
index 7d9cb84..27dd986 100644
--- a/ql/src/test/results/clientpositive/drop_udf.q.out
+++ b/ql/src/test/results/clientpositive/drop_udf.q.out
@@ -7,9 +7,11 @@ POSTHOOK: Output: test_translate
 PREHOOK: query: EXPLAIN
 DROP TEMPORARY FUNCTION test_translate
 PREHOOK: type: DROPFUNCTION
+PREHOOK: Output: test_translate
 POSTHOOK: query: EXPLAIN
 DROP TEMPORARY FUNCTION test_translate
 POSTHOOK: type: DROPFUNCTION
+POSTHOOK: Output: test_translate
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

Reply via email to