http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
index 6b4489a..9fb25d2 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
@@ -38,10 +38,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM T1_n56 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM T1_n56 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -484,10 +488,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl2_n3
 SELECT key, val, count(1) FROM T1_n56 GROUP BY key, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl2_n3
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl2_n3
 SELECT key, val, count(1) FROM T1_n56 GROUP BY key, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl2_n3
 OPTIMIZED SQL: SELECT `key`, `val`, COUNT(*) AS `$f2`
 FROM `default`.`t1_n56`
 GROUP BY `key`, `val`
@@ -865,10 +873,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM (SELECT key, val FROM T1_n56) subq1 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM (SELECT key, val FROM T1_n56) subq1 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -1303,10 +1315,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT k, count(1) FROM (SELECT key as k, val as v FROM T1_n56) subq1 GROUP BY 
k
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT k, count(1) FROM (SELECT key as k, val as v FROM T1_n56) subq1 GROUP BY 
k
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -1749,10 +1765,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3_n1
 SELECT 1, key, count(1) FROM T1_n56 GROUP BY 1, key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl3_n1
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl3_n1
 SELECT 1, key, count(1) FROM T1_n56 GROUP BY 1, key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl3_n1
 OPTIMIZED SQL: SELECT 1 AS `_o__c0`, `key`, COUNT(*) AS `_o__c2`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -2196,10 +2216,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4_n1
 SELECT key, 1, val, count(1) FROM T1_n56 GROUP BY key, 1, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl4_n1
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl4_n1
 SELECT key, 1, val, count(1) FROM T1_n56 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl4_n1
 OPTIMIZED SQL: SELECT `key`, 1 AS `_o__c1`, `val`, COUNT(*) AS `_o__c3`
 FROM `default`.`t1_n56`
 GROUP BY `key`, `val`
@@ -2578,10 +2602,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3_n1
 SELECT key, key + 1, count(1) FROM T1_n56 GROUP BY key, key + 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl3_n1
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl3_n1
 SELECT key, key + 1, count(1) FROM T1_n56 GROUP BY key, key + 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl3_n1
 OPTIMIZED SQL: SELECT `key` AS `$f0`, CAST(`key` AS DOUBLE) + CAST(1 AS 
DOUBLE) AS `$f1`, COUNT(*) AS `$f2`
 FROM `default`.`t1_n56`
 GROUP BY `key`, CAST(`key` AS DOUBLE) + CAST(1 AS DOUBLE)
@@ -2960,12 +2988,16 @@ SELECT cast(key + key as string), sum(cnt) from
 (SELECT key, count(1) as cnt FROM T1_n56 GROUP BY key) subq1
 group by key + key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT cast(key + key as string), sum(cnt) from
 (SELECT key, count(1) as cnt FROM T1_n56 GROUP BY key) subq1
 group by key + key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT CAST(CAST(`key` AS DOUBLE) + CAST(`key` AS DOUBLE) AS 
STRING) AS `_o__c0`, SUM(COUNT(*)) AS `_o__c1`
 FROM `default`.`t1_n56`
 GROUP BY CAST(`key` AS DOUBLE) + CAST(`key` AS DOUBLE)
@@ -3359,6 +3391,8 @@ SELECT key, count(1) FROM T1_n56 GROUP BY key
 SELECT key, count(1) FROM T1_n56 GROUP BY key
 ) subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT * FROM (
@@ -3367,6 +3401,8 @@ SELECT key, count(1) FROM T1_n56 GROUP BY key
 SELECT key, count(1) FROM T1_n56 GROUP BY key
 ) subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -3893,6 +3929,8 @@ SELECT key, count(1) FROM T1_n56 GROUP BY key
 SELECT cast(key + key as string) as key, count(1) FROM T1_n56 GROUP BY key + 
key
 ) subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT * FROM (
@@ -3901,6 +3939,8 @@ SELECT key, count(1) FROM T1_n56 GROUP BY key
 SELECT cast(key + key as string) as key, count(1) FROM T1_n56 GROUP BY key + 
key
 ) subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
 GROUP BY `key`
@@ -4624,6 +4664,8 @@ JOIN
 (SELECT key, count(1) as cnt FROM T1_n56 GROUP BY key) subq2
 ON subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT subq1.key, subq1.cnt+subq2.cnt FROM 
@@ -4632,6 +4674,8 @@ JOIN
 (SELECT key, count(1) as cnt FROM T1_n56 GROUP BY key) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`$f1` + `t2`.`$f1` AS `_o__c1`
 FROM (SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
@@ -4978,6 +5022,8 @@ JOIN
 (SELECT key, val, count(1) FROM T1_n56 GROUP BY key, val) subq2
 ON subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n56
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED 
 SELECT * FROM 
 (SELECT key, count(1) FROM T1_n56 GROUP BY key) subq1
@@ -4985,6 +5031,8 @@ JOIN
 (SELECT key, val, count(1) FROM T1_n56 GROUP BY key, val) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n56
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t1_n56`
@@ -5361,10 +5409,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM T2_n34 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@outputtbl1_n13
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl1_n13
 SELECT key, count(1) FROM T2_n34 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@outputtbl1_n13
 OPTIMIZED SQL: SELECT `key`, COUNT(*) AS `$f1`
 FROM `default`.`t2_n34`
 GROUP BY `key`
@@ -5741,10 +5793,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4_n1
 SELECT key, 1, val, count(1) FROM T2_n34 GROUP BY key, 1, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@outputtbl4_n1
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl4_n1
 SELECT key, 1, val, count(1) FROM T2_n34 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@outputtbl4_n1
 OPTIMIZED SQL: SELECT `key`, 1 AS `_o__c1`, `val`, COUNT(*) AS `_o__c3`
 FROM `default`.`t2_n34`
 GROUP BY `key`, `val`
@@ -6190,10 +6246,14 @@ PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl5_n1
 SELECT key, 1, val, 2, count(1) FROM T2_n34 GROUP BY key, 1, val, 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@outputtbl5_n1
 POSTHOOK: query: EXPLAIN EXTENDED 
 INSERT OVERWRITE TABLE outputTbl5_n1
 SELECT key, 1, val, 2, count(1) FROM T2_n34 GROUP BY key, 1, val, 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@outputtbl5_n1
 OPTIMIZED SQL: SELECT `key`, 1 AS `_o__c1`, `val`, 2 AS `_o__c3`, COUNT(*) AS 
`_o__c4`
 FROM `default`.`t2_n34`
 GROUP BY `key`, `val`
@@ -6636,12 +6696,16 @@ SELECT key, constant, val, count(1) from
 (SELECT key, 1 as constant, val from T2_n34)subq
 group by key, constant, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@outputtbl4_n1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4_n1
 SELECT key, constant, val, count(1) from 
 (SELECT key, 1 as constant, val from T2_n34)subq
 group by key, constant, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@outputtbl4_n1
 OPTIMIZED SQL: SELECT `key`, 1 AS `constant`, `val`, COUNT(*) AS `_o__c3`
 FROM `default`.`t2_n34`
 GROUP BY `key`, `val`
@@ -7088,6 +7152,8 @@ SELECT key, constant as constant2, val, 2 as constant3 
from
 )subq2
 group by key, constant3, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@outputtbl4_n1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4_n1
 select key, constant3, val, count(1) from
@@ -7097,6 +7163,8 @@ SELECT key, constant as constant2, val, 2 as constant3 
from
 )subq2
 group by key, constant3, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@outputtbl4_n1
 OPTIMIZED SQL: SELECT `key`, 2 AS `constant3`, `val`, COUNT(*) AS `_o__c3`
 FROM `default`.`t2_n34`
 GROUP BY `key`, `val`
@@ -7561,11 +7629,17 @@ FROM T2_n34
 INSERT OVERWRITE TABLE DEST1_n57 SELECT key, count(1) GROUP BY key
 INSERT OVERWRITE TABLE DEST2_n12 SELECT key, val, count(1) GROUP BY key, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@dest1_n57
+PREHOOK: Output: default@dest2_n12
 POSTHOOK: query: EXPLAIN
 FROM T2_n34
 INSERT OVERWRITE TABLE DEST1_n57 SELECT key, count(1) GROUP BY key
 INSERT OVERWRITE TABLE DEST2_n12 SELECT key, val, count(1) GROUP BY key, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@dest1_n57
+POSTHOOK: Output: default@dest2_n12
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -7830,11 +7904,17 @@ FROM (select key, val from T2_n34 where key = 8) x
 INSERT OVERWRITE TABLE DEST1_n57 SELECT key, count(1) GROUP BY key
 INSERT OVERWRITE TABLE DEST2_n12 SELECT key, val, count(1) GROUP BY key, val
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n34
+PREHOOK: Output: default@dest1_n57
+PREHOOK: Output: default@dest2_n12
 POSTHOOK: query: EXPLAIN
 FROM (select key, val from T2_n34 where key = 8) x
 INSERT OVERWRITE TABLE DEST1_n57 SELECT key, count(1) GROUP BY key
 INSERT OVERWRITE TABLE DEST2_n12 SELECT key, val, count(1) GROUP BY key, val
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n34
+POSTHOOK: Output: default@dest1_n57
+POSTHOOK: Output: default@dest2_n12
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out
index dbd9c12..b287dc2 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out
@@ -38,10 +38,14 @@ PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE outputTbl1_n35
 SELECT key, count(1) FROM T1_n164 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n164
+PREHOOK: Output: default@outputtbl1_n35
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE outputTbl1_n35
 SELECT key, count(1) FROM T1_n164 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n164
+POSTHOOK: Output: default@outputtbl1_n35
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/having.q.out 
b/ql/src/test/results/clientpositive/having.q.out
index 4526944..d799048 100644
--- a/ql/src/test/results/clientpositive/having.q.out
+++ b/ql/src/test/results/clientpositive/having.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT count(value) AS c FROM src GROUP BY key HAVING 
c > 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(value) AS c FROM src GROUP BY key HAVING 
c > 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
@@ -82,8 +86,12 @@ POSTHOOK: Input: default@src
 5
 PREHOOK: query: EXPLAIN SELECT key, max(value) AS c FROM src GROUP BY key 
HAVING key != 302
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, max(value) AS c FROM src GROUP BY key 
HAVING key != 302
 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
@@ -450,8 +458,12 @@ POSTHOOK: Input: default@src
 98     val_98
 PREHOOK: query: EXPLAIN SELECT key FROM src GROUP BY key HAVING max(value) > 
"val_255"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key FROM src GROUP BY key HAVING max(value) > 
"val_255"
 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
@@ -717,8 +729,12 @@ POSTHOOK: Input: default@src
 98
 PREHOOK: query: EXPLAIN SELECT key FROM src where key > 300 GROUP BY key 
HAVING max(value) > "val_255"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key FROM src where key > 300 GROUP BY key 
HAVING max(value) > "val_255"
 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
@@ -909,8 +925,12 @@ POSTHOOK: Input: default@src
 498
 PREHOOK: query: EXPLAIN SELECT key, max(value) FROM src GROUP BY key HAVING 
max(value) > "val_255"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, max(value) FROM src GROUP BY key HAVING 
max(value) > "val_255"
 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
@@ -1172,8 +1192,12 @@ POSTHOOK: Input: default@src
 98     val_98
 PREHOOK: query: EXPLAIN SELECT key, COUNT(value) FROM src GROUP BY key HAVING 
count(value) >= 4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, COUNT(value) FROM src GROUP BY key HAVING 
count(value) >= 4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/having2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/having2.q.out 
b/ql/src/test/results/clientpositive/having2.q.out
index 9c11cee..7a8e1b5 100644
--- a/ql/src/test/results/clientpositive/having2.q.out
+++ b/ql/src/test/results/clientpositive/having2.q.out
@@ -114,12 +114,16 @@ SELECT customer_name, SUM(customer_balance), 
SUM(order_quantity) FROM default.te
 (SUM(customer_balance) <= 4074689.000000041)
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT customer_name, SUM(customer_balance), SUM(order_quantity) FROM 
default.testv1_staples s1 GROUP BY customer_name HAVING (
 (COUNT(s1.discount) <= 822) AND
 (SUM(customer_balance) <= 4074689.000000041)
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -182,12 +186,16 @@ SELECT customer_name, SUM(customer_balance), 
SUM(order_quantity) FROM default.te
 AND (COUNT(s1.discount) <= 822)
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT customer_name, SUM(customer_balance), SUM(order_quantity) FROM 
default.testv1_staples s1 GROUP BY customer_name HAVING (
 (SUM(customer_balance) <= 4074689.000000041)
 AND (COUNT(s1.discount) <= 822)
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -253,6 +261,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT s1.customer_name FROM default.testv1_staples s1 join default.src s2 on 
s1.customer_name = s2.key
 GROUP BY s1.customer_name
@@ -262,6 +273,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -373,6 +387,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT s1.customer_name FROM default.testv1_staples s1 join default.src s2 on 
s1.customer_name = s2.key
 GROUP BY s1.customer_name, s1.customer_name
@@ -382,6 +399,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -497,6 +517,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@testv1_staples
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT distinct s1.customer_name as x, s1.customer_name as y
 FROM default.testv1_staples s1 join default.src s2 on s1.customer_name = s2.key
@@ -506,6 +529,9 @@ AND (AVG(s1.discount) <= 822)
 AND (COUNT(s2.value) > 4)
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@testv1_staples
+#### 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/hll.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/hll.q.out 
b/ql/src/test/results/clientpositive/hll.q.out
index 4b445ea..1904ccd 100644
--- a/ql/src/test/results/clientpositive/hll.q.out
+++ b/ql/src/test/results/clientpositive/hll.q.out
@@ -17,8 +17,14 @@ POSTHOOK: Output: default@n
 POSTHOOK: Lineage: n.key EXPRESSION []
 PREHOOK: query: explain analyze table n compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@n
+PREHOOK: Output: default@n
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table n compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@n
+POSTHOOK: Output: default@n
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -113,8 +119,14 @@ POSTHOOK: Output: default@i
 POSTHOOK: Lineage: i.key EXPRESSION [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
 PREHOOK: query: explain analyze table i compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@i
+PREHOOK: Output: default@i
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table i compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@i
+POSTHOOK: Output: default@i
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out 
b/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out
index 73760d3..058097b 100644
--- a/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out
+++ b/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out
@@ -7,6 +7,8 @@ from
   on (t2.key=t3.key )
   where t2.value='val_105' and t3.key='105'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select t2.* 
 from
@@ -16,6 +18,8 @@ from
   on (t2.key=t3.key )
   where t2.value='val_105' and t3.key='105'
 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/implicit_cast1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/implicit_cast1.q.out 
b/ql/src/test/results/clientpositive/implicit_cast1.q.out
index 2d0c4e1..c6545bd 100644
--- a/ql/src/test/results/clientpositive/implicit_cast1.q.out
+++ b/ql/src/test/results/clientpositive/implicit_cast1.q.out
@@ -11,11 +11,15 @@ SELECT implicit_test1.*
 FROM implicit_test1
 WHERE implicit_test1.a <> 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@implicit_test1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT implicit_test1.*
 FROM implicit_test1
 WHERE implicit_test1.a <> 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@implicit_test1
+#### 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/implicit_cast_during_insert.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/implicit_cast_during_insert.q.out 
b/ql/src/test/results/clientpositive/implicit_cast_during_insert.q.out
index a515847..c9da4f4 100644
--- a/ql/src/test/results/clientpositive/implicit_cast_during_insert.q.out
+++ b/ql/src/test/results/clientpositive/implicit_cast_during_insert.q.out
@@ -13,11 +13,14 @@ insert overwrite table implicit_cast_during_insert 
partition (p1)
   select key, value, key key1 from (select * from src where key in (0,1)) q
   distribute by key1 sort by key1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@implicit_cast_during_insert
 POSTHOOK: query: explain 
 insert overwrite table implicit_cast_during_insert partition (p1)
   select key, value, key key1 from (select * from src where key in (0,1)) q
   distribute by key1 sort by key1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 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/implicit_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/implicit_decimal.q.out 
b/ql/src/test/results/clientpositive/implicit_decimal.q.out
index f2b2412..cc3a94d 100644
--- a/ql/src/test/results/clientpositive/implicit_decimal.q.out
+++ b/ql/src/test/results/clientpositive/implicit_decimal.q.out
@@ -22,9 +22,13 @@ POSTHOOK: Lineage: decimal_test.dc SCRIPT []
 PREHOOK: query: explain 
 select * from decimal_test where dc = 4327269606205.029297
 PREHOOK: type: QUERY
+PREHOOK: Input: default@decimal_test
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select * from decimal_test where dc = 4327269606205.029297
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@decimal_test
+#### 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/infer_bucket_sort_dyn_part.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
index e04939b..b462d2f 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
@@ -403,6 +403,10 @@ SELECT key, value, IF (key % 100 == 0, '11', '12') FROM
 WHERE ds = '2008-04-08'
 GROUP BY key) a
 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@test_table_n8@ds=2008-04-08
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table_n8 PARTITION (ds = '2008-04-08', hr)
 SELECT key, value, IF (key % 100 == 0, '11', '12') FROM
@@ -410,6 +414,9 @@ SELECT key, value, IF (key % 100 == 0, '11', '12') FROM
 WHERE ds = '2008-04-08'
 GROUP BY key) a
 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
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
index 50cc4dc..70cccae 100644
--- 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
+++ 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
@@ -17,9 +17,13 @@ POSTHOOK: Output: default@test_table_out_2
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value WITH ROLLUP
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@test_table_out@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value WITH ROLLUP
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@test_table_out@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1498,9 +1502,13 @@ Storage Desc Params:
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value WITH CUBE
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@test_table_out@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value WITH CUBE
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@test_table_out@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1725,9 +1733,13 @@ Storage Desc Params:
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value GROUPING SETS (key, 
value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@test_table_out@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part 
= '1') 
 SELECT key, value, count(1) FROM src GROUP BY key, value GROUPING SETS (key, 
value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@test_table_out@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
index af4dd77..438cf7b 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
@@ -49,9 +49,13 @@ POSTHOOK: Output: default@test_table_out_n0
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1') 
 SELECT key, count(*) FROM test_table1_n14 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n14
+PREHOOK: Output: default@test_table_out_n0@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1') 
 SELECT key, count(*) FROM test_table1_n14 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n14
+POSTHOOK: Output: default@test_table_out_n0@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -243,6 +247,9 @@ SELECT a.key, a.value FROM (
 ) b
 ON (a.value = b.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@test_table1_n14
+PREHOOK: Output: default@test_table_out_n0@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1') 
 SELECT a.key, a.value FROM (
        SELECT key, count(*) AS value FROM test_table1_n14 GROUP BY key
@@ -251,6 +258,9 @@ SELECT a.key, a.value FROM (
 ) b
 ON (a.value = b.value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@test_table1_n14
+POSTHOOK: Output: default@test_table_out_n0@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -450,9 +460,15 @@ Storage Desc Params:
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1')
 SELECT /*+ MAPJOIN(a) */ a.key, b.value FROM test_table1_n14 a JOIN 
test_table2_n13 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n14
+PREHOOK: Input: default@test_table2_n13
+PREHOOK: Output: default@test_table_out_n0@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1')
 SELECT /*+ MAPJOIN(a) */ a.key, b.value FROM test_table1_n14 a JOIN 
test_table2_n13 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n14
+POSTHOOK: Input: default@test_table2_n13
+POSTHOOK: Output: default@test_table_out_n0@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
@@ -633,10 +649,16 @@ PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
test_table_out_n0 PARTITION (part
 SELECT /*+ MAPJOIN(a) */ b.value, count(*) FROM test_table1_n14 a JOIN 
test_table2_n13 b ON a.key = b.key
 GROUP BY b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n14
+PREHOOK: Input: default@test_table2_n13
+PREHOOK: Output: default@test_table_out_n0@part=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out_n0 PARTITION 
(part = '1')
 SELECT /*+ MAPJOIN(a) */ b.value, count(*) FROM test_table1_n14 a JOIN 
test_table2_n13 b ON a.key = b.key
 GROUP BY b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n14
+POSTHOOK: Input: default@test_table2_n13
+POSTHOOK: Output: default@test_table_out_n0@part=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
index 4f427c5..247e6d7 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out
@@ -14,6 +14,10 @@ FROM srcpart
 WHERE ds = '2008-04-08') a
 DISTRIBUTE BY key2
 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@test_table_n0@ds=2008-04-08
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table_n0 PARTITION (ds = '2008-04-08', hr)
 SELECT key2, value, cast(hr as int) FROM
@@ -22,6 +26,9 @@ FROM srcpart
 WHERE ds = '2008-04-08') a
 DISTRIBUTE BY key2
 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
 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/infer_const_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_const_type.q.out 
b/ql/src/test/results/clientpositive/infer_const_type.q.out
index 33f5405..407c33f 100644
--- a/ql/src/test/results/clientpositive/infer_const_type.q.out
+++ b/ql/src/test/results/clientpositive/infer_const_type.q.out
@@ -38,6 +38,8 @@ PREHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   db  = '-307' AND
   str = 1234
 PREHOOK: type: QUERY
+PREHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   ti  = '127' AND
   si  = 32767 AND
@@ -47,6 +49,8 @@ POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   db  = '-307' AND
   str = 1234
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -112,6 +116,8 @@ PREHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   fl  = 'float' OR
   db  = 'double'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   ti  = '128' OR
   si  = 32768 OR
@@ -120,6 +126,8 @@ POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   fl  = 'float' OR
   db  = 'double'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -179,11 +187,15 @@ PREHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   si  = 327.0 OR
   i   = '-100.0'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   ti  = '127.0' OR
   si  = 327.0 OR
   i   = '-100.0'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -237,11 +249,15 @@ PREHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   i > '100.0' AND
   str = 1.57
 PREHOOK: type: QUERY
+PREHOOK: Input: default@infertypes
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM infertypes WHERE
   ti < '127.0' AND
   i > '100.0' AND
   str = 1.57
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@infertypes
+#### 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/infer_join_preds.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_join_preds.q.out 
b/ql/src/test/results/clientpositive/infer_join_preds.q.out
index 4e6c504..41b6ccd 100644
--- a/ql/src/test/results/clientpositive/infer_join_preds.q.out
+++ b/ql/src/test/results/clientpositive/infer_join_preds.q.out
@@ -1,9 +1,15 @@
 PREHOOK: query: explain
 select * from src a join src1 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 * from src a join src1 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-0 depends on stages: Stage-1
@@ -120,12 +126,18 @@ select * from
 join
 (select * from src1)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 * from
 (select * from src where 1 = 0)a
 join
 (select * from src1)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-0 depends on stages: Stage-1
@@ -211,12 +223,18 @@ select * from
 left outer join
 (select * from src1)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 * from
 (select * from src where 1 = 0)a
 left outer join
 (select * from src1)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-0 depends on stages: Stage-1
@@ -299,12 +317,18 @@ select * from
 right outer join
 (select * from src1)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 * from
 (select * from src where 1 = 0)a
 right outer join
 (select * from src1)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-0 depends on stages: Stage-1
@@ -412,12 +436,18 @@ select * from
 full outer join
 (select * from src1)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 * from
 (select * from src where 1 = 0)a
 full outer join
 (select * from src1)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-0 depends on stages: Stage-1
@@ -525,12 +555,18 @@ select * from
 right outer join
 (select * from src1 where 1 = 0)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 * from
 (select * from src)a
 right outer join
 (select * from src1 where 1 = 0)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-0 depends on stages: Stage-1
@@ -610,9 +646,15 @@ POSTHOOK: Input: default@src1
 PREHOOK: query: explain select * from src join src1 on src.key = src1.key and 
src.value = src1.value
     where 4 between src.key and src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from src join src1 on src.key = src1.key and 
src.value = src1.value
     where 4 between src.key and src.value
 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-0 depends on stages: Stage-1
@@ -948,6 +990,9 @@ PREHOOK: query: explain SELECT          s.idp_warehouse_id 
AS source_warehouse_i
                                     ELSE d.odf_ss_actuals
                     END )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1_n8
+PREHOOK: Input: default@table2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT          s.idp_warehouse_id AS 
source_warehouse_id
     FROM            table1_n8 s
     JOIN
@@ -1110,6 +1155,9 @@ POSTHOOK: query: explain SELECT          
s.idp_warehouse_id AS source_warehouse_
                                     ELSE d.odf_ss_actuals
                     END )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1_n8
+POSTHOOK: Input: default@table2_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/b356aae0/ql/src/test/results/clientpositive/innerjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/innerjoin.q.out 
b/ql/src/test/results/clientpositive/innerjoin.q.out
index 779b074..0358db2 100644
--- a/ql/src/test/results/clientpositive/innerjoin.q.out
+++ b/ql/src/test/results/clientpositive/innerjoin.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src src1 INNER JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n20 SELECT src1.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j1_n20
 POSTHOOK: query: EXPLAIN
 FROM src src1 INNER JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n20 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j1_n20
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1216,9 +1220,13 @@ POSTHOOK: Input: default@i_n2
 PREHOOK: query: explain select * from (select * from src) `inner` left outer 
join src
 on `inner`.key=src.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select * from src) `inner` left outer 
join src
 on `inner`.key=src.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/innerjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/innerjoin1.q.out 
b/ql/src/test/results/clientpositive/innerjoin1.q.out
index 291ba55..65a097d 100644
--- a/ql/src/test/results/clientpositive/innerjoin1.q.out
+++ b/ql/src/test/results/clientpositive/innerjoin1.q.out
@@ -64,8 +64,14 @@ POSTHOOK: Lineage: innerjoinsrc2.b1 SCRIPT []
 POSTHOOK: Lineage: innerjoinsrc2.b2 SCRIPT []
 PREHOOK: query: EXPLAIN SELECT * FROM innerjoinsrc1 c1, innerjoinsrc2 c2 WHERE 
COALESCE(a1,a2)=COALESCE(b1,b2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@innerjoinsrc1
+PREHOOK: Input: default@innerjoinsrc2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM innerjoinsrc1 c1, innerjoinsrc2 c2 
WHERE COALESCE(a1,a2)=COALESCE(b1,b2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@innerjoinsrc1
+POSTHOOK: Input: default@innerjoinsrc2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -143,8 +149,14 @@ POSTHOOK: Input: default@innerjoinsrc2
 2      2       2       2
 PREHOOK: query: EXPLAIN SELECT * FROM innerjoinsrc1 c1 inner join 
innerjoinsrc2 c2 ON (COALESCE(a1,a2)=COALESCE(b1,b2))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@innerjoinsrc1
+PREHOOK: Input: default@innerjoinsrc2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM innerjoinsrc1 c1 inner join 
innerjoinsrc2 c2 ON (COALESCE(a1,a2)=COALESCE(b1,b2))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@innerjoinsrc1
+POSTHOOK: Input: default@innerjoinsrc2
+#### 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/input.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input.q.out 
b/ql/src/test/results/clientpositive/input.q.out
index 286cd19..77189e1 100644
--- a/ql/src/test/results/clientpositive/input.q.out
+++ b/ql/src/test/results/clientpositive/input.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: EXPLAIN
 SELECT x.* FROM SRC x
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.* FROM SRC x
 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/b356aae0/ql/src/test/results/clientpositive/input0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input0.q.out 
b/ql/src/test/results/clientpositive/input0.q.out
index 4d66253..ce49640 100644
--- a/ql/src/test/results/clientpositive/input0.q.out
+++ b/ql/src/test/results/clientpositive/input0.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: EXPLAIN
 SELECT * FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM src
 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/b356aae0/ql/src/test/results/clientpositive/input1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input1.q.out 
b/ql/src/test/results/clientpositive/input1.q.out
index cd6caa1..63f8af0 100644
--- a/ql/src/test/results/clientpositive/input1.q.out
+++ b/ql/src/test/results/clientpositive/input1.q.out
@@ -9,9 +9,11 @@ POSTHOOK: Output: default@TEST1_n6
 PREHOOK: query: EXPLAIN
 DESCRIBE TEST1_n6
 PREHOOK: type: DESCTABLE
+PREHOOK: Input: default@test1_n6
 POSTHOOK: query: EXPLAIN
 DESCRIBE TEST1_n6
 POSTHOOK: type: DESCTABLE
+POSTHOOK: Input: default@test1_n6
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input10.q.out 
b/ql/src/test/results/clientpositive/input10.q.out
index 2b08604..bbdff6e 100644
--- a/ql/src/test/results/clientpositive/input10.q.out
+++ b/ql/src/test/results/clientpositive/input10.q.out
@@ -9,9 +9,11 @@ POSTHOOK: Output: default@TEST10
 PREHOOK: query: EXPLAIN
 DESCRIBE TEST10
 PREHOOK: type: DESCTABLE
+PREHOOK: Input: default@test10
 POSTHOOK: query: EXPLAIN
 DESCRIBE TEST10
 POSTHOOK: type: DESCTABLE
+POSTHOOK: Input: default@test10
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input11.q.out 
b/ql/src/test/results/clientpositive/input11.q.out
index c1c185f..699e846 100644
--- a/ql/src/test/results/clientpositive/input11.q.out
+++ b/ql/src/test/results/clientpositive/input11.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n152 SELECT src.key, src.value WHERE src.key < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n152
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n152 SELECT src.key, src.value WHERE src.key < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n152
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input11_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input11_limit.q.out 
b/ql/src/test/results/clientpositive/input11_limit.q.out
index b31a3de..0a0e19e 100644
--- a/ql/src/test/results/clientpositive/input11_limit.q.out
+++ b/ql/src/test/results/clientpositive/input11_limit.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n153 SELECT src.key, src.value WHERE src.key < 
100 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n153
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n153 SELECT src.key, src.value WHERE src.key < 
100 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n153
 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/input12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input12.q.out 
b/ql/src/test/results/clientpositive/input12.q.out
index b2dad20..98f4ae0 100644
--- a/ql/src/test/results/clientpositive/input12.q.out
+++ b/ql/src/test/results/clientpositive/input12.q.out
@@ -28,12 +28,20 @@ INSERT OVERWRITE TABLE dest1_n122 SELECT src.* WHERE 
src.key < 100
 INSERT OVERWRITE TABLE dest2_n32 SELECT src.key, src.value WHERE src.key >= 
100 and src.key < 200
 INSERT OVERWRITE TABLE dest3_n5 PARTITION(ds='2008-04-08', hr='12') SELECT 
src.key WHERE src.key >= 200
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n122
+PREHOOK: Output: default@dest2_n32
+PREHOOK: Output: default@dest3_n5@ds=2008-04-08/hr=12
 POSTHOOK: query: EXPLAIN
 FROM src 
 INSERT OVERWRITE TABLE dest1_n122 SELECT src.* WHERE src.key < 100
 INSERT OVERWRITE TABLE dest2_n32 SELECT src.key, src.value WHERE src.key >= 
100 and src.key < 200
 INSERT OVERWRITE TABLE dest3_n5 PARTITION(ds='2008-04-08', hr='12') SELECT 
src.key WHERE src.key >= 200
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n122
+POSTHOOK: Output: default@dest2_n32
+POSTHOOK: Output: default@dest3_n5@ds=2008-04-08/hr=12
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-9 depends on stages: Stage-3 , consists of Stage-6, Stage-5, Stage-7

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input13.q.out 
b/ql/src/test/results/clientpositive/input13.q.out
index 6e3f309..a54ca00 100644
--- a/ql/src/test/results/clientpositive/input13.q.out
+++ b/ql/src/test/results/clientpositive/input13.q.out
@@ -29,6 +29,11 @@ INSERT OVERWRITE TABLE dest2_n16 SELECT src.key, src.value 
WHERE src.key >= 100
 INSERT OVERWRITE TABLE dest3_n1 PARTITION(ds='2008-04-08', hr='12') SELECT 
src.key WHERE src.key >= 200 and src.key < 300
 INSERT OVERWRITE DIRECTORY 'target/warehouse/dest4.out' SELECT src.value WHERE 
src.key >= 300
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n77
+PREHOOK: Output: default@dest2_n16
+PREHOOK: Output: default@dest3_n1@ds=2008-04-08/hr=12
+PREHOOK: Output: target/warehouse/dest4.out
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n77 SELECT src.* WHERE src.key < 100
@@ -36,6 +41,11 @@ INSERT OVERWRITE TABLE dest2_n16 SELECT src.key, src.value 
WHERE src.key >= 100
 INSERT OVERWRITE TABLE dest3_n1 PARTITION(ds='2008-04-08', hr='12') SELECT 
src.key WHERE src.key >= 200 and src.key < 300
 INSERT OVERWRITE DIRECTORY 'target/warehouse/dest4.out' SELECT src.value WHERE 
src.key >= 300
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n77
+POSTHOOK: Output: default@dest2_n16
+POSTHOOK: Output: default@dest3_n1@ds=2008-04-08/hr=12
+POSTHOOK: Output: target/warehouse/dest4.out
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-10 depends on stages: Stage-4 , consists of Stage-7, Stage-6, Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input14.q.out 
b/ql/src/test/results/clientpositive/input14.q.out
index 597d29d..b819a5d 100644
--- a/ql/src/test/results/clientpositive/input14.q.out
+++ b/ql/src/test/results/clientpositive/input14.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n42 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey 
< 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n42
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n42 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey 
< 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n42
 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/input14_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input14_limit.q.out 
b/ql/src/test/results/clientpositive/input14_limit.q.out
index 151d6d6..2d375b9 100644
--- a/ql/src/test/results/clientpositive/input14_limit.q.out
+++ b/ql/src/test/results/clientpositive/input14_limit.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n13 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey 
< 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n13
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n13 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey 
< 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n13
 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/input15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input15.q.out 
b/ql/src/test/results/clientpositive/input15.q.out
index 13bdbf2..2dbf6fb 100644
--- a/ql/src/test/results/clientpositive/input15.q.out
+++ b/ql/src/test/results/clientpositive/input15.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: EXPLAIN
 CREATE TABLE TEST15(key INT, value STRING) ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '\t' STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TEST15
 POSTHOOK: query: EXPLAIN
 CREATE TABLE TEST15(key INT, value STRING) ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '\t' STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TEST15
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input17.q.out 
b/ql/src/test/results/clientpositive/input17.q.out
index c506a62..ef058e2 100644
--- a/ql/src/test/results/clientpositive/input17.q.out
+++ b/ql/src/test/results/clientpositive/input17.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n81 SELECT tmap.tkey, tmap.tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest1_n81
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src_thrift
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n81 SELECT tmap.tkey, tmap.tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest1_n81
 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/input18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input18.q.out 
b/ql/src/test/results/clientpositive/input18.q.out
index 4a1c0d8..4a13c78 100644
--- a/ql/src/test/results/clientpositive/input18.q.out
+++ b/ql/src/test/results/clientpositive/input18.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n124 SELECT tmap.key, 
regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n124
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n124 SELECT tmap.key, 
regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n124
 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/input1_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input1_limit.q.out 
b/ql/src/test/results/clientpositive/input1_limit.q.out
index 53f4e89..ff88dec 100644
--- a/ql/src/test/results/clientpositive/input1_limit.q.out
+++ b/ql/src/test/results/clientpositive/input1_limit.q.out
@@ -19,11 +19,17 @@ FROM src
 INSERT OVERWRITE TABLE dest1_n12 SELECT src.key, src.value WHERE src.key < 100 
LIMIT 10
 INSERT OVERWRITE TABLE dest2_n2 SELECT src.key, src.value WHERE src.key < 100 
LIMIT 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n12
+PREHOOK: Output: default@dest2_n2
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n12 SELECT src.key, src.value WHERE src.key < 100 
LIMIT 10
 INSERT OVERWRITE TABLE dest2_n2 SELECT src.key, src.value WHERE src.key < 100 
LIMIT 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n12
+POSTHOOK: Output: default@dest2_n2
 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/b356aae0/ql/src/test/results/clientpositive/input2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input2.q.out 
b/ql/src/test/results/clientpositive/input2.q.out
index 9693131..e8f1edd 100644
--- a/ql/src/test/results/clientpositive/input2.q.out
+++ b/ql/src/test/results/clientpositive/input2.q.out
@@ -105,9 +105,11 @@ POSTHOOK: Output: default@test2b
 PREHOOK: query: EXPLAIN
 SHOW TABLES
 PREHOOK: type: SHOWTABLES
+PREHOOK: Input: database:default
 POSTHOOK: query: EXPLAIN
 SHOW TABLES
 POSTHOOK: type: SHOWTABLES
+POSTHOOK: Input: database:default
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input20.q.out 
b/ql/src/test/results/clientpositive/input20.q.out
index 9f8d612..c58a1d2 100644
--- a/ql/src/test/results/clientpositive/input20.q.out
+++ b/ql/src/test/results/clientpositive/input20.q.out
@@ -18,6 +18,8 @@ REDUCE tmap.key, tmap.value
 USING 'python input20_script.py'
 AS key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n138
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -30,6 +32,8 @@ REDUCE tmap.key, tmap.value
 USING 'python input20_script.py'
 AS key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n138
 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/input21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input21.q.out 
b/ql/src/test/results/clientpositive/input21.q.out
index 528a74f..dd847ab 100644
--- a/ql/src/test/results/clientpositive/input21.q.out
+++ b/ql/src/test/results/clientpositive/input21.q.out
@@ -16,8 +16,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@src_null
 PREHOOK: query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_null
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_null
+#### 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/input22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input22.q.out 
b/ql/src/test/results/clientpositive/input22.q.out
index 23845ec..283bfee 100644
--- a/ql/src/test/results/clientpositive/input22.q.out
+++ b/ql/src/test/results/clientpositive/input22.q.out
@@ -20,12 +20,16 @@ FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
       FROM INPUT4) a
 ORDER BY KEY2 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@input4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a.KEY2
 FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
       FROM INPUT4) a
 ORDER BY KEY2 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@input4
+#### 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/input23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input23.q.out 
b/ql/src/test/results/clientpositive/input23.q.out
index e1d9cb5..df340d6 100644
--- a/ql/src/test/results/clientpositive/input23.q.out
+++ b/ql/src/test/results/clientpositive/input23.q.out
@@ -2,9 +2,15 @@ Warning: Shuffle Join JOIN[8][tables = [$hdt$_0, $hdt$_1]] in 
Stage 'Stage-1:MAP
 PREHOOK: query: explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = 
'11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = 
'11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, CAST('2008-04-08' AS STRING) 
AS `ds`, CAST('11' AS STRING) AS `hr`, `t2`.`key` AS `key1`, `t2`.`value` AS 
`value1`, CAST('2008-04-08' AS STRING) AS `ds1`, CAST('14' AS STRING) AS `hr1`
 FROM (SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, CAST('11' 
AS STRING) AS `hr`
 FROM `default`.`srcpart`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input24.q.out 
b/ql/src/test/results/clientpositive/input24.q.out
index b30c1fb..c041b64 100644
--- a/ql/src/test/results/clientpositive/input24.q.out
+++ b/ql/src/test/results/clientpositive/input24.q.out
@@ -16,9 +16,13 @@ POSTHOOK: Output: default@tst_n1@d=2009-01-01
 PREHOOK: query: explain
 select count(1) from tst_n1 x where x.d='2009-01-01'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tst_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(1) from tst_n1 x where x.d='2009-01-01'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst_n1
+#### 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/input25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input25.q.out 
b/ql/src/test/results/clientpositive/input25.q.out
index c573a12..04d3ee2 100644
--- a/ql/src/test/results/clientpositive/input25.q.out
+++ b/ql/src/test/results/clientpositive/input25.q.out
@@ -27,6 +27,10 @@ select * from (
   select * from (select * from tst x where x.d='2009-02-02' limit 10)b
 ) subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tst
+PREHOOK: Input: default@tst@d=2009-01-01
+PREHOOK: Input: default@tst@d=2009-02-02
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select * from tst x where x.d='2009-01-01' limit 10)a
@@ -34,6 +38,10 @@ select * from (
   select * from (select * from tst x where x.d='2009-02-02' limit 10)b
 ) subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst
+POSTHOOK: Input: default@tst@d=2009-01-01
+POSTHOOK: Input: default@tst@d=2009-02-02
+#### 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/b356aae0/ql/src/test/results/clientpositive/input26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input26.q.out 
b/ql/src/test/results/clientpositive/input26.q.out
index 93898b6..9d9cb51 100644
--- a/ql/src/test/results/clientpositive/input26.q.out
+++ b/ql/src/test/results/clientpositive/input26.q.out
@@ -5,6 +5,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select * from srcpart a where a.ds = '2008-04-08' and a.hr = 
'11' order by a.key limit 5)pa
@@ -12,6 +15,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input2_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input2_limit.q.out 
b/ql/src/test/results/clientpositive/input2_limit.q.out
index bcf713d..946af31 100644
--- a/ql/src/test/results/clientpositive/input2_limit.q.out
+++ b/ql/src/test/results/clientpositive/input2_limit.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: EXPLAIN
 SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input3.q.out 
b/ql/src/test/results/clientpositive/input3.q.out
index db30111..e41d684 100644
--- a/ql/src/test/results/clientpositive/input3.q.out
+++ b/ql/src/test/results/clientpositive/input3.q.out
@@ -58,9 +58,13 @@ test3b
 PREHOOK: query: EXPLAIN
 ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
 PREHOOK: type: ALTERTABLE_ADDCOLS
+PREHOOK: Input: default@test3b
+PREHOOK: Output: default@test3b
 POSTHOOK: query: EXPLAIN
 ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
+POSTHOOK: Input: default@test3b
+POSTHOOK: Output: default@test3b
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -93,9 +97,13 @@ x                    double
 PREHOOK: query: EXPLAIN
 ALTER TABLE TEST3b RENAME TO TEST3c
 PREHOOK: type: ALTERTABLE_RENAME
+PREHOOK: Input: default@test3b
+PREHOOK: Output: default@test3b
 POSTHOOK: query: EXPLAIN
 ALTER TABLE TEST3b RENAME TO TEST3c
 POSTHOOK: type: ALTERTABLE_RENAME
+POSTHOOK: Input: default@test3b
+POSTHOOK: Output: default@test3b
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -153,9 +161,13 @@ test3c
 PREHOOK: query: EXPLAIN
 ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
+PREHOOK: Input: default@test3c
+PREHOOK: Output: default@test3c
 POSTHOOK: query: EXPLAIN
 ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
+POSTHOOK: Input: default@test3c
+POSTHOOK: Output: default@test3c
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input30.q.out 
b/ql/src/test/results/clientpositive/input30.q.out
index 4e8e87e..6d9b46d 100644
--- a/ql/src/test/results/clientpositive/input30.q.out
+++ b/ql/src/test/results/clientpositive/input30.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain
 insert overwrite table dest30
 select count(1) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@tst_dest30
 POSTHOOK: query: explain 
 insert overwrite table dest30
 select count(1) from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@tst_dest30
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -128,10 +132,14 @@ PREHOOK: query: explain
 insert overwrite table dest30
 select count(1) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest30
 POSTHOOK: query: explain
 insert overwrite table dest30
 select count(1) from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest30
 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/input31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input31.q.out 
b/ql/src/test/results/clientpositive/input31.q.out
index 0ea5f80..b1d309b 100644
--- a/ql/src/test/results/clientpositive/input31.q.out
+++ b/ql/src/test/results/clientpositive/input31.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain
 insert overwrite table dest31
 select count(1) from srcbucket
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+PREHOOK: Output: default@tst_dest31
 POSTHOOK: query: explain 
 insert overwrite table dest31
 select count(1) from srcbucket
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+POSTHOOK: Output: default@tst_dest31
 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/input32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input32.q.out 
b/ql/src/test/results/clientpositive/input32.q.out
index c6c9312..7063988 100644
--- a/ql/src/test/results/clientpositive/input32.q.out
+++ b/ql/src/test/results/clientpositive/input32.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: explain
 insert overwrite table dest32
 select count(1) from srcbucket
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+PREHOOK: Output: default@tst_dest32
 POSTHOOK: query: explain 
 insert overwrite table dest32
 select count(1) from srcbucket
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+POSTHOOK: Output: default@tst_dest32
 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/input33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input33.q.out 
b/ql/src/test/results/clientpositive/input33.q.out
index bff2248..fea28f9 100644
--- a/ql/src/test/results/clientpositive/input33.q.out
+++ b/ql/src/test/results/clientpositive/input33.q.out
@@ -18,6 +18,8 @@ REDUCE tmap.key, tmap.value
 USING 'python input20_script.py'
 AS (key STRING, value STRING)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n135
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -30,6 +32,8 @@ REDUCE tmap.key, tmap.value
 USING 'python input20_script.py'
 AS (key STRING, value STRING)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n135
 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/input34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input34.q.out 
b/ql/src/test/results/clientpositive/input34.q.out
index 76517c6..d523f29 100644
--- a/ql/src/test/results/clientpositive/input34.q.out
+++ b/ql/src/test/results/clientpositive/input34.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n161 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n161
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n161 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n161
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input35.q.out 
b/ql/src/test/results/clientpositive/input35.q.out
index c07128f..abfd271 100644
--- a/ql/src/test/results/clientpositive/input35.q.out
+++ b/ql/src/test/results/clientpositive/input35.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n25 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n25
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n25 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n25
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input36.q.out 
b/ql/src/test/results/clientpositive/input36.q.out
index b05d0b8..345b9d8 100644
--- a/ql/src/test/results/clientpositive/input36.q.out
+++ b/ql/src/test/results/clientpositive/input36.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n70 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n70
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n70 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n70
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input38.q.out 
b/ql/src/test/results/clientpositive/input38.q.out
index 4eec97d..629d2e8 100644
--- a/ql/src/test/results/clientpositive/input38.q.out
+++ b/ql/src/test/results/clientpositive/input38.q.out
@@ -14,6 +14,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n91 SELECT tmap.key, tmap.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n91
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -22,6 +24,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n91 SELECT tmap.key, tmap.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n91
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input39.q.out 
b/ql/src/test/results/clientpositive/input39.q.out
index 51dde78..3809591 100644
--- a/ql/src/test/results/clientpositive/input39.q.out
+++ b/ql/src/test/results/clientpositive/input39.q.out
@@ -53,9 +53,19 @@ POSTHOOK: Lineage: t2_n71 PARTITION(ds=1).value SIMPLE 
[(src)src.FieldSchema(nam
 PREHOOK: query: explain
 select count(1) from t1_n121 join t2_n71 on t1_n121.key=t2_n71.key where 
t1_n121.ds='1' and t2_n71.ds='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n121
+PREHOOK: Input: default@t1_n121@ds=1
+PREHOOK: Input: default@t2_n71
+PREHOOK: Input: default@t2_n71@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(1) from t1_n121 join t2_n71 on t1_n121.key=t2_n71.key where 
t1_n121.ds='1' and t2_n71.ds='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n121
+POSTHOOK: Input: default@t1_n121@ds=1
+POSTHOOK: Input: default@t2_n71
+POSTHOOK: Input: default@t2_n71@ds=1
+#### 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/input3_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input3_limit.q.out 
b/ql/src/test/results/clientpositive/input3_limit.q.out
index 191c3e7..e0ffe19 100644
--- a/ql/src/test/results/clientpositive/input3_limit.q.out
+++ b/ql/src/test/results/clientpositive/input3_limit.q.out
@@ -33,9 +33,13 @@ POSTHOOK: Output: default@T2_n47
 PREHOOK: query: EXPLAIN 
 INSERT OVERWRITE TABLE T2_n47 SELECT * FROM (SELECT * FROM T1_n78 DISTRIBUTE 
BY key) T ORDER BY key, value LIMIT 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n78
+PREHOOK: Output: default@t2_n47
 POSTHOOK: query: EXPLAIN 
 INSERT OVERWRITE TABLE T2_n47 SELECT * FROM (SELECT * FROM T1_n78 DISTRIBUTE 
BY key) T ORDER BY key, value LIMIT 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n78
+POSTHOOK: Output: default@t2_n47
 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/input4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input4.q.out 
b/ql/src/test/results/clientpositive/input4.q.out
index ef584ac..861b60b 100644
--- a/ql/src/test/results/clientpositive/input4.q.out
+++ b/ql/src/test/results/clientpositive/input4.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@INPUT4_n0
 PREHOOK: query: EXPLAIN
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4_n0
 PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@input4_n0
 POSTHOOK: query: EXPLAIN
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4_n0
 POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@input4_n0
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -42,9 +46,13 @@ POSTHOOK: Output: default@input4_n0
 PREHOOK: query: EXPLAIN FORMATTED
 SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4_n0 AS Input4Alias
 PREHOOK: type: QUERY
+PREHOOK: Input: default@input4_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FORMATTED
 SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4_n0 AS Input4Alias
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@input4_n0
+#### A masked pattern was here ####
 {"optimizedSQL":"SELECT `value`, `key`\nFROM `default`.`input4_n0`","STAGE 
DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"-1","Processor 
Tree:":{"TableScan":{"alias:":"input4alias","columns:":["value","key"],"database:":"default","Statistics:":"Num
 rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: 
NONE","table:":"input4_n0","isTempTable:":"false","OperatorId:":"TS_0","children":{"Select
 Operator":{"expressions:":"value (type: string), key (type: 
string)","columnExprMap:":{"_col0":"value","_col1":"key"},"outputColumnNames:":["_col0","_col1"],"Statistics:":"Num
 rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: 
NONE","OperatorId:":"SEL_1","children":{"ListSink":{"OperatorId:":"LIST_SINK_3"}}}}}}}}}}
 PREHOOK: query: SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4_n0 AS 
Input4Alias
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input42.q.out 
b/ql/src/test/results/clientpositive/input42.q.out
index 8546a03..facb9a8 100644
--- a/ql/src/test/results/clientpositive/input42.q.out
+++ b/ql/src/test/results/clientpositive/input42.q.out
@@ -1,9 +1,17 @@
 PREHOOK: query: explain extended
 select * from srcpart a where a.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
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcpart a where a.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
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, 
`hr`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -1135,9 +1143,17 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and key < 200
 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
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and key < 200
 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
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, 
`hr`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08' AND `key` < 200
@@ -1651,9 +1667,17 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and rand(100) < 0.1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and rand(100) < 0.1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, 
`hr`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08' AND RAND(100) < 0.1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/input4_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input4_limit.q.out 
b/ql/src/test/results/clientpositive/input4_limit.q.out
index eb66d95..8b8a791 100644
--- a/ql/src/test/results/clientpositive/input4_limit.q.out
+++ b/ql/src/test/results/clientpositive/input4_limit.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select * from src sort by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from src sort by key limit 10
 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/b356aae0/ql/src/test/results/clientpositive/input5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input5.q.out 
b/ql/src/test/results/clientpositive/input5.q.out
index ef4f6fd..f504e04 100644
--- a/ql/src/test/results/clientpositive/input5.q.out
+++ b/ql/src/test/results/clientpositive/input5.q.out
@@ -15,6 +15,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n94 SELECT tmap.tkey, tmap.tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest1_n94
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src_thrift
@@ -24,6 +26,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1_n94 SELECT tmap.tkey, tmap.tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest1_n94
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to