http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out 
b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out
index b9327e3..f22be61 100644
--- a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out
+++ b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out
@@ -58,10 +58,18 @@ PREHOOK: query: explain select *
 from part p1 join part2_n4 p2 join part3_n1 p3 on p1.p_name = p2_name join 
part p4 
 where p2_name = p3_name and p1.p_name = p4.p_name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Input: default@part2_n4
+PREHOOK: Input: default@part3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select *
 from part p1 join part2_n4 p2 join part3_n1 p3 on p1.p_name = p2_name join 
part p4 
 where p2_name = p3_name and p1.p_name = p4.p_name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Input: default@part2_n4
+POSTHOOK: Input: default@part3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -174,11 +182,19 @@ from part p1 join part2_n4 p2 join part3_n1 p3 on p2_name 
= p1.p_name join part
 where p2_name = p3_name and p1.p_partkey = p4.p_partkey 
             and p1.p_partkey = p2_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Input: default@part2_n4
+PREHOOK: Input: default@part3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select *
 from part p1 join part2_n4 p2 join part3_n1 p3 on p2_name = p1.p_name join 
part p4 
 where p2_name = p3_name and p1.p_partkey = p4.p_partkey 
             and p1.p_partkey = p2_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Input: default@part2_n4
+POSTHOOK: Input: default@part3_n1
+#### 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/join_cond_pushdown_unqual5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out 
b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
index d80bbf1..9492ca9 100644
--- a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
+++ b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
@@ -39,8 +39,14 @@ POSTHOOK: Lineage: rtable.rk1 SCRIPT []
 POSTHOOK: Lineage: rtable.rk2 SCRIPT []
 PREHOOK: query: EXPLAIN SELECT * FROM ltable l LEFT OUTER JOIN rtable r on 
(l.lk1 = r.rk1 AND l.lk2 = r.rk2) WHERE 
COALESCE(l.la,'EMPTY')=COALESCE(r.ra,'EMPTY')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@ltable
+PREHOOK: Input: default@rtable
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM ltable l LEFT OUTER JOIN rtable r on 
(l.lk1 = r.rk1 AND l.lk2 = r.rk2) WHERE 
COALESCE(l.la,'EMPTY')=COALESCE(r.ra,'EMPTY')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@ltable
+POSTHOOK: Input: default@rtable
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -114,8 +120,14 @@ POSTHOOK: Input: default@rtable
 2      NULL    CD5415192225530 00071   NULL    NULL    NULL
 PREHOOK: query: EXPLAIN SELECT * FROM ltable l LEFT OUTER JOIN rtable r on 
(l.lk1 = r.rk1 AND l.lk2 = r.rk2) WHERE 
COALESCE(l.la,'EMPTY')=COALESCE(r.ra,'EMPTY')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@ltable
+PREHOOK: Input: default@rtable
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM ltable l LEFT OUTER JOIN rtable r on 
(l.lk1 = r.rk1 AND l.lk2 = r.rk2) WHERE 
COALESCE(l.la,'EMPTY')=COALESCE(r.ra,'EMPTY')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@ltable
+POSTHOOK: Input: default@rtable
+#### 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/163caed7/ql/src/test/results/clientpositive/join_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_emit_interval.q.out 
b/ql/src/test/results/clientpositive/join_emit_interval.q.out
index 6b8178d..44d69da 100644
--- a/ql/src/test/results/clientpositive/join_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/join_emit_interval.q.out
@@ -45,11 +45,17 @@ SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.value=test2_n4.value AND test1_n7.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n7
+PREHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.value=test2_n4.value AND test1_n7.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n7
+POSTHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -137,11 +143,17 @@ SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n7
+PREHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n7
+POSTHOOK: Input: default@test2_n4
+#### 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/join_filters_overlap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_filters_overlap.q.out 
b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
index ffb8cd3..7b5c9f2 100644
--- a/ql/src/test/results/clientpositive/join_filters_overlap.q.out
+++ b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
@@ -12,8 +12,12 @@ POSTHOOK: Lineage: a_n4.key SIMPLE []
 POSTHOOK: Lineage: a_n4.value SCRIPT []
 PREHOOK: query: explain extended select * from a_n4 left outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(a_n4.key=c.key AND a_n4.value=60 AND c.value=60)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from a_n4 left outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(a_n4.key=c.key AND a_n4.value=60 AND c.value=60)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, `value`
 FROM `default`.`a_n4`) AS `t`
@@ -216,8 +220,12 @@ POSTHOOK: Input: default@a_n4
 100    60      NULL    NULL    100     60
 PREHOOK: query: explain extended select * from a_n4 right outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(b.key=c.key AND b.value=60 AND c.value=60)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from a_n4 right outer join a_n4 b 
on (a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(b.key=c.key AND b.value=60 AND c.value=60)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, CAST(50 AS INTEGER) AS `value`
 FROM `default`.`a_n4`
@@ -420,8 +428,12 @@ NULL       NULL    100     40      NULL    NULL
 NULL   NULL    100     60      100     60
 PREHOOK: query: explain extended select * from a_n4 right outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50 AND b.value>10) left outer 
join a_n4 c on (b.key=c.key AND b.value=60 AND b.value>20 AND c.value=60)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from a_n4 right outer join a_n4 b 
on (a_n4.key=b.key AND a_n4.value=50 AND b.value=50 AND b.value>10) left outer 
join a_n4 c on (b.key=c.key AND b.value=60 AND b.value>20 AND c.value=60)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, CAST(50 AS INTEGER) AS `value`
 FROM `default`.`a_n4`
@@ -624,8 +636,12 @@ NULL       NULL    100     40      NULL    NULL
 NULL   NULL    100     60      100     60
 PREHOOK: query: explain extended select * from a_n4 full outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(b.key=c.key AND b.value=60 AND c.value=60) left outer join a_n4 d on 
(a_n4.key=d.key AND a_n4.value=40 AND d.value=40)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from a_n4 full outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(b.key=c.key AND b.value=60 AND c.value=60) left outer join a_n4 d on 
(a_n4.key=d.key AND a_n4.value=40 AND d.value=40)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, `value`
 FROM `default`.`a_n4`) AS `t`
@@ -842,8 +858,12 @@ NULL       NULL    100     40      NULL    NULL    NULL    
NULL
 NULL   NULL    100     60      100     60      NULL    NULL
 PREHOOK: query: explain extended select * from a_n4 left outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(a_n4.key=c.key AND a_n4.value=60 AND c.value=60) left outer join a_n4 d on 
(a_n4.key=d.key AND a_n4.value=40 AND d.value=40)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from a_n4 left outer join a_n4 b on 
(a_n4.key=b.key AND a_n4.value=50 AND b.value=50) left outer join a_n4 c on 
(a_n4.key=c.key AND a_n4.value=60 AND c.value=60) left outer join a_n4 d on 
(a_n4.key=d.key AND a_n4.value=40 AND d.value=40)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, `value`
 FROM `default`.`a_n4`) AS `t`

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_grp_diff_keys.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_grp_diff_keys.q.out 
b/ql/src/test/results/clientpositive/join_grp_diff_keys.q.out
index 0633923..379f274 100644
--- a/ql/src/test/results/clientpositive/join_grp_diff_keys.q.out
+++ b/ql/src/test/results/clientpositive/join_grp_diff_keys.q.out
@@ -38,6 +38,11 @@ SELECT foo.id, count(*) as factor from
  WHERE foo.orders != 'blah'  
  group by foo.id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bar
+PREHOOK: Input: default@foo
+PREHOOK: Input: default@forecast
+PREHOOK: Input: default@split
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 SELECT foo.id, count(*) as factor from 
  foo JOIN bar  ON (foo.id = bar.id and foo.line_id = bar.line_id) 
@@ -46,6 +51,11 @@ SELECT foo.id, count(*) as factor from
  WHERE foo.orders != 'blah'  
  group by foo.id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bar
+POSTHOOK: Input: default@foo
+POSTHOOK: Input: default@forecast
+POSTHOOK: Input: default@split
+#### 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/join_hive_626.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_hive_626.q.out 
b/ql/src/test/results/clientpositive/join_hive_626.q.out
index 81e48bc..ff42ec9 100644
--- a/ql/src/test/results/clientpositive/join_hive_626.q.out
+++ b/ql/src/test/results/clientpositive/join_hive_626.q.out
@@ -60,10 +60,18 @@ PREHOOK: query: explain
 select hive_foo.foo_name, hive_bar.bar_name, n from hive_foo join hive_bar on 
hive_foo.foo_id =
 hive_bar.foo_id join hive_count on hive_count.bar_id = hive_bar.bar_id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hive_bar
+PREHOOK: Input: default@hive_count
+PREHOOK: Input: default@hive_foo
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select hive_foo.foo_name, hive_bar.bar_name, n from hive_foo join hive_bar on 
hive_foo.foo_id =
 hive_bar.foo_id join hive_count on hive_count.bar_id = hive_bar.bar_id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hive_bar
+POSTHOOK: Input: default@hive_count
+POSTHOOK: Input: default@hive_foo
+#### 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/join_map_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_map_ppr.q.out 
b/ql/src/test/results/clientpositive/join_map_ppr.q.out
index 585f6c3..401a352 100644
--- a/ql/src/test/results/clientpositive/join_map_ppr.q.out
+++ b/ql/src/test/results/clientpositive/join_map_ppr.q.out
@@ -13,6 +13,11 @@ FROM src1 x JOIN src y ON (x.key = y.key)
 JOIN srcpart z ON (x.key = z.key)
 WHERE z.ds='2008-04-08' and z.hr=11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j1_n4
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j1_n4
 SELECT /*+ MAPJOIN(x,y) */ x.key, z.value, y.value
@@ -20,6 +25,11 @@ FROM src1 x JOIN src y ON (x.key = y.key)
 JOIN srcpart z ON (x.key = z.key)
 WHERE z.ds='2008-04-08' and z.hr=11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j1_n4
 STAGE DEPENDENCIES:
   Stage-10 is a root stage
   Stage-1 depends on stages: Stage-10
@@ -654,6 +664,11 @@ FROM src1_copy x JOIN src_copy y ON (x.key = y.key)
 JOIN srcpart z ON (x.key = z.key)
 WHERE z.ds='2008-04-08' and z.hr=11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src1_copy
+PREHOOK: Input: default@src_copy
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j1_n4
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j1_n4
 SELECT /*+ MAPJOIN(x,y) */ x.key, z.value, y.value
@@ -661,6 +676,11 @@ FROM src1_copy x JOIN src_copy y ON (x.key = y.key)
 JOIN srcpart z ON (x.key = z.key)
 WHERE z.ds='2008-04-08' and z.hr=11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src1_copy
+POSTHOOK: Input: default@src_copy
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j1_n4
 STAGE DEPENDENCIES:
   Stage-10 is a root stage
   Stage-1 depends on stages: Stage-10

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out 
b/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out
index 75cf433..41c7a3f 100644
--- a/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out
+++ b/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out
@@ -1,9 +1,21 @@
 PREHOOK: query: explain
 select count(*) from srcpart a join srcpart b on a.key = b.key and a.hr = b.hr 
join srcpart c on a.hr = c.hr and a.key = c.key
 PREHOOK: type: QUERY
+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
 select count(*) from srcpart a join srcpart b on a.key = b.key and a.hr = b.hr 
join srcpart c on a.hr = c.hr and a.key = c.key
 POSTHOOK: type: QUERY
+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 ####
 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/join_merging.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_merging.q.out 
b/ql/src/test/results/clientpositive/join_merging.q.out
index 0e46d6c..80bde7f 100644
--- a/ql/src/test/results/clientpositive/join_merging.q.out
+++ b/ql/src/test/results/clientpositive/join_merging.q.out
@@ -3,11 +3,15 @@ from part p1 left outer join part p2 on p1.p_partkey = 
p2.p_partkey
   right outer join part p3 on p2.p_partkey = p3.p_partkey and 
               p1.p_size > 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select p1.p_size, p2.p_size 
 from part p1 left outer join part p2 on p1.p_partkey = p2.p_partkey 
   right outer join part p3 on p2.p_partkey = p3.p_partkey and 
               p1.p_size > 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -92,11 +96,15 @@ from part p1 left outer join part p2 on p1.p_partkey = 
p2.p_partkey
   right outer join part p3 on p2.p_partkey = p3.p_partkey and 
               p1.p_size > 10 and p1.p_size > p2.p_size + 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select p1.p_size, p2.p_size 
 from part p1 left outer join part p2 on p1.p_partkey = p2.p_partkey 
   right outer join part p3 on p2.p_partkey = p3.p_partkey and 
               p1.p_size > 10 and p1.p_size > p2.p_size + 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### 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/join_on_varchar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_on_varchar.q.out 
b/ql/src/test/results/clientpositive/join_on_varchar.q.out
index becd16a..f85f169 100644
--- a/ql/src/test/results/clientpositive/join_on_varchar.q.out
+++ b/ql/src/test/results/clientpositive/join_on_varchar.q.out
@@ -55,9 +55,15 @@ POSTHOOK: Lineage: tbl2_n2.c2 EXPRESSION []
 PREHOOK: query: explain
 select /*+ MAPJOIN(tbl2_n2) */ c1,c2 from tbl1_n3 join tbl2_n2 on (c1 = c2) 
order by c1,c2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n3
+PREHOOK: Input: default@tbl2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+ MAPJOIN(tbl2_n2) */ c1,c2 from tbl1_n3 join tbl2_n2 on (c1 = c2) 
order by c1,c2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n3
+POSTHOOK: Input: default@tbl2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_parse.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_parse.q.out 
b/ql/src/test/results/clientpositive/join_parse.q.out
index 77ae41d..718a228 100644
--- a/ql/src/test/results/clientpositive/join_parse.q.out
+++ b/ql/src/test/results/clientpositive/join_parse.q.out
@@ -3,11 +3,25 @@ select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key))
 inner join src src1 on src1.value =srcpart.value
 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
 select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key))
 inner join src src1 on src1.value =srcpart.value
 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 ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -124,11 +138,25 @@ select srcpart.key, src1.value from
 (srcpart inner join src on srcpart.key = src.key)
 inner join src src1 on src1.value =srcpart.value
 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
 select srcpart.key, src1.value from
 (srcpart inner join src on srcpart.key = src.key)
 inner join src src1 on src1.value =srcpart.value
 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 ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -245,11 +273,25 @@ select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key)
 inner join src src1 on src1.value =srcpart.value)
 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
 select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key)
 inner join src src1 on src1.value =srcpart.value)
 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 ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -367,12 +409,26 @@ select srcpart.key, src1.value from
 inner join src src1 on src1.value =srcpart.value)
 inner join src src2 on src2.key = src1.key
 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
 select srcpart.key, src1.value from
 ((srcpart inner join src on srcpart.key = src.key)
 inner join src src1 on src1.value =srcpart.value)
 inner join src src2 on src2.key = src1.key
 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 ####
 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/163caed7/ql/src/test/results/clientpositive/join_rc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_rc.q.out 
b/ql/src/test/results/clientpositive/join_rc.q.out
index 84644df..b56c8c0 100644
--- a/ql/src/test/results/clientpositive/join_rc.q.out
+++ b/ql/src/test/results/clientpositive/join_rc.q.out
@@ -38,10 +38,16 @@ PREHOOK: query: explain
 select join_rc1.key, join_rc2.value
 FROM join_rc1 JOIN join_rc2 ON join_rc1.key = join_rc2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@join_rc1
+PREHOOK: Input: default@join_rc2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select join_rc1.key, join_rc2.value
 FROM join_rc1 JOIN join_rc2 ON join_rc1.key = join_rc2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@join_rc1
+POSTHOOK: Input: default@join_rc2
+#### 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/join_reorder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder.q.out 
b/ql/src/test/results/clientpositive/join_reorder.q.out
index 95cbe87..ce75ed0 100644
--- a/ql/src/test/results/clientpositive/join_reorder.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder.q.out
@@ -49,9 +49,15 @@ POSTHOOK: Output: default@t3_n8
 PREHOOK: query: EXPLAIN FROM T1_n37 a JOIN src c ON c.key+1=a.key
 SELECT a.key, a.val, c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@t1_n37
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM T1_n37 a JOIN src c ON c.key+1=a.key
 SELECT a.key, a.val, c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@t1_n37
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -116,9 +122,15 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN FROM T1_n37 a JOIN src c ON c.key+1=a.key
 SELECT /*+ STREAMTABLE(a) */ a.key, a.val, c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@t1_n37
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM T1_n37 a JOIN src c ON c.key+1=a.key
 SELECT /*+ STREAMTABLE(a) */ a.key, a.val, c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@t1_n37
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -217,11 +229,19 @@ PREHOOK: query: EXPLAIN FROM T1_n37 a
   RIGHT OUTER JOIN T3_n8 c ON (c.val = a.val)
 SELECT a.key, b.key, a.val, c.val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n37
+PREHOOK: Input: default@t2_n24
+PREHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM T1_n37 a
   LEFT OUTER JOIN T2_n24 b ON (b.key=a.key)
   RIGHT OUTER JOIN T3_n8 c ON (c.val = a.val)
 SELECT a.key, b.key, a.val, c.val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n37
+POSTHOOK: Input: default@t2_n24
+POSTHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -314,11 +334,19 @@ PREHOOK: query: EXPLAIN FROM T1_n37 a
   RIGHT OUTER JOIN T3_n8 c ON (c.val = a.val)
 SELECT /*+ STREAMTABLE(a) */ a.key, b.key, a.val, c.val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n37
+PREHOOK: Input: default@t2_n24
+PREHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM T1_n37 a
   LEFT OUTER JOIN T2_n24 b ON (b.key=a.key)
   RIGHT OUTER JOIN T3_n8 c ON (c.val = a.val)
 SELECT /*+ STREAMTABLE(a) */ a.key, b.key, a.val, c.val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n37
+POSTHOOK: Input: default@t2_n24
+POSTHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -456,12 +484,20 @@ PREHOOK: query: EXPLAIN FROM UNIQUEJOIN
   PRESERVE T3_n8 c (c.key, c.val)
 SELECT a.key, b.key, c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n37
+PREHOOK: Input: default@t2_n24
+PREHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM UNIQUEJOIN
   PRESERVE T1_n37 a (a.key, a.val),
   PRESERVE T2_n24 b (b.key, b.val),
   PRESERVE T3_n8 c (c.key, c.val)
 SELECT a.key, b.key, c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n37
+POSTHOOK: Input: default@t2_n24
+POSTHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -530,12 +566,20 @@ PREHOOK: query: EXPLAIN FROM UNIQUEJOIN
   PRESERVE T3_n8 c (c.key, c.val)
 SELECT /*+ STREAMTABLE(b) */ a.key, b.key, c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n37
+PREHOOK: Input: default@t2_n24
+PREHOOK: Input: default@t3_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM UNIQUEJOIN
   PRESERVE T1_n37 a (a.key, a.val),
   PRESERVE T2_n24 b (b.key, b.val),
   PRESERVE T3_n8 c (c.key, c.val)
 SELECT /*+ STREAMTABLE(b) */ a.key, b.key, c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n37
+POSTHOOK: Input: default@t2_n24
+POSTHOOK: Input: default@t3_n8
+#### 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/join_reorder2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder2.q.out 
b/ql/src/test/results/clientpositive/join_reorder2.q.out
index 34b5f55..0569e9f 100644
--- a/ql/src/test/results/clientpositive/join_reorder2.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder2.q.out
@@ -68,12 +68,22 @@ FROM T1_n49 a JOIN T2_n30 b ON a.key = b.key
           JOIN T3_n10 c ON b.key = c.key
           JOIN T4_n3 d ON c.key = d.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n49
+PREHOOK: Input: default@t2_n30
+PREHOOK: Input: default@t3_n10
+PREHOOK: Input: default@t4_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+ STREAMTABLE(a) */ *
 FROM T1_n49 a JOIN T2_n30 b ON a.key = b.key
           JOIN T3_n10 c ON b.key = c.key
           JOIN T4_n3 d ON c.key = d.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n49
+POSTHOOK: Input: default@t2_n30
+POSTHOOK: Input: default@t3_n10
+POSTHOOK: Input: default@t4_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -192,12 +202,22 @@ FROM T1_n49 a JOIN T2_n30 b ON a.key = b.key
           JOIN T3_n10 c ON a.val = c.val
           JOIN T4_n3 d ON a.key + 1 = d.key + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n49
+PREHOOK: Input: default@t2_n30
+PREHOOK: Input: default@t3_n10
+PREHOOK: Input: default@t4_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+ STREAMTABLE(a) */ *
 FROM T1_n49 a JOIN T2_n30 b ON a.key = b.key
           JOIN T3_n10 c ON a.val = c.val
           JOIN T4_n3 d ON a.key + 1 = d.key + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n49
+POSTHOOK: Input: default@t2_n30
+POSTHOOK: Input: default@t3_n10
+POSTHOOK: Input: default@t4_n3
+#### 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/join_reorder3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder3.q.out 
b/ql/src/test/results/clientpositive/join_reorder3.q.out
index e1c1068..0292fe7 100644
--- a/ql/src/test/results/clientpositive/join_reorder3.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder3.q.out
@@ -68,12 +68,22 @@ FROM T1_n92 a JOIN T2_n57 b ON a.key = b.key
           JOIN T3_n21 c ON b.key = c.key
           JOIN T4_n10 d ON c.key = d.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n92
+PREHOOK: Input: default@t2_n57
+PREHOOK: Input: default@t3_n21
+PREHOOK: Input: default@t4_n10
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+ STREAMTABLE(a,c) */ *
 FROM T1_n92 a JOIN T2_n57 b ON a.key = b.key
           JOIN T3_n21 c ON b.key = c.key
           JOIN T4_n10 d ON c.key = d.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n92
+POSTHOOK: Input: default@t2_n57
+POSTHOOK: Input: default@t3_n21
+POSTHOOK: Input: default@t4_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -192,12 +202,22 @@ FROM T1_n92 a JOIN T2_n57 b ON a.key = b.key
           JOIN T3_n21 c ON a.val = c.val
           JOIN T4_n10 d ON a.key + 1 = d.key + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n92
+PREHOOK: Input: default@t2_n57
+PREHOOK: Input: default@t3_n21
+PREHOOK: Input: default@t4_n10
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+ STREAMTABLE(a,c) */ *
 FROM T1_n92 a JOIN T2_n57 b ON a.key = b.key
           JOIN T3_n21 c ON a.val = c.val
           JOIN T4_n10 d ON a.key + 1 = d.key + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n92
+POSTHOOK: Input: default@t2_n57
+POSTHOOK: Input: default@t3_n21
+POSTHOOK: Input: default@t4_n10
+#### 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/join_reorder4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder4.q.out 
b/ql/src/test/results/clientpositive/join_reorder4.q.out
index 963f4f0..8f12186 100644
--- a/ql/src/test/results/clientpositive/join_reorder4.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder4.q.out
@@ -48,8 +48,16 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@t3_n32
 PREHOOK: query: explain select /*+ STREAMTABLE(a) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n134
+PREHOOK: Input: default@t2_n80
+PREHOOK: Input: default@t3_n32
+#### A masked pattern was here ####
 POSTHOOK: query: explain select /*+ STREAMTABLE(a) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n134
+POSTHOOK: Input: default@t2_n80
+POSTHOOK: Input: default@t3_n32
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -141,8 +149,16 @@ POSTHOOK: Input: default@t3_n32
 2      12      2       22      2       12
 PREHOOK: query: explain select /*+ STREAMTABLE(b) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n134
+PREHOOK: Input: default@t2_n80
+PREHOOK: Input: default@t3_n32
+#### A masked pattern was here ####
 POSTHOOK: query: explain select /*+ STREAMTABLE(b) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n134
+POSTHOOK: Input: default@t2_n80
+POSTHOOK: Input: default@t3_n32
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -234,8 +250,16 @@ POSTHOOK: Input: default@t3_n32
 2      12      2       22      2       12
 PREHOOK: query: explain select /*+ STREAMTABLE(c) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n134
+PREHOOK: Input: default@t2_n80
+PREHOOK: Input: default@t3_n32
+#### A masked pattern was here ####
 POSTHOOK: query: explain select /*+ STREAMTABLE(c) */ a.*, b.*, c.* from 
T1_n134 a join T2_n80 b on a.key1=b.key2 join T3_n32 c on a.key1=c.key3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n134
+POSTHOOK: Input: default@t2_n80
+POSTHOOK: Input: default@t3_n32
+#### 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/join_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_star.q.out 
b/ql/src/test/results/clientpositive/join_star.q.out
index df97d43..24ef87f 100644
--- a/ql/src/test/results/clientpositive/join_star.q.out
+++ b/ql/src/test/results/clientpositive/join_star.q.out
@@ -128,8 +128,14 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@dim7
 PREHOOK: query: explain select m1, m2, f2 from fact join dim1 on 
fact.d1=dim1.f1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dim1
+PREHOOK: Input: default@fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1, m2, f2 from fact join dim1 on 
fact.d1=dim1.f1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dim1
+POSTHOOK: Input: default@fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4
@@ -225,8 +231,16 @@ POSTHOOK: Input: default@fact
 91     92      3
 PREHOOK: query: explain select m1, m2, f2, f4 from fact join dim1 on 
fact.d1=dim1.f1 join dim2 on fact.d2=dim2.f3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dim1
+PREHOOK: Input: default@dim2
+PREHOOK: Input: default@fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1, m2, f2, f4 from fact join dim1 on 
fact.d1=dim1.f1 join dim2 on fact.d2=dim2.f3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dim1
+POSTHOOK: Input: default@dim2
+POSTHOOK: Input: default@fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -351,8 +365,16 @@ POSTHOOK: Input: default@fact
 91     92      3       4
 PREHOOK: query: explain select m1, m2, f2, f4 from fact join dim1 on fact.d1= 
dim1.f1 join dim2 on dim1.f2 = dim2.f3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dim1
+PREHOOK: Input: default@dim2
+PREHOOK: Input: default@fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1, m2, f2, f4 from fact join dim1 on fact.d1= 
dim1.f1 join dim2 on dim1.f2 = dim2.f3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dim1
+POSTHOOK: Input: default@dim2
+POSTHOOK: Input: default@fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -477,8 +499,16 @@ POSTHOOK: Input: default@fact
 91     92      3       3
 PREHOOK: query: explain select m1, m2, f2, f4 from fact Left outer join dim1 
on fact.d1= dim1.f1 Left outer join dim2 on dim1.f2 = dim2.f3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dim1
+PREHOOK: Input: default@dim2
+PREHOOK: Input: default@fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1, m2, f2, f4 from fact Left outer join dim1 
on fact.d1= dim1.f1 Left outer join dim2 on dim1.f2 = dim2.f3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dim1
+POSTHOOK: Input: default@dim2
+POSTHOOK: Input: default@fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -599,6 +629,15 @@ PREHOOK: query: explain Select m1, m2, f2, f4, f6, f8, 
f10, f12, f14
  Left outer Join dim6 on  dim3.f6= dim6.f11
  Left outer Join dim7 on  dim6.f12 = dim7.f13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dim1
+PREHOOK: Input: default@dim2
+PREHOOK: Input: default@dim3
+PREHOOK: Input: default@dim4
+PREHOOK: Input: default@dim5
+PREHOOK: Input: default@dim6
+PREHOOK: Input: default@dim7
+PREHOOK: Input: default@fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain Select m1, m2, f2, f4, f6, f8, f10, f12, f14
  from fact 
  Left outer join dim1 on  fact.d1= dim1.f1
@@ -609,6 +648,15 @@ POSTHOOK: query: explain Select m1, m2, f2, f4, f6, f8, 
f10, f12, f14
  Left outer Join dim6 on  dim3.f6= dim6.f11
  Left outer Join dim7 on  dim6.f12 = dim7.f13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dim1
+POSTHOOK: Input: default@dim2
+POSTHOOK: Input: default@dim3
+POSTHOOK: Input: default@dim4
+POSTHOOK: Input: default@dim5
+POSTHOOK: Input: default@dim6
+POSTHOOK: Input: default@dim7
+POSTHOOK: Input: default@fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-22 is a root stage
   Stage-15 depends on stages: Stage-22

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_thrift.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_thrift.q.out 
b/ql/src/test/results/clientpositive/join_thrift.q.out
index 578aaff..5f422d2 100644
--- a/ql/src/test/results/clientpositive/join_thrift.q.out
+++ b/ql/src/test/results/clientpositive/join_thrift.q.out
@@ -20,12 +20,16 @@ FROM src_thrift s1
 JOIN src_thrift s2
 ON s1.aint = s2.aint
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT s1.aint, s2.lintstring
 FROM src_thrift s1
 JOIN src_thrift s2
 ON s1.aint = s2.aint
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+#### 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/join_vc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_vc.q.out 
b/ql/src/test/results/clientpositive/join_vc.q.out
index 7ae3801..5679dcc 100644
--- a/ql/src/test/results/clientpositive/join_vc.q.out
+++ b/ql/src/test/results/clientpositive/join_vc.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value 
from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value 
order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value 
from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value 
order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3
 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
@@ -154,10 +158,14 @@ PREHOOK: query: explain
 select t2.BLOCK__OFFSET__INSIDE__FILE
 from src t1 join src t2 on t1.key = t2.key where t1.key < 100 order by 
t2.BLOCK__OFFSET__INSIDE__FILE
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select t2.BLOCK__OFFSET__INSIDE__FILE
 from src t1 join src t2 on t1.key = t2.key where t1.key < 100 order by 
t2.BLOCK__OFFSET__INSIDE__FILE
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/join_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_view.q.out 
b/ql/src/test/results/clientpositive/join_view.q.out
index 5fc5c6f..c6241e1 100644
--- a/ql/src/test/results/clientpositive/join_view.q.out
+++ b/ql/src/test/results/clientpositive/join_view.q.out
@@ -40,8 +40,16 @@ POSTHOOK: Lineage: v.foo SIMPLE 
[(invites2)invites2.FieldSchema(name:foo, type:i
 Warning: Shuffle Join JOIN[8][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain select * from v where ds='2011-09-01'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@invites
+PREHOOK: Input: default@invites2
+PREHOOK: Input: default@v
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from v where ds='2011-09-01'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@invites
+POSTHOOK: Input: default@invites2
+POSTHOOK: Input: default@v
+#### 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/keyword_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/keyword_1.q.out 
b/ql/src/test/results/clientpositive/keyword_1.q.out
index 621a739..59a6f1e 100644
--- a/ql/src/test/results/clientpositive/keyword_1.q.out
+++ b/ql/src/test/results/clientpositive/keyword_1.q.out
@@ -14,8 +14,12 @@ POSTHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: Output: default@test_user
 PREHOOK: query: explain select `user` from test_user
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_user
+#### A masked pattern was here ####
 POSTHOOK: query: explain select `user` from test_user
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_user
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -62,8 +66,12 @@ POSTHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: Output: default@test_user
 PREHOOK: query: explain select role from test_user
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_user
+#### A masked pattern was here ####
 POSTHOOK: query: explain select role from test_user
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_user
+#### 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/kill_query.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/kill_query.q.out 
b/ql/src/test/results/clientpositive/kill_query.q.out
index c180023..32c3f6a 100644
--- a/ql/src/test/results/clientpositive/kill_query.q.out
+++ b/ql/src/test/results/clientpositive/kill_query.q.out
@@ -1,5 +1,6 @@
 PREHOOK: query: explain kill query 'query_1244656'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain kill query 'query_1244656'
 POSTHOOK: type: KILL QUERY
 STAGE DEPENDENCIES:
@@ -13,6 +14,7 @@ STAGE PLANS:
 
 PREHOOK: query: explain kill query 'query_123456677' 'query_1238503495'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain kill query 'query_123456677' 'query_1238503495'
 POSTHOOK: type: KILL QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/lateral_view_cp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_cp.q.out 
b/ql/src/test/results/clientpositive/lateral_view_cp.q.out
index fec8c81..c037a6b 100644
--- a/ql/src/test/results/clientpositive/lateral_view_cp.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_cp.q.out
@@ -22,8 +22,14 @@ POSTHOOK: Lineage: array_valued_src.key SIMPLE 
[(src)src.FieldSchema(name:key, t
 POSTHOOK: Lineage: array_valued_src.value EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select count(val) from (select a.key as key, b.value 
as array_val from src a join array_valued_src b on a.key=b.key) i lateral view 
explode (array_val) c as val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@array_valued_src
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(val) from (select a.key as key, b.value 
as array_val from src a join array_valued_src b on a.key=b.key) i lateral view 
explode (array_val) c as val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@array_valued_src
+POSTHOOK: Input: default@src
+#### 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/lateral_view_explode2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_explode2.q.out 
b/ql/src/test/results/clientpositive/lateral_view_explode2.q.out
index 911f660..00e9024 100644
--- a/ql/src/test/results/clientpositive/lateral_view_explode2.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_explode2.q.out
@@ -6,8 +6,12 @@ POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: explode2
 PREHOOK: query: EXPLAIN SELECT col1, col2 FROM src LATERAL VIEW 
explode2(array(1,2,3)) myTable AS col1, col2 group by col1, col2 LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT col1, col2 FROM src LATERAL VIEW 
explode2(array(1,2,3)) myTable AS col1, col2 group by col1, col2 LIMIT 3
 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/lateral_view_noalias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_noalias.q.out 
b/ql/src/test/results/clientpositive/lateral_view_noalias.q.out
index 25a85a8..d9ae650 100644
--- a/ql/src/test/results/clientpositive/lateral_view_noalias.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_noalias.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT myTab.* from src LATERAL VIEW 
explode(map('key1', 100, 'key2', 200)) myTab limit 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTab.* from src LATERAL VIEW 
explode(map('key1', 100, 'key2', 200)) myTab limit 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -59,8 +63,12 @@ key1 100
 key2   200
 PREHOOK: query: EXPLAIN SELECT explode(map('key1', 100, 'key2', 200)) from src 
limit 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT explode(map('key1', 100, 'key2', 200)) from 
src limit 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -112,8 +120,14 @@ POSTHOOK: Lineage: lv_noalias.key SCRIPT []
 POSTHOOK: Lineage: lv_noalias.value SCRIPT []
 PREHOOK: query: explain select * from lv_noalias a join lv_noalias b on 
a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_noalias
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from lv_noalias a join lv_noalias b on 
a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_noalias
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/lateral_view_onview.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_onview.q.out 
b/ql/src/test/results/clientpositive/lateral_view_onview.q.out
index 1ba94da..4482c7f 100644
--- a/ql/src/test/results/clientpositive/lateral_view_onview.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_onview.q.out
@@ -34,8 +34,14 @@ POSTHOOK: Lineage: lv_view.c3 SIMPLE 
[(lv_table_n0)lv_table_n0.FieldSchema(name:
 POSTHOOK: Lineage: lv_view.c4 SIMPLE 
[(lv_table_n0)lv_table_n0.FieldSchema(name:c4, type:char(1), comment:null), ]
 PREHOOK: query: EXPLAIN SELECT * FROM lv_view LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol SORT BY c1 ASC, myCol ASC LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n0
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM lv_view LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol SORT BY c1 ASC, myCol ASC LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n0
+POSTHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -133,8 +139,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable.* FROM lv_view LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n0
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable.* FROM lv_view LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n0
+POSTHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -202,8 +214,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM lv_view 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW 
explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n0
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM lv_view 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW 
explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n0
+POSTHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -337,8 +355,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable2.* FROM lv_view LATERAL VIEW 
explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW 
explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n0
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable2.* FROM lv_view LATERAL VIEW 
explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW 
explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n0
+POSTHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -525,9 +549,15 @@ POSTHOOK: Input: default@lv_view
 PREHOOK: query: EXPLAIN
 SELECT SIZE(c2),c3,TRIM(c1),c4,myCol from lv_view LATERAL VIEW 
explode(array(1,2,3)) myTab as myCol limit 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n0
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT SIZE(c2),c3,TRIM(c1),c4,myCol from lv_view LATERAL VIEW 
explode(array(1,2,3)) myTab as myCol limit 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n0
+POSTHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -658,8 +688,14 @@ POSTHOOK: Lineage: lv_table2.c1 SIMPLE []
 POSTHOOK: Lineage: lv_table2.c2 EXPRESSION []
 PREHOOK: query: EXPLAIN WITH lv_view1 AS (SELECT lv_table1_n0.*, c2 FROM 
lv_table1_n0 JOIN lv_table2 ON lv_table1_n0.c1 = lv_table2.c1), lv_view2 AS 
(SELECT * FROM lv_view1 LATERAL VIEW explode(c2) myTable AS myCol) SELECT * 
FROM lv_view2 SORT BY c1 ASC, myCol ASC LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table1_n0
+PREHOOK: Input: default@lv_table2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN WITH lv_view1 AS (SELECT lv_table1_n0.*, c2 FROM 
lv_table1_n0 JOIN lv_table2 ON lv_table1_n0.c1 = lv_table2.c1), lv_view2 AS 
(SELECT * FROM lv_view1 LATERAL VIEW explode(c2) myTable AS myCol) SELECT * 
FROM lv_view2 SORT BY c1 ASC, myCol ASC LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table1_n0
+POSTHOOK: Input: default@lv_table2
+#### 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/lateral_view_onview2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_onview2.q.out 
b/ql/src/test/results/clientpositive/lateral_view_onview2.q.out
index 9c825aa..55f869b 100644
--- a/ql/src/test/results/clientpositive/lateral_view_onview2.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_onview2.q.out
@@ -34,8 +34,14 @@ POSTHOOK: Lineage: lv_view.c3 SIMPLE 
[(lv_table_n1)lv_table_n1.FieldSchema(name:
 POSTHOOK: Lineage: lv_view.c4 SIMPLE 
[(lv_table_n1)lv_table_n1.FieldSchema(name:c4, type:char(1), comment:null), ]
 PREHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM lv_view 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW 
explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table_n1
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM lv_view 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW 
explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table_n1
+POSTHOOK: Input: default@lv_view
+#### 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/lateral_view_outer.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_outer.q.out 
b/ql/src/test/results/clientpositive/lateral_view_outer.q.out
index 342ed4b..3c6d932 100644
--- a/ql/src/test/results/clientpositive/lateral_view_outer.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_outer.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select * from src LATERAL VIEW OUTER explode(array()) C AS a limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from src LATERAL VIEW OUTER explode(array()) C AS a limit 10
 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
@@ -91,9 +95,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select * from src LATERAL VIEW OUTER explode(array(4,5)) C AS a limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from src LATERAL VIEW OUTER explode(array(4,5)) C AS a limit 10
 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
@@ -193,9 +201,13 @@ POSTHOOK: Lineage: array_valued.value EXPRESSION 
[(src)src.FieldSchema(name:key,
 PREHOOK: query: explain
 select * from array_valued LATERAL VIEW OUTER explode(value) C AS a limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@array_valued
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from array_valued LATERAL VIEW OUTER explode(value) C AS a limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@array_valued
+#### 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/lateral_view_ppd.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lateral_view_ppd.q.out 
b/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
index 25c94e2..9d4d921 100644
--- a/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
+++ b/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE key='0'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE key='0'
 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
@@ -84,8 +88,12 @@ val_0        2
 val_0  3
 PREHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE key='0' AND myCol=1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE key='0' AND myCol=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
@@ -165,8 +173,14 @@ val_0      1
 val_0  1
 PREHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM srcpart 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE ds='2008-04-08' 
AND hr="12" LIMIT 12
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM srcpart 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE ds='2008-04-08' 
AND hr="12" LIMIT 12
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -257,8 +271,12 @@ val_27     2
 val_27 3
 PREHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array(1,2,3)) 
myTable2 AS myCol2) a WHERE key='0'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array(1,2,3)) 
myTable2 AS myCol2) a WHERE key='0'
 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
@@ -419,8 +437,12 @@ val_0      3
 val_0  3
 PREHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol WHERE myCol > 1) a WHERE key='0'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol WHERE myCol > 1) a WHERE key='0'
 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/leftsemijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/leftsemijoin.q.out 
b/ql/src/test/results/clientpositive/leftsemijoin.q.out
index f8ae36b..f832a0e 100644
--- a/ql/src/test/results/clientpositive/leftsemijoin.q.out
+++ b/ql/src/test/results/clientpositive/leftsemijoin.q.out
@@ -111,8 +111,12 @@ POSTHOOK: Output: default@things_n1
 Warning: Shuffle Join JOIN[10][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain select part.p_type from part join (select p1.p_name 
from part p1, part p2 group by p1.p_name) pp ON pp.p_name = part.p_name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select part.p_type from part join (select p1.p_name 
from part p1, part p2 group by p1.p_name) pp ON pp.p_name = part.p_name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-1 depends on stages: Stage-2
@@ -256,8 +260,12 @@ STANDARD PLATED TIN
 STANDARD POLISHED STEEL
 PREHOOK: query: explain select part.p_type from part left join (select 
p1.p_name from part p1, part p2 group by p1.p_name) pp ON pp.p_name = 
part.p_name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select part.p_type from part left join (select 
p1.p_name from part p1, part p2 group by p1.p_name) pp ON pp.p_name = 
part.p_name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### 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/limit0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit0.q.out 
b/ql/src/test/results/clientpositive/limit0.q.out
index 2a33b4d..89a682b 100644
--- a/ql/src/test/results/clientpositive/limit0.q.out
+++ b/ql/src/test/results/clientpositive/limit0.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select key from src limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -14,8 +18,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from src where key = '238' limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src where key = '238' limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -28,8 +36,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from src where key = '238' limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from src where key = '238' limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -42,8 +54,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, count(src.value) from src group by 
src.key limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, count(src.value) from src group by 
src.key limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -56,8 +72,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from ( select key from src limit 3) sq1 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from ( select key from src limit 3) sq1 
limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### 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/limit_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown2.q.out 
b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
index edfc042..43d29aa 100644
--- a/ql/src/test/results/clientpositive/limit_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
@@ -3,11 +3,15 @@ select key, value, avg(key + 1) from src
 group by key, value
 order by key, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by key, value
 order by key, value limit 20
 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
@@ -102,11 +106,15 @@ select key, value, avg(key + 1) from src
 group by key, value
 order by key, value desc limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by key, value
 order by key, value desc limit 20
 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
@@ -201,11 +209,15 @@ select key, value, avg(key + 1) from src
 group by key, value
 order by key desc, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by key, value
 order by key desc, value limit 20
 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
@@ -300,11 +312,15 @@ select key, value, avg(key + 1) from src
 group by value, key
 order by key, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by value, key
 order by key, value limit 20
 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
@@ -399,11 +415,15 @@ select key, value, avg(key + 1) from src
 group by value, key
 order by key desc, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by value, key
 order by key desc, value limit 20
 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
@@ -498,11 +518,15 @@ select key, value, avg(key + 1) from src
 group by value, key
 order by key desc limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by value, key
 order by key desc limit 20
 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
@@ -597,11 +621,15 @@ select key, value, count(key + 1) as agg1 from src
 group by key, value
 order by key, value, agg1 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, count(key + 1) as agg1 from src 
 group by key, value
 order by key, value, agg1 limit 20
 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
@@ -715,11 +743,15 @@ select key, value, count(key + 1) as agg1 from src
 group by key, value
 order by key desc, value, agg1 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, count(key + 1) as agg1 from src 
 group by key, value
 order by key desc, value, agg1 limit 20
 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
@@ -833,11 +865,15 @@ select value, avg(key + 1) myavg from src
 group by value
 order by myavg, value desc limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select value, avg(key + 1) myavg from src
 group by value
 order by myavg, value desc limit 20
 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
@@ -954,11 +990,15 @@ select key, value, avg(key + 1) from src
 group by value, key with rollup
 order by key, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by value, key with rollup
 order by key, value limit 20
 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
@@ -1045,11 +1085,15 @@ select key, value, avg(key + 1) from src
 group by rollup(value, key)
 order by key, value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, avg(key + 1) from src
 group by rollup(value, key)
 order by key, value limit 20
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out 
b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
index 20bcd4b..0e2cff5 100644
--- a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
+++ b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select * from src a join src b on a.key=b.key limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from src a join src b on a.key=b.key limit 20
 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
@@ -72,8 +76,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value, sum(key) as sum from src group by value 
having sum > 100 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value, sum(key) as sum from src group by value 
having sum > 100 limit 20
 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
@@ -130,8 +138,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, L.* from (select * from src order by key) 
a lateral view explode(array(value, value)) L as v limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, L.* from (select * from src order by key) 
a lateral view explode(array(value, value)) L as v limit 10
 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
@@ -221,10 +233,16 @@ PREHOOK: query: EXPLAIN FROM src
 INSERT OVERWRITE TABLE dest_2 SELECT value, sum(key) GROUP BY value
 INSERT OVERWRITE TABLE dest_3 SELECT value, sum(key) GROUP BY value limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_2
+PREHOOK: Output: default@dest_3
 POSTHOOK: query: EXPLAIN FROM src
 INSERT OVERWRITE TABLE dest_2 SELECT value, sum(key) GROUP BY value
 INSERT OVERWRITE TABLE dest_3 SELECT value, sum(key) GROUP BY value limit 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_2
+POSTHOOK: Output: default@dest_3
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/lineage1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lineage1.q.out 
b/ql/src/test/results/clientpositive/lineage1.q.out
index beee129..0e32e39 100644
--- a/ql/src/test/results/clientpositive/lineage1.q.out
+++ b/ql/src/test/results/clientpositive/lineage1.q.out
@@ -19,6 +19,9 @@ FROM (SELECT t1.key, p1.value
       LEFT OUTER JOIN src p2
       ON (t2.key = p2.key)) j
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Output: default@dest_l1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest_l1
 SELECT j.*
@@ -32,6 +35,9 @@ FROM (SELECT t1.key, p1.value
       LEFT OUTER JOIN src p2
       ON (t2.key = p2.key)) j
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: default@dest_l1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-10

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
index 226e778..1ca4983 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
@@ -15,9 +15,16 @@ POSTHOOK: Output: default@list_bucketing_dynamic_part_n0
 PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n0 partition 
(ds='2008-04-08', hr) select key, value, hr from srcpart where ds='2008-04-08'
 PREHOOK: type: QUERY
+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: Output: default@list_bucketing_dynamic_part_n0@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n0 partition 
(ds='2008-04-08', hr) select key, value, hr from srcpart where ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, `hr`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -402,9 +409,15 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: query: explain extended
 select key, value from list_bucketing_dynamic_part_n0 where ds='2008-04-08' 
and hr='11' and key = "484"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_dynamic_part_n0
+PREHOOK: Input: default@list_bucketing_dynamic_part_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select key, value from list_bucketing_dynamic_part_n0 where ds='2008-04-08' 
and hr='11' and key = "484"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n0
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value`
 FROM `default`.`list_bucketing_dynamic_part_n0`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
index 11f7dc1..3508a6f 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n3 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@list_bucketing_static_part_n3@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n3 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@list_bucketing_static_part_n3@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -283,9 +287,15 @@ Storage Desc Params:
 PREHOOK: query: explain extended
 select key, value from list_bucketing_static_part_n3 where ds='2008-04-08' and 
hr='11' and value = "val_466"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_static_part_n3
+PREHOOK: Input: default@list_bucketing_static_part_n3@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select key, value from list_bucketing_static_part_n3 where ds='2008-04-08' and 
hr='11' and value = "val_466"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_static_part_n3
+POSTHOOK: Input: default@list_bucketing_static_part_n3@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, CAST('val_466' AS STRING) AS `value`
 FROM `default`.`list_bucketing_static_part_n3`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `value` = 'val_466'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
index f1c20e5..406a9c1 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_mul_col_n0 partition (ds = '2008-04-08', 
 hr = '11')
 select 1, key, 1, value, 1 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_mul_col_n0 partition (ds = '2008-04-08', 
 hr = '11')
 select 1, key, 1, value, 1 from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT 1 AS `_o__c0`, `key`, 1 AS `_o__c2`, `value`, 1 AS 
`_o__c4`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -290,10 +294,16 @@ PREHOOK: query: explain extended
 select * from list_bucketing_mul_col_n0 
 where ds='2008-04-08' and hr='11' and col2 = "466" and col4 = "val_466"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_mul_col_n0
+PREHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_mul_col_n0 
 where ds='2008-04-08' and hr='11' and col2 = "466" and col4 = "val_466"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_mul_col_n0
+POSTHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `col1`, CAST('466' AS STRING) AS `col2`, `col3`, 
CAST('val_466' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS 
`ds`, CAST('11' AS STRING) AS `hr`
 FROM `default`.`list_bucketing_mul_col_n0`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `col2` = '466' AND `col4` = 
'val_466'
@@ -421,10 +431,16 @@ PREHOOK: query: explain extended
 select * from list_bucketing_mul_col_n0 
 where ds='2008-04-08' and hr='11' and col2 = "382" and col4 = "val_382"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_mul_col_n0
+PREHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_mul_col_n0 
 where ds='2008-04-08' and hr='11' and col2 = "382" and col4 = "val_382"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_mul_col_n0
+POSTHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `col1`, CAST('382' AS STRING) AS `col2`, `col3`, 
CAST('val_382' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS 
`ds`, CAST('11' AS STRING) AS `hr`
 FROM `default`.`list_bucketing_mul_col_n0`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `col2` = '382' AND `col4` = 
'val_382'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
index b9f658a..a383a38 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_mul_col partition (ds = '2008-04-08',  
hr = '2013-01-23+18:00:99')
 select 1, key, 1, value, 1 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: 
default@list_bucketing_mul_col@ds=2008-04-08/hr=2013-01-23+18%3A00%3A99
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_mul_col partition (ds = '2008-04-08',  
hr = '2013-01-23+18:00:99')
 select 1, key, 1, value, 1 from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: 
default@list_bucketing_mul_col@ds=2008-04-08/hr=2013-01-23+18%3A00%3A99
 OPTIMIZED SQL: SELECT 1 AS `_o__c0`, `key`, 1 AS `_o__c2`, `value`, 1 AS 
`_o__c4`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -290,10 +294,16 @@ PREHOOK: query: explain extended
 select * from list_bucketing_mul_col 
 where ds='2008-04-08' and hr='2013-01-23+18:00:99' and col2 = "466" and col4 = 
"val_466"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_mul_col
+PREHOOK: Input: 
default@list_bucketing_mul_col@ds=2008-04-08/hr=2013-01-23+18%3A00%3A99
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_mul_col 
 where ds='2008-04-08' and hr='2013-01-23+18:00:99' and col2 = "466" and col4 = 
"val_466"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_mul_col
+POSTHOOK: Input: 
default@list_bucketing_mul_col@ds=2008-04-08/hr=2013-01-23+18%3A00%3A99
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `col1`, CAST('466' AS STRING) AS `col2`, `col3`, 
CAST('val_466' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS 
`ds`, CAST('2013-01-23+18:00:99' AS STRING) AS `hr`
 FROM `default`.`list_bucketing_mul_col`
 WHERE `ds` = '2008-04-08' AND `hr` = '2013-01-23+18:00:99' AND `col2` = '466' 
AND `col4` = 'val_466'

Reply via email to