http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
index 745fdce..9ec49bd 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
@@ -38,8 +38,12 @@ POSTHOOK: Output: default@location
 #### A masked pattern was here ####
 PREHOOK: query: explain select state, country from location group by state, 
country
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -88,8 +92,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, country from location group by state, 
country with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -139,8 +147,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, country from location group by state, 
country
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -189,8 +201,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, votes from location group by state, votes
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, votes from location group by state, 
votes
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -239,8 +255,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, country from location group by state, 
country with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -290,8 +310,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, country from location group by state, 
country
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -340,8 +364,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state, country from location group by state, 
country with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@location
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state, country from location group by state, 
country with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@location
+#### 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/annotate_stats_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_join.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
index 92b2fd8..798644f 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_join.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
@@ -126,8 +126,14 @@ POSTHOOK: Output: default@loc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -195,8 +201,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2,dept_n1 where emp_n2.deptid = 
dept_n1.deptid and emp_n2.lastname = dept_n1.deptname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2,dept_n1 where emp_n2.deptid = 
dept_n1.deptid and emp_n2.lastname = dept_n1.deptname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -263,8 +275,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid and e.lastname = d.deptname)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid and e.lastname = d.deptname)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -331,8 +349,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2,dept_n1 where emp_n2.deptid = 
dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and dept_n1.deptname = 
emp_n2.lastname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2,dept_n1 where emp_n2.deptid = 
dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and dept_n1.deptname = 
emp_n2.lastname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -399,8 +423,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid) join emp_n2 e1 on (e.deptid = e1.deptid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid) join emp_n2 e1 on (e.deptid = e1.deptid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -487,8 +517,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 e join dept_n1 d  on (e.deptid = 
d.deptid) join loc l on (e.deptid = l.locid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+PREHOOK: Input: default@loc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 e join dept_n1 d  on (e.deptid = 
d.deptid) join loc l on (e.deptid = l.locid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+POSTHOOK: Input: default@loc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -575,8 +613,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid and e.lastname = d.deptname) join loc l on (e.deptid = l.locid and 
e.lastname = l.state)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+PREHOOK: Input: default@loc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 e join dept_n1 d on (e.deptid = 
d.deptid and e.lastname = d.deptname) join loc l on (e.deptid = l.locid and 
e.lastname = l.state)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+POSTHOOK: Input: default@loc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -662,8 +708,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 left outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 left outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -722,8 +774,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 left semi join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 left semi join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -795,8 +853,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 right outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 right outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -855,8 +919,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from emp_n2 full outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dept_n1
+PREHOOK: Input: default@emp_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_n2 full outer join dept_n1 on 
emp_n2.deptid = dept_n1.deptid and emp_n2.lastname = dept_n1.deptname and 
dept_n1.deptname = emp_n2.lastname
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dept_n1
+POSTHOOK: Input: default@emp_n2
+#### 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/annotate_stats_join_pkfk.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
index 6c74b23..a42452a 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
@@ -360,8 +360,14 @@ POSTHOOK: Output: default@customer_address
 #### A masked pattern was here ####
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -427,8 +433,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_bigint s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_bigint
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_bigint s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_bigint
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -494,8 +506,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_store_sk > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_store_sk > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -561,8 +579,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_company_id > 0 
and ss.ss_quantity > 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_company_id > 0 
and ss.ss_quantity > 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -628,8 +652,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_floor_space > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where s.s_floor_space > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -695,8 +725,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where ss.ss_quantity > 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) where ss.ss_quantity > 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -762,8 +798,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -851,8 +893,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where s.s_store_sk > 1000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where s.s_store_sk > 1000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -940,8 +988,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where s.s_floor_space > 1000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where s.s_floor_space > 1000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1029,8 +1083,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where ss.ss_quantity > 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join store_n0 s1 on 
(s1.s_store_sk = ss.ss_store_sk) where ss.ss_quantity > 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1118,8 +1178,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join customer_address ca 
on (ca.ca_address_sk = ss.ss_addr_sk)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_address
+PREHOOK: Input: default@store_n0
+PREHOOK: Input: default@store_sales_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.s_store_sk from store_n0 s join 
store_sales_n0 ss on (s.s_store_sk = ss.ss_store_sk) join customer_address ca 
on (ca.ca_address_sk = ss.ss_addr_sk)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_address
+POSTHOOK: Input: default@store_n0
+POSTHOOK: Input: default@store_sales_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/annotate_stats_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
index 16f8a4f..ec1dc8b 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
@@ -64,8 +64,12 @@ POSTHOOK: Output: default@loc_orc_n5
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from loc_orc_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -85,8 +89,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n5 limit 4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n5 limit 4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -109,8 +117,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n5 limit 16
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n5 limit 16
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -133,8 +145,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n5 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n5 limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/annotate_stats_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
index 1c67a65..04320a7 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
@@ -42,8 +42,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@loc_orc_n4
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -78,8 +82,16 @@ POSTHOOK: Lineage: loc_orc_n4 
PARTITION(year=__HIVE_DEFAULT_PARTITION__).state S
 POSTHOOK: Lineage: loc_orc_n4 PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip 
SIMPLE [(loc_staging_n4)loc_staging_n4.FieldSchema(name:zip, type:bigint, 
comment:null), ]
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -109,8 +121,14 @@ POSTHOOK: Output: default@loc_orc_n4
 POSTHOOK: Output: default@loc_orc_n4@year=2001
 PREHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -131,8 +149,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -152,8 +178,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -186,8 +218,14 @@ POSTHOOK: Output: default@loc_orc_n4@year=2001
 POSTHOOK: Output: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -208,8 +246,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -229,8 +275,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001' or 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001' or 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -251,8 +305,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001' and 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001' and 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -289,8 +347,16 @@ POSTHOOK: Output: default@loc_orc_n4@year=2001
 #### A masked pattern was here ####
 PREHOOK: query: explain select zip from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select zip from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -310,8 +376,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -331,8 +405,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -352,8 +434,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -373,8 +463,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4 where year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4 where year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -395,8 +491,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4 where year!='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4 where year!='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -417,8 +519,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -438,8 +548,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select locid from loc_orc_n4 where locid>0 and 
year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select locid from loc_orc_n4 where locid>0 and 
year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -476,8 +592,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select locid,year from loc_orc_n4 where locid>0 and 
year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select locid,year from loc_orc_n4 where locid>0 and 
year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -514,8 +636,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select locid,year from loc_orc_n4) test 
where locid>0 and year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select locid,year from loc_orc_n4) 
test where locid>0 and year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### 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/annotate_stats_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
index b022af1..3a57a65 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
@@ -91,8 +91,12 @@ POSTHOOK: Lineage: alltypes_orc.ts1 SIMPLE 
[(alltypes)alltypes.FieldSchema(name:
 POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE 
[(alltypes)alltypes.FieldSchema(name:vc1, type:varchar(5), comment:null), ]
 PREHOOK: query: explain select * from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -122,8 +126,12 @@ POSTHOOK: Output: default@alltypes_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -143,8 +151,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -164,8 +176,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 as int1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 as int1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -185,8 +201,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -206,8 +226,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select m1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -227,8 +251,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1, ti1, si1, i1, bi1, f1, d1,s1 from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1, ti1, si1, i1, bi1, f1, d1,s1 from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -248,8 +276,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select null from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select null from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -269,8 +301,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -290,8 +326,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11L from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11L from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -311,8 +351,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11.0 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11.0 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -332,8 +376,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select "hello" from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select "hello" from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -353,8 +401,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("hello" as char(5)) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("hello" as char(5)) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -374,8 +426,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("hello" as varchar(5)) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("hello" as varchar(5)) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -395,8 +451,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select unbase64("0xe23") from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select unbase64("0xe23") from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -416,8 +476,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1" as TINYINT), cast("20" as SMALLINT) 
from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1" as TINYINT), cast("20" as SMALLINT) 
from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -437,8 +501,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -458,8 +526,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -479,8 +551,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("58.174" as DECIMAL) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("58.174" as DECIMAL) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -500,8 +576,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select array(1,2,3) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select array(1,2,3) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -533,8 +613,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select str_to_map("a=1 b=2 c=3", " ", "=") from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select str_to_map("a=1 b=2 c=3", " ", "=") from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -566,8 +650,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select NAMED_STRUCT("a", 11, "b", 11) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select NAMED_STRUCT("a", 11, "b", 11) from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -599,8 +687,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select CREATE_UNION(0, "hello") from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select CREATE_UNION(0, "hello") from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -632,8 +724,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(*) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -646,8 +742,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(1) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -660,8 +760,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select *,11 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select *,11 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -681,8 +785,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 from (select i1 from alltypes_orc limit 10) 
temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 from (select i1 from alltypes_orc limit 10) 
temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -705,8 +813,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 from (select i1,11 from alltypes_orc limit 
10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 from (select i1,11 from alltypes_orc limit 
10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -729,8 +841,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1,"hello" from (select i1,11 from alltypes_orc 
limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1,"hello" from (select i1,11 from 
alltypes_orc limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -782,8 +898,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select x from (select i1,11.0 as x from alltypes_orc 
limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select x from (select i1,11.0 as x from alltypes_orc 
limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -828,8 +948,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select x,"hello" from (select i1 as x, 
unbase64("0xe23") as ub from alltypes_orc limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select x,"hello" from (select i1 as x, 
unbase64("0xe23") as ub from alltypes_orc limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -881,8 +1005,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select h, 11.0 from (select hell as h from (select i1, 
"hello" as hell from alltypes_orc limit 10) in1 limit 10) in2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select h, 11.0 from (select hell as h from (select 
i1, "hello" as hell from alltypes_orc limit 10) in1 limit 10) in2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -927,8 +1055,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc where bo1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc where bo1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -963,8 +1095,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc where !bo1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc where !bo1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### 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/annotate_stats_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_table.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
index 9604208..d7f7b22 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
@@ -30,8 +30,12 @@ POSTHOOK: Input: default@emp_orc
 POSTHOOK: Output: default@emp_orc
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -69,8 +73,12 @@ POSTHOOK: Lineage: emp_orc.deptid SIMPLE 
[(emp_staging)emp_staging.FieldSchema(n
 POSTHOOK: Lineage: emp_orc.lastname SIMPLE 
[(emp_staging)emp_staging.FieldSchema(name:lastname, type:string, 
comment:null), ]
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -98,8 +106,12 @@ POSTHOOK: Input: default@emp_orc
 POSTHOOK: Output: default@emp_orc
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -129,8 +141,12 @@ POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -150,8 +166,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -181,8 +201,12 @@ POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -202,8 +226,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select lastname from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select lastname from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -223,8 +251,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -244,8 +276,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select lastname,deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select lastname,deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -276,8 +312,14 @@ POSTHOOK: Output: default@tmp_n0
 POSTHOOK: Lineage: tmp_n0._c0 SIMPLE []
 PREHOOK: query: explain create table tmp_n0 as select 1
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_n0
 POSTHOOK: query: explain create table tmp_n0 as select 1
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@tmp_n0
 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/163caed7/ql/src/test/results/clientpositive/annotate_stats_udtf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_udtf.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_udtf.q.out
index f526487..9a9f257 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_udtf.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_udtf.q.out
@@ -30,8 +30,12 @@ POSTHOOK: Output: default@hive_20262
 POSTHOOK: Lineage: hive_20262.a EXPRESSION []
 PREHOOK: query: explain select explode(array(1,2,3,4,5)) as col
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select explode(array(1,2,3,4,5)) as col
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -71,8 +75,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select explode(a) from HIVE_20262
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hive_20262
+#### A masked pattern was here ####
 POSTHOOK: query: explain select explode(a) from HIVE_20262
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hive_20262
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -112,9 +120,13 @@ STAGE PLANS:
 PREHOOK: query: explain select 1, r from HIVE_20262
       lateral view explode(a) t as r
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hive_20262
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 1, r from HIVE_20262
       lateral view explode(a) t as r
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hive_20262
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -174,8 +186,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select explode(array(1,2,3,4,5)) as col
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select explode(array(1,2,3,4,5)) as col
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -215,8 +231,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select explode(a) from HIVE_20262
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hive_20262
+#### A masked pattern was here ####
 POSTHOOK: query: explain select explode(a) from HIVE_20262
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hive_20262
+#### 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/annotate_stats_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_union.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
index 11f8015..92108f2 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_union.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
@@ -64,8 +64,12 @@ POSTHOOK: Output: default@loc_orc_n3
 #### A masked pattern was here ####
 PREHOOK: query: explain select state from loc_orc_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state from loc_orc_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -85,8 +89,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select state from loc_orc_n3 union all 
select state from loc_orc_n3) tmp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from loc_orc_n3 union all 
select state from loc_orc_n3) tmp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -136,8 +144,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -157,8 +169,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select * from loc_orc_n3 union all 
select * from loc_orc_n3) tmp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select * from loc_orc_n3 union all 
select * from loc_orc_n3) tmp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -302,8 +318,14 @@ POSTHOOK: Input: test@loc_orc_n3
 POSTHOOK: Output: test@loc_orc_n3
 PREHOOK: query: explain select * from (select state from default.loc_orc_n3 
union all select state from test.loc_orc_n3) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+PREHOOK: Input: test@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from default.loc_orc_n3 
union all select state from test.loc_orc_n3) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+POSTHOOK: Input: test@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -353,8 +375,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select state from test.loc_staging_n3 
union all select state from test.loc_orc_n3) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: test@loc_orc_n3
+PREHOOK: Input: test@loc_staging_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from test.loc_staging_n3 
union all select state from test.loc_orc_n3) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: test@loc_orc_n3
+POSTHOOK: Input: test@loc_staging_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/ansi_sql_arithmetic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out 
b/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
index 8aaa253..abafa97 100644
--- a/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 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
@@ -46,8 +50,12 @@ POSTHOOK: Input: default@src
 1.00000000000
 PREHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 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/163caed7/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out 
b/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
index 7442c05..b073af1 100644
--- a/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
+++ b/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
@@ -19,9 +19,13 @@ POSTHOOK: Lineage: array_table.index EXPRESSION 
[(src)src.FieldSchema(name:key,
 PREHOOK: query: explain
 select index, `array`[index] from array_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@array_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select index, `array`[index] from array_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@array_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -72,9 +76,13 @@ POSTHOOK: Lineage: map_table.key EXPRESSION 
[(src)src.FieldSchema(name:key, type
 PREHOOK: query: explain
 select key, data[key] from map_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@map_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, data[key] from map_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@map_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/array_size_estimation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/array_size_estimation.q.out 
b/ql/src/test/results/clientpositive/array_size_estimation.q.out
index 77a68b5..0016672 100644
--- a/ql/src/test/results/clientpositive/array_size_estimation.q.out
+++ b/ql/src/test/results/clientpositive/array_size_estimation.q.out
@@ -18,9 +18,13 @@ POSTHOOK: Lineage: t_n19.col SCRIPT []
 PREHOOK: query: explain
 select array("b", "d", "c", "a") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select array("b", "d", "c", "a") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -54,9 +58,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select array("b", "d", "c", col) FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select array("b", "d", "c", col) FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -90,9 +98,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select sort_array(array("b", "d", "c", "a")),array("1","2") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sort_array(array("b", "d", "c", "a")),array("1","2") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -126,9 +138,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select sort_array(array("b", "d", "c", col)),array("1","2") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sort_array(array("b", "d", "c", col)),array("1","2") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### 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/authorization_alter_table_exchange_partition.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
 
b/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
index e838056..028f94e 100644
--- 
a/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
+++ 
b/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
@@ -61,8 +61,12 @@ default      exchange_partition_test_2                       
user2   USER    SELECT  true    -1      user1
 default        exchange_partition_test_2                       user2   USER    
UPDATE  true    -1      user1
 PREHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 PREHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+PREHOOK: Input: default@exchange_partition_test_1
+PREHOOK: Output: default@exchange_partition_test_2
 POSTHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 POSTHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+POSTHOOK: Input: default@exchange_partition_test_1
+POSTHOOK: Output: default@exchange_partition_test_2
 INPUTS: 
   default@exchange_partition_test_1
 OUTPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/authorization_explain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_explain.q.out 
b/ql/src/test/results/clientpositive/authorization_explain.q.out
index 851b845..61551f4 100644
--- a/ql/src/test/results/clientpositive/authorization_explain.q.out
+++ b/ql/src/test/results/clientpositive/authorization_explain.q.out
@@ -1,8 +1,22 @@
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain authorization select * from src join srcpart
 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
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain authorization select * from src join srcpart
 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
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 INPUTS: 
   default@src
   default@srcpart
@@ -19,13 +33,28 @@ OPERATION:
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain formatted authorization select * from src join srcpart
 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
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain formatted authorization select * from src join srcpart
 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
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 PREHOOK: query: explain authorization use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: explain authorization use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 INPUTS: 
   database:default
 OUTPUTS: 
@@ -35,6 +64,8 @@ OPERATION:
   SWITCHDATABASE
 PREHOOK: query: explain formatted authorization use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: explain formatted authorization use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 
{"INPUTS":["database:default"],"OUTPUTS":[],"CURRENT_USER":"hive_test_user","OPERATION":"SWITCHDATABASE"}

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/authorization_wm.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_wm.q.out 
b/ql/src/test/results/clientpositive/authorization_wm.q.out
index 405a4a4..5d4936f 100644
--- a/ql/src/test/results/clientpositive/authorization_wm.q.out
+++ b/ql/src/test/results/clientpositive/authorization_wm.q.out
@@ -1,5 +1,6 @@
 PREHOOK: query: explain authorization create resource plan rp
 PREHOOK: type: CREATE RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 INPUTS: 
@@ -18,6 +19,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization create resource plan rp
 PREHOOK: type: CREATE RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 INPUTS: 
@@ -34,6 +36,7 @@ POSTHOOK: query: create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 PREHOOK: query: explain authorization show resource plans
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plans
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -47,6 +50,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation SHOW_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization show resource plan rp
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plan rp
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -60,6 +64,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation SHOW_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 PREHOOK: type: ALTER RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 POSTHOOK: type: ALTER RESOURCEPLAN
 INPUTS: 
@@ -73,6 +78,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_RESOURCEPLAN [ADMIN PRIVILEGE on 
INPUT, ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop resource plan rp
 PREHOOK: type: DROP RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop resource plan rp
 POSTHOOK: type: DROP RESOURCEPLAN
 INPUTS: 
@@ -86,6 +92,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 PREHOOK: type: CREATE POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 POSTHOOK: type: CREATE POOL
 INPUTS: 
@@ -99,6 +106,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation CREATE_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 PREHOOK: type: CREATE TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 POSTHOOK: type: CREATE TRIGGER
 INPUTS: 
@@ -112,6 +120,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation CREATE_TRIGGER [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create user mapping 'joe' IN rp UNMANAGED
 PREHOOK: type: CREATE MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create user mapping 'joe' IN rp 
UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 INPUTS: 
@@ -136,6 +145,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization show resource plans
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plans
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -147,6 +157,7 @@ OPERATION:
   SHOW_RESOURCEPLAN
 PREHOOK: query: explain authorization show resource plan rp
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plan rp
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -158,6 +169,7 @@ OPERATION:
   SHOW_RESOURCEPLAN
 PREHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 PREHOOK: type: ALTER RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 POSTHOOK: type: ALTER RESOURCEPLAN
 INPUTS: 
@@ -169,6 +181,7 @@ OPERATION:
   ALTER_RESOURCEPLAN
 PREHOOK: query: explain authorization drop resource plan rp
 PREHOOK: type: DROP RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop resource plan rp
 POSTHOOK: type: DROP RESOURCEPLAN
 INPUTS: 
@@ -180,6 +193,7 @@ OPERATION:
   DROP_RESOURCEPLAN
 PREHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 PREHOOK: type: CREATE POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 POSTHOOK: type: CREATE POOL
 INPUTS: 
@@ -191,6 +205,7 @@ OPERATION:
   CREATE_POOL
 PREHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 PREHOOK: type: CREATE TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 POSTHOOK: type: CREATE TRIGGER
 INPUTS: 
@@ -202,6 +217,7 @@ OPERATION:
   CREATE_TRIGGER
 PREHOOK: query: explain authorization create user mapping 'joe' IN rp UNMANAGED
 PREHOOK: type: CREATE MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create user mapping 'joe' IN rp 
UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 INPUTS: 
@@ -257,6 +273,7 @@ POSTHOOK: query: create user mapping 'joe' IN rp UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 PREHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 PREHOOK: type: ALTER POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 POSTHOOK: type: ALTER POOL
 INPUTS: 
@@ -270,6 +287,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 PREHOOK: type: ALTER TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 POSTHOOK: type: ALTER TRIGGER
 INPUTS: 
@@ -283,6 +301,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_TRIGGER [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 PREHOOK: type: ALTER MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 POSTHOOK: type: ALTER MAPPING
 INPUTS: 
@@ -296,6 +315,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_MAPPING [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop user mapping 'joe' IN rp
 PREHOOK: type: DROP MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop user mapping 'joe' IN rp
 POSTHOOK: type: DROP MAPPING
 INPUTS: 
@@ -309,6 +329,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_MAPPING [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop pool rp.pool0
 PREHOOK: type: DROP POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop pool rp.pool0
 POSTHOOK: type: DROP POOL
 INPUTS: 
@@ -322,6 +343,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop trigger rp.trigger0
 PREHOOK: type: DROP TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop trigger rp.trigger0
 POSTHOOK: type: DROP TRIGGER
 INPUTS: 
@@ -345,6 +367,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 PREHOOK: type: ALTER POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 POSTHOOK: type: ALTER POOL
 INPUTS: 
@@ -356,6 +379,7 @@ OPERATION:
   ALTER_POOL
 PREHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 PREHOOK: type: ALTER TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 POSTHOOK: type: ALTER TRIGGER
 INPUTS: 
@@ -367,6 +391,7 @@ OPERATION:
   ALTER_TRIGGER
 PREHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 PREHOOK: type: ALTER MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 POSTHOOK: type: ALTER MAPPING
 INPUTS: 
@@ -378,6 +403,7 @@ OPERATION:
   ALTER_MAPPING
 PREHOOK: query: explain authorization drop user mapping 'joe' IN rp
 PREHOOK: type: DROP MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop user mapping 'joe' IN rp
 POSTHOOK: type: DROP MAPPING
 INPUTS: 
@@ -389,6 +415,7 @@ OPERATION:
   DROP_MAPPING
 PREHOOK: query: explain authorization drop pool rp.pool0
 PREHOOK: type: DROP POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop pool rp.pool0
 POSTHOOK: type: DROP POOL
 INPUTS: 
@@ -400,6 +427,7 @@ OPERATION:
   DROP_POOL
 PREHOOK: query: explain authorization drop trigger rp.trigger0
 PREHOOK: type: DROP TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop trigger rp.trigger0
 POSTHOOK: type: DROP TRIGGER
 INPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
index 0362f50..4131535 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: src_multi1_n1.key SIMPLE 
[(src)src.FieldSchema(name:key, type
 POSTHOOK: Lineage: src_multi1_n1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain extended select * from src_multi1_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from src_multi1_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src_multi1_n1`
 STAGE DEPENDENCIES:
@@ -480,8 +484,16 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -536,8 +548,26 @@ POSTHOOK: Lineage: nzhang_part14_n1 
PARTITION(value=val_311).key SIMPLE [(src5_n
 POSTHOOK: Lineage: nzhang_part14_n1 PARTITION(value=val_86).key SIMPLE 
[(src5_n0)src5_n0.FieldSchema(name:key, type:string, comment:null), ]
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+PREHOOK: Input: default@nzhang_part14_n1@value=val_165
+PREHOOK: Input: default@nzhang_part14_n1@value=val_238
+PREHOOK: Input: default@nzhang_part14_n1@value=val_27
+PREHOOK: Input: default@nzhang_part14_n1@value=val_311
+PREHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_165
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_238
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_27
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_311
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -650,8 +680,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5_n0 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5_n0
+PREHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5_n0 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5_n0
+POSTHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1333,8 +1369,16 @@ POSTHOOK: Lineage: c_n2 
PARTITION(ds=2010-05-11,hr=12).key SIMPLE [(srcpart)srcp
 POSTHOOK: Lineage: c_n2 PARTITION(ds=2010-05-11,hr=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select key from a_n12
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n12
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from a_n12
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n12
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1354,8 +1398,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1375,8 +1425,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1396,8 +1452,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1417,8 +1481,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

Reply via email to