http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join14.q.out 
b/ql/src/test/results/clientpositive/auto_join14.q.out
index 1d8a2da..5de29f1 100644
--- a/ql/src/test/results/clientpositive/auto_join14.q.out
+++ b/ql/src/test/results/clientpositive/auto_join14.q.out
@@ -10,10 +10,20 @@ PREHOOK: query: explain
 FROM src JOIN srcpart ON src.key = srcpart.key AND srcpart.ds = '2008-04-08' 
and src.key > 100
 INSERT OVERWRITE TABLE dest1_n83 SELECT src.key, 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: Output: default@dest1_n83
 POSTHOOK: query: explain
 FROM src JOIN srcpart ON src.key = srcpart.key AND srcpart.ds = '2008-04-08' 
and src.key > 100
 INSERT OVERWRITE TABLE dest1_n83 SELECT src.key, 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: Output: default@dest1_n83
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join15.q.out 
b/ql/src/test/results/clientpositive/auto_join15.q.out
index fd0dfd3..afadf5d 100644
--- a/ql/src/test/results/clientpositive/auto_join15.q.out
+++ b/ql/src/test/results/clientpositive/auto_join15.q.out
@@ -6,6 +6,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -14,6 +16,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join16.q.out 
b/ql/src/test/results/clientpositive/auto_join16.q.out
index eb124c2..fd8c866 100644
--- a/ql/src/test/results/clientpositive/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/auto_join16.q.out
@@ -6,6 +6,8 @@ JOIN src tab
 ON (subq.key = tab.key and subq.key > 20 and subq.value = tab.value) 
 where tab.value < 200
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT sum(hash(subq.key, tab.value)) 
 FROM 
@@ -14,6 +16,8 @@ JOIN src tab
 ON (subq.key = tab.key and subq.key > 20 and subq.value = tab.value) 
 where tab.value < 200
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join17.q.out 
b/ql/src/test/results/clientpositive/auto_join17.q.out
index f2a1615..e4b2604 100644
--- a/ql/src/test/results/clientpositive/auto_join17.q.out
+++ b/ql/src/test/results/clientpositive/auto_join17.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n41 SELECT src1.*, src2.*
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n41
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n41 SELECT src1.*, src2.*
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n41
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join18.q.out 
b/ql/src/test/results/clientpositive/auto_join18.q.out
index 7e8de94..4006cee 100644
--- a/ql/src/test/results/clientpositive/auto_join18.q.out
+++ b/ql/src/test/results/clientpositive/auto_join18.q.out
@@ -11,6 +11,9 @@ PREHOOK: query: explain
  ) b 
  ON (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
  SELECT sum(hash(a.key, a.value, b.key, b.value))
  FROM 
@@ -24,6 +27,9 @@ POSTHOOK: query: explain
  ) b 
  ON (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
index 9c0bffd..82c5cfb 100644
--- a/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
@@ -12,6 +12,9 @@ PREHOOK: query: explain
  ) b 
  ON (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
  SELECT sum(hash(a.key, a.value, b.key, b.value1,  b.value2))
  FROM 
@@ -26,6 +29,9 @@ POSTHOOK: query: explain
  ) b 
  ON (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join19.q.out 
b/ql/src/test/results/clientpositive/auto_join19.q.out
index 3d32ae4..7f3ffaa 100644
--- a/ql/src/test/results/clientpositive/auto_join19.q.out
+++ b/ql/src/test/results/clientpositive/auto_join19.q.out
@@ -11,11 +11,25 @@ FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n18 SELECT src1.key, src2.value 
 where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' 
or src1.hr = '11')
 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
+PREHOOK: Output: default@dest1_n18
 POSTHOOK: query: explain
 FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n18 SELECT src1.key, src2.value 
 where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' 
or src1.hr = '11')
 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
+POSTHOOK: Output: default@dest1_n18
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join19_inclause.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join19_inclause.q.out 
b/ql/src/test/results/clientpositive/auto_join19_inclause.q.out
index 3f0a32f..7a11635 100644
--- a/ql/src/test/results/clientpositive/auto_join19_inclause.q.out
+++ b/ql/src/test/results/clientpositive/auto_join19_inclause.q.out
@@ -11,11 +11,25 @@ FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n11 SELECT src1.key, src2.value 
 where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' 
or src1.hr = '11')
 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
+PREHOOK: Output: default@dest1_n11
 POSTHOOK: query: explain
 FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n11 SELECT src1.key, src2.value 
 where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' 
or src1.hr = '11')
 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
+POSTHOOK: Output: default@dest1_n11
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out 
b/ql/src/test/results/clientpositive/auto_join2.q.out
index a7dd6a2..10f06e0 100644
--- a/ql/src/test/results/clientpositive/auto_join2.q.out
+++ b/ql/src/test/results/clientpositive/auto_join2.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON 
(src1.key + src2.key = src3.key)
 INSERT OVERWRITE TABLE dest_j2 SELECT src1.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j2
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON 
(src1.key + src2.key = src3.key)
 INSERT OVERWRITE TABLE dest_j2 SELECT src1.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j2
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-7 depends on stages: Stage-9

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join20.q.out 
b/ql/src/test/results/clientpositive/auto_join20.q.out
index f512c7f..42c88bb 100644
--- a/ql/src/test/results/clientpositive/auto_join20.q.out
+++ b/ql/src/test/results/clientpositive/auto_join20.q.out
@@ -6,6 +6,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10) RIGHT OUT
 SORT BY k1,v1,k2,v2,k3,v3
 )a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(hash(a.k1,a.v1,a.k2,a.v2,a.k3,a.v3))
 from (
@@ -14,6 +16,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10) RIGHT OUT
 SORT BY k1,v1,k2,v2,k3,v3
 )a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -146,6 +150,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.k
 SORT BY k1,v1,k2,v2,k3,v3
 )a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(hash(a.k1,a.v1,a.k2,a.v2,a.k3,a.v3))
 from (
@@ -154,6 +160,8 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.k
 SORT BY k1,v1,k2,v2,k3,v3
 )a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join21.q.out 
b/ql/src/test/results/clientpositive/auto_join21.q.out
index 84a4627..ffbcf43 100644
--- a/ql/src/test/results/clientpositive/auto_join21.q.out
+++ b/ql/src/test/results/clientpositive/auto_join21.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join22.q.out 
b/ql/src/test/results/clientpositive/auto_join22.q.out
index 7b35422..65d91b4 100644
--- a/ql/src/test/results/clientpositive/auto_join22.q.out
+++ b/ql/src/test/results/clientpositive/auto_join22.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 SELECT sum(hash(src5.src1_value)) FROM (SELECT src3.*, src4.value as 
src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as 
src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = 
src2.key) src3 ON src3.src1_key = src4.key) src5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT sum(hash(src5.src1_value)) FROM (SELECT src3.*, src4.value as 
src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as 
src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = 
src2.key) src3 ON src3.src1_key = src4.key) src5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join23.q.out 
b/ql/src/test/results/clientpositive/auto_join23.q.out
index 8fa5787..ed4656b 100644
--- a/ql/src/test/results/clientpositive/auto_join23.q.out
+++ b/ql/src/test/results/clientpositive/auto_join23.q.out
@@ -2,9 +2,13 @@ Warning: Map Join MAPJOIN[14][bigTable=?] in task 
'Stage-2:MAPRED' is a cross pr
 PREHOOK: query: explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 
SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 
SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join24.q.out 
b/ql/src/test/results/clientpositive/auto_join24.q.out
index 2e6d8c2..92f9cab 100644
--- a/ql/src/test/results/clientpositive/auto_join24.q.out
+++ b/ql/src/test/results/clientpositive/auto_join24.q.out
@@ -21,9 +21,13 @@ POSTHOOK: Lineage: tst1_n2.key SIMPLE 
[(src)a.FieldSchema(name:key, type:string,
 PREHOOK: query: explain 
 SELECT sum(a.cnt)  FROM tst1_n2 a JOIN tst1_n2 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tst1_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 SELECT sum(a.cnt)  FROM tst1_n2 a JOIN tst1_n2 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst1_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/b356aae0/ql/src/test/results/clientpositive/auto_join26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join26.q.out 
b/ql/src/test/results/clientpositive/auto_join26.q.out
index 931c154..9695ad0 100644
--- a/ql/src/test/results/clientpositive/auto_join26.q.out
+++ b/ql/src/test/results/clientpositive/auto_join26.q.out
@@ -10,10 +10,16 @@ PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest_j1 
 SELECT x.key, count(1) FROM src1 x JOIN src y ON (x.key = y.key) group by x.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Output: default@dest_j1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest_j1 
 SELECT x.key, count(1) FROM src1 x JOIN src y ON (x.key = y.key) group by x.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: default@dest_j1
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-2 depends on stages: Stage-7

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join27.q.out 
b/ql/src/test/results/clientpositive/auto_join27.q.out
index eeb1f73..4633b6a 100644
--- a/ql/src/test/results/clientpositive/auto_join27.q.out
+++ b/ql/src/test/results/clientpositive/auto_join27.q.out
@@ -10,6 +10,8 @@ JOIN
 (SELECT src.key as k, src.value as v from src) src3
 ON src_12.key = src3.k AND src3.k < 200
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT count(1)
 FROM
@@ -22,6 +24,8 @@ JOIN
 (SELECT src.key as k, src.value as v from src) src3
 ON src_12.key = src3.k AND src3.k < 200
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-7 depends on stages: Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join28.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join28.q.out 
b/ql/src/test/results/clientpositive/auto_join28.q.out
index d93f397..4a22edc 100644
--- a/ql/src/test/results/clientpositive/auto_join28.q.out
+++ b/ql/src/test/results/clientpositive/auto_join28.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -103,9 +107,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -208,9 +216,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -313,9 +325,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join29.q.out 
b/ql/src/test/results/clientpositive/auto_join29.q.out
index a784add..f75908a 100644
--- a/ql/src/test/results/clientpositive/auto_join29.q.out
+++ b/ql/src/test/results/clientpositive/auto_join29.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -611,9 +615,13 @@ NULL       NULL    NULL    NULL    98      val_98
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -1224,9 +1232,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -1849,9 +1861,13 @@ NULL     NULL    98      val_98  NULL    NULL
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -2471,9 +2487,13 @@ NULL     NULL    NULL    NULL    98      val_98
 PREHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -2575,9 +2595,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -3188,9 +3212,13 @@ NULL     NULL    NULL    NULL    98      val_98
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -3301,9 +3329,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND 
src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, 
src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6
@@ -3439,9 +3471,13 @@ NULL     NULL    9       val_9   9       val_9
 PREHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) 
SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) 
SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join3.q.out 
b/ql/src/test/results/clientpositive/auto_join3.q.out
index 68aa4c2..f2e5ecd 100644
--- a/ql/src/test/results/clientpositive/auto_join3.q.out
+++ b/ql/src/test/results/clientpositive/auto_join3.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON 
(src1.key = src3.key)
 INSERT OVERWRITE TABLE dest1_n140 SELECT src1.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n140
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON 
(src1.key = src3.key)
 INSERT OVERWRITE TABLE dest1_n140 SELECT src1.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n140
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-6 depends on stages: Stage-7

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join31.q.out 
b/ql/src/test/results/clientpositive/auto_join31.q.out
index ffee3de..b0704e9 100644
--- a/ql/src/test/results/clientpositive/auto_join31.q.out
+++ b/ql/src/test/results/clientpositive/auto_join31.q.out
@@ -9,6 +9,8 @@ JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM
 (SELECT src.* FROM src sort by key) x
@@ -20,6 +22,8 @@ JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out 
b/ql/src/test/results/clientpositive/auto_join32.q.out
index 0e1d3c6..8835201 100644
--- a/ql/src/test/results/clientpositive/auto_join32.q.out
+++ b/ql/src/test/results/clientpositive/auto_join32.q.out
@@ -19,11 +19,17 @@ from studenttab10k s join votertab10k v
 on (s.name = v.name)
 group by s.name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@studenttab10k
+PREHOOK: Input: default@votertab10k
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.name, count(distinct registration)
 from studenttab10k s join votertab10k v
 on (s.name = v.name)
 group by s.name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@studenttab10k
+POSTHOOK: Input: default@votertab10k
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5
@@ -145,11 +151,17 @@ from studenttab10k_smb s join votertab10k_smb v
 on (s.name = v.name)
 group by s.name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@studenttab10k_smb
+PREHOOK: Input: default@votertab10k_smb
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.name, count(distinct registration)
 from studenttab10k_smb s join votertab10k_smb v
 on (s.name = v.name)
 group by s.name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@studenttab10k_smb
+POSTHOOK: Input: default@votertab10k_smb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -256,11 +268,17 @@ from studenttab10k_smb s join votertab10k_smb v
 on (s.name = v.name)
 group by s.name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@studenttab10k_smb
+PREHOOK: Input: default@votertab10k_smb
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.name, count(distinct registration)
 from studenttab10k_smb s join votertab10k_smb v
 on (s.name = v.name)
 group by s.name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@studenttab10k_smb
+POSTHOOK: Input: default@votertab10k_smb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -387,6 +405,9 @@ where s.p = 'bar'
 and v.p = 'bar'
 group by s.name
 PREHOOK: type: QUERY
+PREHOOK: Input: default@studenttab10k_part
+PREHOOK: Input: default@votertab10k_part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s.name, count(distinct registration)
 from studenttab10k_part s join votertab10k_part v
 on (s.name = v.name)
@@ -394,6 +415,9 @@ where s.p = 'bar'
 and v.p = 'bar'
 group by s.name
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@studenttab10k_part
+POSTHOOK: Input: default@votertab10k_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/b356aae0/ql/src/test/results/clientpositive/auto_join33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join33.q.out 
b/ql/src/test/results/clientpositive/auto_join33.q.out
index ec6018d..513373f 100644
--- a/ql/src/test/results/clientpositive/auto_join33.q.out
+++ b/ql/src/test/results/clientpositive/auto_join33.q.out
@@ -5,6 +5,8 @@ SELECT * FROM
   (SELECT * FROM src WHERE key+2 < 10) b
     ON a.key+1=b.key+2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 SELECT * FROM
   (SELECT * FROM src WHERE key+1 < 10) a
@@ -12,6 +14,8 @@ SELECT * FROM
   (SELECT * FROM src WHERE key+2 < 10) b
     ON a.key+1=b.key+2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out 
b/ql/src/test/results/clientpositive/auto_join4.q.out
index c8b778c..6bb6624 100644
--- a/ql/src/test/results/clientpositive/auto_join4.q.out
+++ b/ql/src/test/results/clientpositive/auto_join4.q.out
@@ -21,6 +21,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n115 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n115
 POSTHOOK: query: explain
 FROM (
  FROM 
@@ -36,6 +38,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n115 SELECT c.c1, c.c2, c.c3, c.c4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n115
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out 
b/ql/src/test/results/clientpositive/auto_join5.q.out
index 79b4dec..3d3a4e9 100644
--- a/ql/src/test/results/clientpositive/auto_join5.q.out
+++ b/ql/src/test/results/clientpositive/auto_join5.q.out
@@ -21,6 +21,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n64 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n64
 POSTHOOK: query: explain
 FROM (
  FROM 
@@ -36,6 +38,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n64 SELECT c.c1, c.c2, c.c3, c.c4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n64
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join6.q.out 
b/ql/src/test/results/clientpositive/auto_join6.q.out
index 1f652fc..43fc683 100644
--- a/ql/src/test/results/clientpositive/auto_join6.q.out
+++ b/ql/src/test/results/clientpositive/auto_join6.q.out
@@ -21,6 +21,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n9 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n9
 POSTHOOK: query: explain
 FROM (
  FROM 
@@ -36,6 +38,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n9 SELECT c.c1, c.c2, c.c3, c.c4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n9
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out 
b/ql/src/test/results/clientpositive/auto_join7.q.out
index 7ca170a..45223be 100644
--- a/ql/src/test/results/clientpositive/auto_join7.q.out
+++ b/ql/src/test/results/clientpositive/auto_join7.q.out
@@ -26,6 +26,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n147 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n147
 POSTHOOK: query: explain
 FROM (
  FROM 
@@ -46,6 +48,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n147 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n147
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out 
b/ql/src/test/results/clientpositive/auto_join8.q.out
index b959822..2f64b4a 100644
--- a/ql/src/test/results/clientpositive/auto_join8.q.out
+++ b/ql/src/test/results/clientpositive/auto_join8.q.out
@@ -21,6 +21,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n3 SELECT c.c1, c.c2, c.c3, c.c4 where c.c3 IS 
NULL AND c.c1 IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n3
 POSTHOOK: query: explain
 FROM (
  FROM 
@@ -36,6 +38,8 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1_n3 SELECT c.c1, c.c2, c.c3, c.c4 where c.c3 IS 
NULL AND c.c1 IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n3
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join9.q.out 
b/ql/src/test/results/clientpositive/auto_join9.q.out
index 80c1649..6d74b36 100644
--- a/ql/src/test/results/clientpositive/auto_join9.q.out
+++ b/ql/src/test/results/clientpositive/auto_join9.q.out
@@ -10,10 +10,18 @@ PREHOOK: query: explain
 FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n142 SELECT src1.key, src2.value where src1.ds = 
'2008-04-08' and src1.hr = '12'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@dest1_n142
 POSTHOOK: query: explain
 FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n142 SELECT src1.key, src2.value where src1.ds = 
'2008-04-08' and src1.hr = '12'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@dest1_n142
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out 
b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
index e06171d..0932476 100644
--- a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
@@ -70,6 +70,9 @@ JOIN `orderpayment_small` `order_city` ON 
`order_city`.`cityid` = `orderpayment`
 JOIN `user_small` `user` ON `user`.`userid` = `orderpayment`.`userid`
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orderpayment_small
+PREHOOK: Input: default@user_small
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT
      `dim_pay_date`.`date`
     , `deal`.`dealid`
@@ -80,6 +83,9 @@ JOIN `orderpayment_small` `order_city` ON 
`order_city`.`cityid` = `orderpayment`
 JOIN `user_small` `user` ON `user`.`userid` = `orderpayment`.`userid`
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orderpayment_small
+POSTHOOK: Input: default@user_small
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t4`.`date`, `t6`.`dealid`
 FROM (SELECT `userid`
 FROM `default`.`user_small`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_stats.q.out 
b/ql/src/test/results/clientpositive/auto_join_stats.q.out
index 321c977..8655422 100644
--- a/ql/src/test/results/clientpositive/auto_join_stats.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_stats.q.out
@@ -24,8 +24,14 @@ POSTHOOK: Input: default@smalltable_n0
 POSTHOOK: Output: default@smalltable_n0
 PREHOOK: query: explain select src1.key, src2.key, smalltable_n0.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable_n0 ON (src1.key + 
src2.key = smalltable_n0.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smalltable_n0
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src1.key, src2.key, smalltable_n0.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable_n0 ON (src1.key + 
src2.key = smalltable_n0.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smalltable_n0
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage , consists of Stage-10, Stage-11, Stage-1
   Stage-10 has a backup stage: Stage-1
@@ -288,8 +294,16 @@ POSTHOOK: Input: default@smalltable_n0
 POSTHOOK: Output: default@smalltable_n0
 PREHOOK: query: explain select src1.key, src2.key, smalltable_n0.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable_n0 ON (src1.key + 
src2.key = smalltable_n0.key) JOIN smalltable2_n0 ON (src1.key + src2.key = 
smalltable2_n0.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smalltable2_n0
+PREHOOK: Input: default@smalltable_n0
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src1.key, src2.key, smalltable_n0.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable_n0 ON (src1.key + 
src2.key = smalltable_n0.key) JOIN smalltable2_n0 ON (src1.key + src2.key = 
smalltable2_n0.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smalltable2_n0
+POSTHOOK: Input: default@smalltable_n0
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-9 is a root stage , consists of Stage-11, Stage-12, Stage-1
   Stage-11 has a backup stage: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join_stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join_stats2.q.out 
b/ql/src/test/results/clientpositive/auto_join_stats2.q.out
index 1b274a1..68f5e4b 100644
--- a/ql/src/test/results/clientpositive/auto_join_stats2.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_stats2.q.out
@@ -17,8 +17,14 @@ POSTHOOK: Output: default@smalltable
 Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
 PREHOOK: query: explain select src1.key, src2.key, smalltable.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + 
src2.key = smalltable.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smalltable
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src1.key, src2.key, smalltable.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + 
src2.key = smalltable.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smalltable
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -158,8 +164,16 @@ POSTHOOK: Input: default@smalltable
 POSTHOOK: Output: default@smalltable
 PREHOOK: query: explain select src1.key, src2.key, smalltable.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + 
src2.key = smalltable.key) JOIN smalltable2 ON (src1.key + src2.key = 
smalltable2.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smalltable
+PREHOOK: Input: default@smalltable2
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src1.key, src2.key, smalltable.key from src 
src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + 
src2.key = smalltable.key) JOIN smalltable2 ON (src1.key + src2.key = 
smalltable2.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smalltable
+POSTHOOK: Input: default@smalltable2
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-6 depends on stages: Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out 
b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
index ad5e187..5a0cf21 100644
--- a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select a.* from src a join src b on a.key=b.key order by key, value limit 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.* from src a join src b on a.key=b.key order by key, value limit 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage , consists of Stage-7, Stage-8, Stage-1
   Stage-7 has a backup stage: Stage-1
@@ -260,9 +264,13 @@ RUN: Stage-2:MAPRED
 PREHOOK: query: explain
 select a.* from src a join src b on a.key=b.key join src c on a.value=c.value 
order by a.key, a.value limit 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.* from src a join src b on a.key=b.key join src c on a.value=c.value 
order by a.key, a.value limit 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-11 is a root stage , consists of Stage-14, Stage-15, Stage-1
   Stage-14 has a backup stage: Stage-1
@@ -652,9 +660,13 @@ RUN: Stage-3:MAPRED
 PREHOOK: query: explain
 select a.* from src a join src b on a.key=b.key join src c on a.value=c.value 
where a.key>100 order by a.key, a.value limit 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.* from src a join src b on a.key=b.key join src c on a.value=c.value 
where a.key>100 order by a.key, a.value limit 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-11 is a root stage , consists of Stage-14, Stage-15, Stage-1
   Stage-14 has a backup stage: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out 
b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
index 6860b47..726f387 100644
--- a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
+++ b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out
@@ -236,9 +236,17 @@ Storage Desc Params:
 PREHOOK: query: EXPLAIN
 SELECT * FROM episodes_partitioned_n0 WHERE doctor_pt > 6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@episodes_partitioned_n0
+PREHOOK: Input: default@episodes_partitioned_n0@doctor_pt=11
+PREHOOK: Input: default@episodes_partitioned_n0@doctor_pt=9
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM episodes_partitioned_n0 WHERE doctor_pt > 6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@episodes_partitioned_n0
+POSTHOOK: Input: default@episodes_partitioned_n0@doctor_pt=11
+POSTHOOK: Input: default@episodes_partitioned_n0@doctor_pt=9
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
@@ -325,9 +333,17 @@ episodes_partitioned_n0.title      
episodes_partitioned_n0.air_date        episodes_partitio
 PREHOOK: query: EXPLAIN
 SELECT * FROM episodes_partitioned_n0 WHERE doctor_pt > 6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@episodes_partitioned_n0
+PREHOOK: Input: default@episodes_partitioned_n0@doctor_pt=11
+PREHOOK: Input: default@episodes_partitioned_n0@doctor_pt=9
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM episodes_partitioned_n0 WHERE doctor_pt > 6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@episodes_partitioned_n0
+POSTHOOK: Input: default@episodes_partitioned_n0@doctor_pt=11
+POSTHOOK: Input: default@episodes_partitioned_n0@doctor_pt=9
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/explain_outputs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/explain_outputs.q.out 
b/ql/src/test/results/clientpositive/beeline/explain_outputs.q.out
index 1837756..390ce26 100644
--- a/ql/src/test/results/clientpositive/beeline/explain_outputs.q.out
+++ b/ql/src/test/results/clientpositive/beeline/explain_outputs.q.out
@@ -35,9 +35,15 @@ POSTHOOK: Lineage: t2_n14.id SCRIPT []
 PREHOOK: query: explain
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n22
+PREHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n22
+POSTHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -241,9 +247,15 @@ POSTHOOK: Input: default@t2_n14
 PREHOOK: query: explain reoptimization
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n22
+PREHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n22
+POSTHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
 
b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
index a0f916b..6725784 100644
--- 
a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
+++ 
b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
@@ -107,9 +107,15 @@ totalSize  326
 PREHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -155,6 +161,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -162,6 +170,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -247,9 +257,13 @@ POSTHOOK: Input: default@cmv_basetable_n10
 PREHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view2_n4
+PREHOOK: Output: default@cmv_mat_view2_n4
 POSTHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view2_n4
+POSTHOOK: Output: default@cmv_mat_view2_n4
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -276,6 +290,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -283,6 +300,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -376,6 +396,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -383,6 +405,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out 
b/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
index ee07e64..1f529c7 100644
--- a/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
+++ b/ql/src/test/results/clientpositive/beeline/select_dummy_source.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select 'a', 100
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 'a', 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -34,9 +38,13 @@ a    100
 PREHOOK: query: explain
 select 1 + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -67,9 +75,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: query: explain
 select explode(array('a', 'b'))
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select explode(array('a', 'b'))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -120,9 +132,13 @@ b
 PREHOOK: query: explain
 select 'a', 100
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 'a', 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -153,9 +169,13 @@ a  100
 PREHOOK: query: explain
 select 1 + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -186,9 +206,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: query: explain
 select explode(array('a', 'b'))
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select explode(array('a', 'b'))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -227,9 +251,13 @@ b
 PREHOOK: query: explain
 select 2 + 3,x from (select 1 + 2 x) X
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 2 + 3,x from (select 1 + 2 x) X
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
index fa834ac..9923b58 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
@@ -95,9 +95,15 @@ POSTHOOK: Input: default@smb_bucket_1_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -148,9 +154,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -203,9 +215,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -257,9 +275,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -316,9 +340,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a join smb_bucket_2_n3 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -369,9 +399,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a left outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -424,9 +460,15 @@ POSTHOOK: Input: default@smb_bucket_2_n3
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a right outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -478,9 +520,15 @@ NULL       NULL    30      val_30
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n3
+PREHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n3 a full outer join 
smb_bucket_2_n3 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n3
+POSTHOOK: Input: default@smb_bucket_2_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
index e5094f0..a9ff162 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out
@@ -60,6 +60,10 @@ on (a.ds = '1' and b.ds = '2' and
     a.postid = b.postid and
     a.type = b.type)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tmp_smb_bucket_10
+PREHOOK: Input: default@tmp_smb_bucket_10@ds=1
+PREHOOK: Input: default@tmp_smb_bucket_10@ds=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from tmp_smb_bucket_10 a join tmp_smb_bucket_10 b 
 on (a.ds = '1' and b.ds = '2' and
@@ -68,6 +72,10 @@ on (a.ds = '1' and b.ds = '2' and
     a.postid = b.postid and
     a.type = b.type)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmp_smb_bucket_10
+POSTHOOK: Input: default@tmp_smb_bucket_10@ds=1
+POSTHOOK: Input: default@tmp_smb_bucket_10@ds=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
index 51932e9..54bc77c 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
@@ -43,9 +43,19 @@ POSTHOOK: Output: default@test_table3_n1
 PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n1 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n1 a JOIN test_table2_n1 b ON 
a.key = b.key AND a.ds = '1' AND b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n1
+PREHOOK: Input: default@test_table1_n1@ds=1
+PREHOOK: Input: default@test_table2_n1
+PREHOOK: Input: default@test_table2_n1@ds=1
+PREHOOK: Output: default@test_table3_n1@ds=1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n1 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n1 a JOIN test_table2_n1 b ON 
a.key = b.key AND a.ds = '1' AND b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n1
+POSTHOOK: Input: default@test_table1_n1@ds=1
+POSTHOOK: Input: default@test_table2_n1
+POSTHOOK: Input: default@test_table2_n1@ds=1
+POSTHOOK: Output: default@test_table3_n1@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1880,8 +1890,14 @@ POSTHOOK: Input: default@test_table3_n1@ds=1
 498    val_498 1
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n1
+PREHOOK: Input: default@test_table1_n1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n1
+POSTHOOK: Input: default@test_table1_n1@ds=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1991,8 +2007,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3_n1
+PREHOOK: Input: default@test_table3_n1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3_n1 
TABLESAMPLE(BUCKET 2 OUT OF 16)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3_n1
+POSTHOOK: Input: default@test_table3_n1@ds=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
index c635658..b637d26 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_12.q.out
@@ -55,9 +55,23 @@ POSTHOOK: Output: default@test_table3_n4
 PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n6 a JOIN test_table2_n6 b ON 
a.key = b.key AND a.ds = '1' AND b.ds >= '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n6
+PREHOOK: Input: default@test_table1_n6@ds=1
+PREHOOK: Input: default@test_table2_n6
+PREHOOK: Input: default@test_table2_n6@ds=1
+PREHOOK: Input: default@test_table2_n6@ds=2
+PREHOOK: Input: default@test_table2_n6@ds=3
+PREHOOK: Output: default@test_table3_n4@ds=1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '1') SELECT /*+ 
MAPJOIN(b) */ a.key, b.value FROM test_table1_n6 a JOIN test_table2_n6 b ON 
a.key = b.key AND a.ds = '1' AND b.ds >= '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n6
+POSTHOOK: Input: default@test_table1_n6@ds=1
+POSTHOOK: Input: default@test_table2_n6
+POSTHOOK: Input: default@test_table2_n6@ds=1
+POSTHOOK: Input: default@test_table2_n6@ds=2
+POSTHOOK: Input: default@test_table2_n6@ds=3
+POSTHOOK: Output: default@test_table3_n4@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -255,10 +269,20 @@ PREHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3_n4 a 
JOIN test_table1_n6 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n6
+PREHOOK: Input: default@test_table1_n6@ds=1
+PREHOOK: Input: default@test_table3_n4
+PREHOOK: Input: default@test_table3_n4@ds=1
+PREHOOK: Output: default@test_table3_n4@ds=2
 POSTHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3_n4 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3_n4 a 
JOIN test_table1_n6 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n6
+POSTHOOK: Input: default@test_table1_n6@ds=1
+POSTHOOK: Input: default@test_table3_n4
+POSTHOOK: Input: default@test_table3_n4@ds=1
+POSTHOOK: Output: default@test_table3_n4@ds=2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
index 7caa2ee..a912441 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out
@@ -63,9 +63,15 @@ POSTHOOK: Lineage: test_table4_n0.value SIMPLE 
[(src)src.FieldSchema(name:value,
 PREHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table1_n12 a JOIN test_table2_n12 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n12
+PREHOOK: Input: default@test_table2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table1_n12 a JOIN test_table2_n12 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n12
+POSTHOOK: Input: default@test_table2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -218,9 +224,15 @@ POSTHOOK: Input: default@test_table2_n12
 PREHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table3_n6 a JOIN test_table4_n0 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3_n6
+PREHOOK: Input: default@test_table4_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ * FROM test_table3_n6 a JOIN test_table4_n0 b ON 
a.key = b.value ORDER BY a.key LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3_n6
+POSTHOOK: Input: default@test_table4_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
index 4f6406b..975858d 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_16.q.out
@@ -35,9 +35,15 @@ POSTHOOK: Lineage: test_table2_n9.value SIMPLE 
[(src)src.FieldSchema(name:value,
 PREHOOK: query: EXPLAIN
 SELECT /*+mapjoin(b)*/ count(*) FROM test_table1_n9 a JOIN test_table2_n9 b ON 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n9
+PREHOOK: Input: default@test_table2_n9
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT /*+mapjoin(b)*/ count(*) FROM test_table1_n9 a JOIN test_table2_n9 b ON 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n9
+POSTHOOK: Input: default@test_table2_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out 
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
index 3353eb5..90c9968 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
@@ -49,9 +49,15 @@ POSTHOOK: Output: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -104,9 +110,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -159,9 +171,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -215,9 +233,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -274,9 +298,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a join smb_bucket_3_n1 b on 
a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -329,9 +359,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a left outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -384,9 +420,15 @@ POSTHOOK: Input: default@smb_bucket_3_n1
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a right outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -440,9 +482,15 @@ NULL       NULL    23      val_23
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_bucket_1_n1
+PREHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1_n1 a full outer join 
smb_bucket_3_n1 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_bucket_1_n1
+POSTHOOK: Input: default@smb_bucket_3_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to