http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out 
b/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out
index 4a46786..09726a0 100644
--- 
a/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out
+++ 
b/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out
@@ -24,8 +24,12 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@accumulo_pushdown
 PREHOOK: query: explain select * from accumulo_pushdown where key>'90'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown where key>'90'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -163,8 +167,12 @@ POSTHOOK: Input: default@accumulo_pushdown
 98     val_98
 PREHOOK: query: explain select * from accumulo_pushdown where key>=cast(40 + 
50 as string)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown where key>=cast(40 + 
50 as string)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -199,8 +207,12 @@ POSTHOOK: Input: default@accumulo_pushdown
 98     val_98
 PREHOOK: query: explain select * from accumulo_pushdown where key>'90' and 
value like '%9%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown where key>'90' and 
value like '%9%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -251,9 +263,13 @@ POSTHOOK: Input: default@accumulo_pushdown
 PREHOOK: query: explain select * from accumulo_pushdown
 where key>='90' and value like '%9%' and key=cast(value as int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown
 where key>='90' and value like '%9%' and key=cast(value as int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -301,9 +317,13 @@ POSTHOOK: Input: default@accumulo_pushdown
 PREHOOK: query: explain select * from accumulo_pushdown
 where key<'80' and key>'90' and value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown
 where key<'80' and key>'90' and value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -349,8 +369,12 @@ POSTHOOK: Input: default@accumulo_pushdown
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from accumulo_pushdown
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -371,9 +395,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from accumulo_pushdown
 where (case when key<'90' then 2 else 4 end) > 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown
 where (case when key<'90' then 2 else 4 end) > 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -410,9 +438,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from accumulo_pushdown
 where key<='80' or value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown
 where key<='80' or value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -449,9 +481,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from accumulo_pushdown where key > '281' 
 and key < '287'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown where key > '281' 
 and key < '287'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -487,8 +523,12 @@ POSTHOOK: Input: default@accumulo_pushdown
 286    val_286
 PREHOOK: query: explain select * from accumulo_pushdown where key<='90'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from accumulo_pushdown where key<='90'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_pushdown
+#### 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/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
----------------------------------------------------------------------
diff --git a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out 
b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
index f7e7699..532088c 100644
--- a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
+++ b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
@@ -36,8 +36,12 @@ POSTHOOK: Input: default@accumulo_table_1
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE accumulo_table_1 
SELECT * WHERE (key%2)=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@accumulo_table_1
 POSTHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE accumulo_table_1 
SELECT * WHERE (key%2)=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@accumulo_table_1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage
@@ -114,6 +118,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value LIMIT 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_table_1
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN 
 SELECT Y.* 
 FROM 
@@ -123,6 +130,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value LIMIT 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_table_1
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -266,6 +276,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_table_1
+PREHOOK: Input: default@accumulo_table_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN 
 SELECT Y.*
 FROM 
@@ -275,6 +288,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_table_1
+POSTHOOK: Input: default@accumulo_table_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -490,6 +506,9 @@ JOIN
 (SELECT src.key, count(src.key) as count FROM src GROUP BY src.key) Y
 ON (x.key = Y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@accumulo_table_1
+PREHOOK: Input: default@src
+PREHOOK: Output: default@accumulo_table_3
 POSTHOOK: query: EXPLAIN 
 INSERT OVERWRITE TABLE accumulo_table_3
 SELECT x.key, x.value, Y.count 
@@ -499,6 +518,9 @@ JOIN
 (SELECT src.key, count(src.key) as count FROM src GROUP BY src.key) Y
 ON (x.key = Y.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@accumulo_table_1
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@accumulo_table_3
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out
----------------------------------------------------------------------
diff --git 
a/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out
 
b/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out
index 5905ecd..9a37949 100644
--- 
a/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out
+++ 
b/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out
@@ -25,6 +25,9 @@ select key,"" where a.key > 0 AND a.key < 50
 insert overwrite table src_x2
 select value,"" where a.key > 50 AND a.key < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@src_x1
+PREHOOK: Output: default@src_x2
 POSTHOOK: query: explain
 from src a
 insert overwrite table src_x1
@@ -32,6 +35,9 @@ select key,"" where a.key > 0 AND a.key < 50
 insert overwrite table src_x2
 select value,"" where a.key > 50 AND a.key < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@src_x1
+POSTHOOK: Output: default@src_x2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-4 depends on stages: Stage-2, Stage-0, Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientnegative/serde_regex.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientnegative/serde_regex.q.out 
b/contrib/src/test/results/clientnegative/serde_regex.q.out
index 5c5f594..58a4679 100644
--- a/contrib/src/test/results/clientnegative/serde_regex.q.out
+++ b/contrib/src/test/results/clientnegative/serde_regex.q.out
@@ -22,6 +22,8 @@ WITH SERDEPROPERTIES (
 )
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@serde_regex
 POSTHOOK: query: EXPLAIN
 CREATE TABLE serde_regex(
   host STRING,
@@ -40,6 +42,8 @@ WITH SERDEPROPERTIES (
 )
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@serde_regex
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/dboutput.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/dboutput.q.out 
b/contrib/src/test/results/clientpositive/dboutput.q.out
index 5660097..3a853fa 100644
--- a/contrib/src/test/results/clientpositive/dboutput.q.out
+++ b/contrib/src/test/results/clientpositive/dboutput.q.out
@@ -35,6 +35,8 @@ dboutput('jdbc:derby:../build/test_dboutput_db','','',
 
 limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FROM src
 
 SELECT dboutput ( 'jdbc:derby:../build/test_dboutput_db\;create=true','','',
@@ -48,6 +50,8 @@ dboutput('jdbc:derby:../build/test_dboutput_db','','',
 
 limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -119,6 +123,8 @@ dboutput('jdbc:derby:../build/test_dboutput_db','','',
 
 FROM src WHERE key < 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT
 
 dboutput('jdbc:derby:../build/test_dboutput_db','','',
@@ -126,6 +132,8 @@ dboutput('jdbc:derby:../build/test_dboutput_db','','',
 
 FROM src WHERE key < 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/fileformat_base64.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/fileformat_base64.q.out 
b/contrib/src/test/results/clientpositive/fileformat_base64.q.out
index 7fd0ede..8e6a5e4 100644
--- a/contrib/src/test/results/clientpositive/fileformat_base64.q.out
+++ b/contrib/src/test/results/clientpositive/fileformat_base64.q.out
@@ -7,11 +7,15 @@ CREATE TABLE base64_test(key INT, value STRING) STORED AS
   INPUTFORMAT 
'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextInputFormat'
   OUTPUTFORMAT 
'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextOutputFormat'
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@base64_test
 POSTHOOK: query: EXPLAIN
 CREATE TABLE base64_test(key INT, value STRING) STORED AS
   INPUTFORMAT 
'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextInputFormat'
   OUTPUTFORMAT 
'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextOutputFormat'
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@base64_test
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/serde_regex.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_regex.q.out 
b/contrib/src/test/results/clientpositive/serde_regex.q.out
index 1ce89e1..691e254 100644
--- a/contrib/src/test/results/clientpositive/serde_regex.q.out
+++ b/contrib/src/test/results/clientpositive/serde_regex.q.out
@@ -16,6 +16,8 @@ WITH SERDEPROPERTIES (
 )
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@serde_regex
 POSTHOOK: query: EXPLAIN
 CREATE TABLE serde_regex(
   host STRING,
@@ -34,6 +36,8 @@ WITH SERDEPROPERTIES (
 )
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@serde_regex
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out 
b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
index c9d0fb6..46c2002 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
@@ -21,6 +21,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -32,6 +34,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
 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/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out 
b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
index 715dc95..baad5b9 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
@@ -21,6 +21,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -32,6 +34,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
 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/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out 
b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
index b66d504..48e6d04 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
@@ -21,6 +21,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -32,6 +34,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
 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/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out 
b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
index 45a2092..761584d 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
@@ -22,6 +22,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue ORDER by tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -34,6 +36,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue ORDER by tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
 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/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out 
b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
index 4beb35a..61cb3df 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
@@ -21,6 +21,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
 POSTHOOK: query: EXPLAIN
 FROM (
   FROM src
@@ -32,6 +34,8 @@ FROM (
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
 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/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_avg.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
index 7fbf229..d04f311 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
@@ -9,11 +9,15 @@ SELECT example_avg(substr(value,5)),
        example_avg(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_avg(substr(value,5)),
        example_avg(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
----------------------------------------------------------------------
diff --git 
a/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
index c261eb2..6a39a65 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
@@ -9,11 +9,15 @@ SELECT substr(value,5,1), example_group_concat("(", key, ":", 
value, ")")
 FROM src
 GROUP BY substr(value,5,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT substr(value,5,1), example_group_concat("(", key, ":", value, ")")
 FROM src
 GROUP BY substr(value,5,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udaf_example_max.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_max.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_max.q.out
index e11ad8e..39406fd 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_max.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_max.q.out
@@ -16,11 +16,15 @@ SELECT example_max(substr(value,5)),
        example_max(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_max(substr(value,5)),
        example_max(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
index f17eef8..7c28429 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
@@ -9,11 +9,15 @@ SELECT example_max_n(substr(value,5),10),
        example_max_n(IF(substr(value,5) > 250, NULL, substr(value,5)),10)
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_max_n(substr(value,5),10),
        example_max_n(IF(substr(value,5) > 250, NULL, substr(value,5)),10)
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udaf_example_min.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_min.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_min.q.out
index 75f33eb..6b372b1 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_min.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_min.q.out
@@ -16,11 +16,15 @@ SELECT example_min(substr(value,5)),
        example_min(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_min(substr(value,5)),
        example_min(IF(substr(value,5) > 250, NULL, substr(value,5)))
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
index ae770c0..111e762 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
@@ -9,11 +9,15 @@ SELECT example_min_n(substr(value,5),10),
        example_min_n(IF(substr(value,5) < 250, NULL, substr(value,5)),10)
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_min_n(substr(value,5),10),
        example_min_n(IF(substr(value,5) < 250, NULL, substr(value,5)),10)
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udf_example_add.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udf_example_add.q.out 
b/contrib/src/test/results/clientpositive/udf_example_add.q.out
index b092383..43b4edd 100644
--- a/contrib/src/test/results/clientpositive/udf_example_add.q.out
+++ b/contrib/src/test/results/clientpositive/udf_example_add.q.out
@@ -14,6 +14,8 @@ SELECT example_add(1, 2),
        example_add(1, 2, 3, 4.4)
 FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_add(1, 2),
        example_add(1, 2, 3),
@@ -24,6 +26,8 @@ SELECT example_add(1, 2),
        example_add(1, 2, 3, 4.4)
 FROM src LIMIT 1
 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/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
----------------------------------------------------------------------
diff --git 
a/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out 
b/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
index 32a12cf..df901045 100644
--- a/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
+++ b/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
@@ -20,10 +20,14 @@ PREHOOK: query: EXPLAIN
 SELECT example_arraysum(lint), example_mapconcat(mstringstring), 
example_structprint(lintstring[0])
 FROM src_thrift
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_arraysum(lint), example_mapconcat(mstringstring), 
example_structprint(lintstring[0])
 FROM src_thrift
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/contrib/src/test/results/clientpositive/udf_example_format.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udf_example_format.q.out 
b/contrib/src/test/results/clientpositive/udf_example_format.q.out
index 75c6496..62c4a8c 100644
--- a/contrib/src/test/results/clientpositive/udf_example_format.q.out
+++ b/contrib/src/test/results/clientpositive/udf_example_format.q.out
@@ -11,6 +11,8 @@ SELECT example_format("abc"),
        example_format("%1$x %2$o %3$d", 10, 10, 10)
 FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_format("abc"),
        example_format("%1$s", 1.1),
@@ -18,6 +20,8 @@ SELECT example_format("abc"),
        example_format("%1$x %2$o %3$d", 10, 10, 10)
 FROM src LIMIT 1
 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/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udf_row_sequence.q.out 
b/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
index c619cdc..875beeb 100644
--- a/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
+++ b/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
@@ -22,11 +22,15 @@ select key, row_sequence() as r
 from (select key from src order by key) x
 order by r
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, row_sequence() as r
 from (select key from src order by key) x
 order by r
 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/contrib/src/test/results/clientpositive/vector_udf_example_arraymapstruct.q.out
----------------------------------------------------------------------
diff --git 
a/contrib/src/test/results/clientpositive/vector_udf_example_arraymapstruct.q.out
 
b/contrib/src/test/results/clientpositive/vector_udf_example_arraymapstruct.q.out
index 75bbdff..5b4cba7 100644
--- 
a/contrib/src/test/results/clientpositive/vector_udf_example_arraymapstruct.q.out
+++ 
b/contrib/src/test/results/clientpositive/vector_udf_example_arraymapstruct.q.out
@@ -20,10 +20,14 @@ PREHOOK: query: EXPLAIN
 SELECT example_arraysum(lint), example_mapconcat(mstringstring), 
example_structprint(lintstring[0])
 FROM src_thrift
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT example_arraysum(lint), example_mapconcat(mstringstring), 
example_structprint(lintstring[0])
 FROM src_thrift
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/external_table_ppd.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out 
b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
index 6832920..edcbe7e 100644
--- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out
+++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
@@ -125,8 +125,12 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@t_hbase
 PREHOOK: query: explain SELECT * FROM t_hbase where int_col > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_hbase
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT * FROM t_hbase where int_col > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_hbase
+#### 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/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out 
b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out
index 8355a43..bd1677b 100644
--- a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out
@@ -54,9 +54,13 @@ POSTHOOK: Input: default@hbase_ck_4
 PREHOOK: query: explain
 select * from hbase_ck_4 where key.col1 = '238' AND key.col2 = '1238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_4 where key.col1 = '238' AND key.col2 = '1238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -90,9 +94,13 @@ POSTHOOK: Input: default@hbase_ck_4
 PREHOOK: query: explain
 select * from hbase_ck_4 where key.col1 >= '165' AND key.col1 < '27'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_4 where key.col1 >= '165' AND key.col1 < '27'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -127,9 +135,13 @@ POSTHOOK: Input: default@hbase_ck_4
 PREHOOK: query: explain
 select * from hbase_ck_4 where key.col1 > '100' AND key.col2 >= '1238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_4 where key.col1 > '100' AND key.col2 >= '1238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out 
b/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out
index 6878190..a3d29ce 100644
--- a/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out
@@ -54,9 +54,13 @@ POSTHOOK: Input: default@hbase_ck_5
 PREHOOK: query: explain
 select * from hbase_ck_5 where key.col1 = '238' AND key.col2 = '1238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_5 where key.col1 = '238' AND key.col2 = '1238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -89,9 +93,13 @@ POSTHOOK: Input: default@hbase_ck_5
 PREHOOK: query: explain
 select * from hbase_ck_5 where key.col1 >= '165' AND key.col1 < '27'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_5 where key.col1 >= '165' AND key.col1 < '27'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -125,9 +133,13 @@ POSTHOOK: Input: default@hbase_ck_5
 PREHOOK: query: explain
 select * from hbase_ck_5 where key.col1 > '100' AND key.col2 >= '1238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_5 where key.col1 > '100' AND key.col2 >= '1238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -161,9 +173,13 @@ POSTHOOK: Input: default@hbase_ck_5
 PREHOOK: query: explain
 select * from hbase_ck_5 where key.col1 < '50' AND key.col2 >= '3238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from hbase_ck_5 where key.col1 < '50' AND key.col2 >= '3238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ck_5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/hbase_ddl.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_ddl.q.out 
b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
index 4cb2083..25dd66b 100644
--- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
@@ -36,8 +36,12 @@ POSTHOOK: Input: default@hbase_table_1
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE hbase_table_1 SELECT * 
WHERE (key%2)=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@hbase_table_1
 POSTHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE hbase_table_1 SELECT 
* WHERE (key%2)=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@hbase_table_1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out 
b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
index 4d44d1d..5e05154 100644
--- a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@hbase_pushdown
 PREHOOK: query: explain select * from hbase_pushdown where key>'90'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key>'90'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -165,8 +169,12 @@ POSTHOOK: Input: default@hbase_pushdown
 98     val_98
 PREHOOK: query: explain select * from hbase_pushdown where key>=cast(40 + 50 
as string)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key>=cast(40 + 50 
as string)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -201,8 +209,12 @@ POSTHOOK: Input: default@hbase_pushdown
 98     val_98
 PREHOOK: query: explain select * from hbase_pushdown where key>'90' and value 
like '%9%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key>'90' and value 
like '%9%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -253,9 +265,13 @@ POSTHOOK: Input: default@hbase_pushdown
 PREHOOK: query: explain select * from hbase_pushdown
 where key>='90' and value like '%9%' and key=cast(value as int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key>='90' and value like '%9%' and key=cast(value as int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -303,9 +319,13 @@ POSTHOOK: Input: default@hbase_pushdown
 PREHOOK: query: explain select * from hbase_pushdown
 where key<'80' and key>'90' and value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key<'80' and key>'90' and value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -351,8 +371,12 @@ POSTHOOK: Input: default@hbase_pushdown
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from hbase_pushdown
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -373,9 +397,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown
 where (case when key<'90' then 2 else 4 end) > 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where (case when key<'90' then 2 else 4 end) > 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -412,9 +440,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown
 where key<='80' or value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key<='80' or value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -451,9 +483,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown where key > '281' 
 and key < '287'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key > '281' 
 and key < '287'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -489,8 +525,12 @@ POSTHOOK: Input: default@hbase_pushdown
 286    val_286
 PREHOOK: query: explain select * from hbase_pushdown where key<='90'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key<='90'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### 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/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out 
b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
index 909a5fa..57613c3 100644
--- a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@hbase_pushdown
 PREHOOK: query: explain select * from hbase_pushdown where key=90
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key=90
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -57,8 +61,12 @@ POSTHOOK: Input: default@hbase_pushdown
 90     val_90
 PREHOOK: query: explain select * from hbase_pushdown where key=90 and value 
like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key=90 and value 
like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -104,8 +112,12 @@ POSTHOOK: Input: default@hbase_pushdown
 90     val_90
 PREHOOK: query: explain select * from hbase_pushdown where key=90 and value 
like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key=90 and value 
like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -152,9 +164,13 @@ POSTHOOK: Input: default@hbase_pushdown
 PREHOOK: query: explain select * from hbase_pushdown
 where key=90 and value like '%90%' and key=cast(value as int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key=90 and value like '%90%' and key=cast(value as int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -192,9 +208,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown
 where key=80 and key=90 and value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key=80 and key=90 and value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -240,8 +260,12 @@ POSTHOOK: Input: default@hbase_pushdown
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from hbase_pushdown
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -262,9 +286,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown
 where (case when key=90 then 2 else 4 end) > 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where (case when key=90 then 2 else 4 end) > 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -301,9 +329,13 @@ STAGE PLANS:
 PREHOOK: query: explain select * from hbase_pushdown
 where key=80 or value like '%90%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown
 where key=80 or value like '%90%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -339,8 +371,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from hbase_pushdown where key=90
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_pushdown
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_pushdown where key=90
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_pushdown
+#### 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/hbase-handler/src/test/results/positive/hbase_queries.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out 
b/hbase-handler/src/test/results/positive/hbase_queries.q.out
index a746dcc..5ee1eb1 100644
--- a/hbase-handler/src/test/results/positive/hbase_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out
@@ -36,8 +36,12 @@ POSTHOOK: Input: default@hbase_table_1
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE hbase_table_1 SELECT * 
WHERE (key%2)=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@hbase_table_1
 POSTHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE hbase_table_1 SELECT 
* WHERE (key%2)=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@hbase_table_1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage
@@ -114,6 +118,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value LIMIT 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table_1
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN 
 SELECT Y.* 
 FROM 
@@ -123,6 +130,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value LIMIT 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table_1
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -266,6 +276,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table_1
+PREHOOK: Input: default@hbase_table_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN 
 SELECT Y.*
 FROM 
@@ -275,6 +288,9 @@ JOIN
 ON (x.key = Y.key)
 ORDER BY key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table_1
+POSTHOOK: Input: default@hbase_table_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -494,6 +510,9 @@ JOIN
 (SELECT src.key, count(src.key) as count FROM src GROUP BY src.key) Y
 ON (x.key = Y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table_1
+PREHOOK: Input: default@src
+PREHOOK: Output: default@hbase_table_3
 POSTHOOK: query: EXPLAIN 
 INSERT OVERWRITE TABLE hbase_table_3
 SELECT x.key, x.value, Y.count 
@@ -503,6 +522,9 @@ JOIN
 (SELECT src.key, count(src.key) as count FROM src GROUP BY src.key) Y
 ON (x.key = Y.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table_1
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@hbase_table_3
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
----------------------------------------------------------------------
diff --git 
a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
 
b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
index 7982f22..9e8736c 100644
--- 
a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
+++ 
b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
@@ -27,6 +27,9 @@ select key,"" where a.key > 0 AND a.key < 50
 insert overwrite table src_x2
 select value,"" where a.key > 50 AND a.key < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@src_x1
+PREHOOK: Output: default@src_x2
 POSTHOOK: query: explain
 from src a
 insert overwrite table src_x1
@@ -34,6 +37,9 @@ select key,"" where a.key > 0 AND a.key < 50
 insert overwrite table src_x2
 select value,"" where a.key > 50 AND a.key < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@src_x1
+POSTHOOK: Output: default@src_x2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-4 depends on stages: Stage-2, Stage-0, Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out 
b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
index 9318cd7..c887ef5 100644
--- a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
@@ -164,9 +164,13 @@ POSTHOOK: Output: default@hbase_table
 PREHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` < 200000000000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` < 200000000000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -213,9 +217,13 @@ POSTHOOK: Input: default@hbase_table
 PREHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` > 100000000000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` > 100000000000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -264,9 +272,13 @@ POSTHOOK: Input: default@hbase_table
 PREHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` <= 100000000000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` <= 100000000000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -313,9 +325,13 @@ POSTHOOK: Input: default@hbase_table
 PREHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` >= 200000000000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT key, value, cast(`time` as timestamp) FROM hbase_table WHERE key > 100 
AND key < 400 AND `time` >= 200000000000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_table
+#### 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/hbase-handler/src/test/results/positive/hbasestats.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out 
b/hbase-handler/src/test/results/positive/hbasestats.q.out
index b6737b7..5a4aea9 100644
--- a/hbase-handler/src/test/results/positive/hbasestats.q.out
+++ b/hbase-handler/src/test/results/positive/hbasestats.q.out
@@ -63,8 +63,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain INSERT OVERWRITE TABLE users SELECT 'user1', 'IA', 
'USA', 0 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@users
 POSTHOOK: query: explain INSERT OVERWRITE TABLE users SELECT 'user1', 'IA', 
'USA', 0 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@users
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage
@@ -280,8 +284,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from users
 PREHOOK: type: QUERY
+PREHOOK: Input: default@users
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from users
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@users
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -385,8 +393,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from users
 PREHOOK: type: QUERY
+PREHOOK: Input: default@users
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from users
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@users
+#### 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/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out 
b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
index 8112046..6eb283f 100644
--- a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
+++ b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@hbase_ppd_keyrange
 PREHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and key 
< 21
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and 
key < 21
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -65,8 +69,12 @@ POSTHOOK: Input: default@hbase_ppd_keyrange
 20     val_20
 PREHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and key 
<= 17
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and 
key <= 17
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -101,8 +109,12 @@ POSTHOOK: Input: default@hbase_ppd_keyrange
 17     val_17
 PREHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and key 
<= 17 and value like '%11%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_ppd_keyrange where key > 8 and 
key <= 17 and value like '%11%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -148,8 +160,12 @@ POSTHOOK: Input: default@hbase_ppd_keyrange
 11     val_11
 PREHOOK: query: explain select * from hbase_ppd_keyrange where key >= 9 and 
key < 17 and key = 11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from hbase_ppd_keyrange where key >= 9 and 
key < 17 and key = 11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hbase_ppd_keyrange
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out 
b/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
index a0d6acf..cf1a496 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
@@ -33,8 +33,12 @@ POSTHOOK: Input: default@blobstore_table
 1234
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE blobstore_table SELECT count(1) 
FROM blobstore_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@blobstore_table
+PREHOOK: Output: default@blobstore_table
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE blobstore_table SELECT 
count(1) FROM blobstore_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@blobstore_table
+POSTHOOK: Output: default@blobstore_table
 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/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
index 74a9a56..a93ea2b 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
@@ -76,8 +76,11 @@ POSTHOOK: Input: default@table1@key=505
 5      505
 PREHOOK: query: EXPLAIN EXTENDED INSERT INTO TABLE table1 PARTITION (key) 
VALUES (1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1
 POSTHOOK: query: EXPLAIN EXTENDED INSERT INTO TABLE table1 PARTITION (key) 
VALUES (1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
 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/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
index f6b6fee..128aaa8 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
@@ -42,8 +42,12 @@ POSTHOOK: Input: default@table1
 2
 PREHOOK: query: EXPLAIN EXTENDED INSERT INTO TABLE table1 VALUES (1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1
 POSTHOOK: query: EXPLAIN EXTENDED INSERT INTO TABLE table1 VALUES (1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table1
 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/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
index c59b57c..ac8ad59 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
@@ -60,8 +60,12 @@ k1
 k2
 PREHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE DIRECTORY '### 
test.blobstore.path ###/table1.dir/' SELECT * FROM table1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1
+PREHOOK: Output: ### test.blobstore.path ###/table1.dir
 POSTHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE DIRECTORY '### 
test.blobstore.path ###/table1.dir/' SELECT * FROM table1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1
+POSTHOOK: Output: ### test.blobstore.path ###/table1.dir
 OPTIMIZED SQL: SELECT `id`, `key`
 FROM `default`.`table1`
 STAGE DEPENDENCIES:
@@ -285,10 +289,16 @@ PREHOOK: query: EXPLAIN EXTENDED FROM table1
                  INSERT OVERWRITE DIRECTORY '### test.blobstore.path 
###/table1.dir/' SELECT id
                  INSERT OVERWRITE DIRECTORY '### test.blobstore.path 
###/table2.dir/' SELECT key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1
+PREHOOK: Output: ### test.blobstore.path ###/table1.dir
+PREHOOK: Output: ### test.blobstore.path ###/table2.dir
 POSTHOOK: query: EXPLAIN EXTENDED FROM table1
                  INSERT OVERWRITE DIRECTORY '### test.blobstore.path 
###/table1.dir/' SELECT id
                  INSERT OVERWRITE DIRECTORY '### test.blobstore.path 
###/table2.dir/' SELECT key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1
+POSTHOOK: Output: ### test.blobstore.path ###/table1.dir
+POSTHOOK: Output: ### test.blobstore.path ###/table2.dir
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-7 depends on stages: Stage-2 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
index ee02c36..164963c 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
@@ -94,8 +94,11 @@ POSTHOOK: Input: default@table1@key=505
 5      505
 PREHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE table1 PARTITION (key) 
VALUES (1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1
 POSTHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE table1 PARTITION 
(key) VALUES (1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
 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/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
index fdfe44c..c2ee0db 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
@@ -50,8 +50,12 @@ POSTHOOK: Input: default@table1
 2
 PREHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE table1 VALUES (1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1
 POSTHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE table1 VALUES (1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table1
 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/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
----------------------------------------------------------------------
diff --git 
a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
 
b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
index eb08d57..98551d5 100644
--- 
a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
+++ 
b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@blobstore_table
 PREHOOK: query: EXPLAIN EXTENDED FROM hdfs_table INSERT OVERWRITE TABLE 
blobstore_table SELECT hdfs_table.key GROUP BY hdfs_table.key ORDER BY 
hdfs_table.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hdfs_table
+PREHOOK: Output: default@blobstore_table
 POSTHOOK: query: EXPLAIN EXTENDED FROM hdfs_table INSERT OVERWRITE TABLE 
blobstore_table SELECT hdfs_table.key GROUP BY hdfs_table.key ORDER BY 
hdfs_table.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hdfs_table
+POSTHOOK: Output: default@blobstore_table
 OPTIMIZED SQL: SELECT `key`
 FROM `default`.`hdfs_table`
 GROUP BY `key`
@@ -301,8 +305,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN EXTENDED FROM hdfs_table INSERT OVERWRITE TABLE 
blobstore_table SELECT hdfs_table.key GROUP BY hdfs_table.key ORDER BY 
hdfs_table.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@hdfs_table
+PREHOOK: Output: default@blobstore_table
 POSTHOOK: query: EXPLAIN EXTENDED FROM hdfs_table INSERT OVERWRITE TABLE 
blobstore_table SELECT hdfs_table.key GROUP BY hdfs_table.key ORDER BY 
hdfs_table.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@hdfs_table
+POSTHOOK: Output: default@blobstore_table
 OPTIMIZED SQL: SELECT `key`
 FROM `default`.`hdfs_table`
 GROUP BY `key`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java
----------------------------------------------------------------------
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java 
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java
index 47fff8b..d5c8a51 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java
@@ -40,11 +40,12 @@ public class EnforceReadOnlyTables implements 
ExecuteWithHookContext {
     Set<ReadEntity> inputs = hookContext.getInputs();
     Set<WriteEntity> outputs = hookContext.getOutputs();
     UserGroupInformation ugi = hookContext.getUgi();
-    this.run(ss,inputs,outputs,ugi);
+    boolean isExplain = hookContext.getQueryPlan().isExplain();
+    this.run(ss,inputs,outputs,ugi, isExplain);
   }
 
   public void run(SessionState sess, Set<ReadEntity> inputs,
-      Set<WriteEntity> outputs, UserGroupInformation ugi)
+      Set<WriteEntity> outputs, UserGroupInformation ugi, boolean isExplain)
     throws Exception {
 
     // Don't enforce during test driver setup or shutdown.
@@ -59,7 +60,7 @@ public class EnforceReadOnlyTables implements 
ExecuteWithHookContext {
           (w.getTyp() == WriteEntity.Type.PARTITION)) {
         Table t = w.getTable();
         if (DEFAULT_DATABASE_NAME.equalsIgnoreCase(t.getDbName())
-            && readOnlyTables.contains(t.getTableName())) {
+            && readOnlyTables.contains(t.getTableName()) && !isExplain) {
           throw new RuntimeException ("Cannot overwrite read-only table: " + 
t.getTableName());
         }
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/java/org/apache/hadoop/hive/ql/parse/ExplainSemanticAnalyzer.java
----------------------------------------------------------------------
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/parse/ExplainSemanticAnalyzer.java 
b/ql/src/java/org/apache/hadoop/hive/ql/parse/ExplainSemanticAnalyzer.java
index 5594faf..6ecc920 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ExplainSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ExplainSemanticAnalyzer.java
@@ -165,6 +165,8 @@ public class ExplainSemanticAnalyzer extends 
BaseSemanticAnalyzer {
     BaseSemanticAnalyzer sem = SemanticAnalyzerFactory.get(queryState, input);
     sem.analyze(input, ctx);
     sem.validate();
+    inputs = sem.getInputs();
+    outputs = sem.getOutputs();
 
     ctx.setResFile(ctx.getLocalTmpPath());
     List<Task<? extends Serializable>> tasks = sem.getAllRootTasks();

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/queries/clientnegative/authorization_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/authorization_explain.q 
b/ql/src/test/queries/clientnegative/authorization_explain.q
new file mode 100644
index 0000000..1fed6dd
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_explain.q
@@ -0,0 +1,7 @@
+set hive.security.authorization.enabled=true;
+
+explain create table if not exists authorization_explain (key int, value 
string);
+
+create table if not exists authorization_explain (key int, value string);
+revoke Select on table authorization_explain from user hive_test_user;
+explain select * from authorization_explain;

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail.q.out
 
b/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail.q.out
index 12b1339..e8a594a 100644
--- 
a/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail.q.out
+++ 
b/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail.q.out
@@ -49,8 +49,12 @@ default      exchange_partition_test_2                       
user2   USER    SELECT  true    -1      user1
 default        exchange_partition_test_2                       user2   USER    
UPDATE  true    -1      user1
 PREHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 PREHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+PREHOOK: Input: default@exchange_partition_test_1
+PREHOOK: Output: default@exchange_partition_test_2
 POSTHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 POSTHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+POSTHOOK: Input: default@exchange_partition_test_1
+POSTHOOK: Output: default@exchange_partition_test_2
 INPUTS: 
   default@exchange_partition_test_1
 OUTPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail2.q.out
 
b/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail2.q.out
index f34f996..2d2558c 100644
--- 
a/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail2.q.out
+++ 
b/ql/src/test/results/clientnegative/authorization_alter_table_exchange_partition_fail2.q.out
@@ -53,8 +53,12 @@ POSTHOOK: query: show grant user user1 on table 
exchange_partition_test_2
 POSTHOOK: type: SHOW_GRANT
 PREHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 PREHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+PREHOOK: Input: default@exchange_partition_test_1
+PREHOOK: Output: default@exchange_partition_test_2
 POSTHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 POSTHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+POSTHOOK: Input: default@exchange_partition_test_1
+POSTHOOK: Output: default@exchange_partition_test_2
 INPUTS: 
   default@exchange_partition_test_1
 OUTPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/authorization_explain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/authorization_explain.q.out 
b/ql/src/test/results/clientnegative/authorization_explain.q.out
new file mode 100644
index 0000000..792de42
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_explain.q.out
@@ -0,0 +1,37 @@
+PREHOOK: query: explain create table if not exists authorization_explain (key 
int, value string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@authorization_explain
+POSTHOOK: query: explain create table if not exists authorization_explain (key 
int, value string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@authorization_explain
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+      Create Table Operator:
+        Create Table
+          columns: key int, value string
+          if not exists: true
+          input format: org.apache.hadoop.mapred.TextInputFormat
+          output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+          serde name: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+          name: default.authorization_explain
+
+PREHOOK: query: create table if not exists authorization_explain (key int, 
value string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@authorization_explain
+POSTHOOK: query: create table if not exists authorization_explain (key int, 
value string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@authorization_explain
+PREHOOK: query: revoke Select on table authorization_explain from user 
hive_test_user
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@authorization_explain
+POSTHOOK: query: revoke Select on table authorization_explain from user 
hive_test_user
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@authorization_explain
+FAILED: HiveAccessControlException Permission denied: Principal 
[name=hive_test_user, type=USER] does not have following privileges for 
operation QUERY [[SELECT] on Object [type=TABLE_OR_VIEW, 
name=default.authorization_explain]]

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/authorization_insertpart_noinspriv.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/authorization_insertpart_noinspriv.q.out 
b/ql/src/test/results/clientnegative/authorization_insertpart_noinspriv.q.out
index a524b97..55cb4d4 100644
--- 
a/ql/src/test/results/clientnegative/authorization_insertpart_noinspriv.q.out
+++ 
b/ql/src/test/results/clientnegative/authorization_insertpart_noinspriv.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@user2tab
 PREHOOK: query: explain authorization insert into table testp partition (dt = 
'2012')  values (1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@testp@dt=2012
 POSTHOOK: query: explain authorization insert into table testp partition (dt = 
'2012')  values (1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@testp@dt=2012
 INPUTS: 
   _dummy_database@_dummy_table
 OUTPUTS: 
@@ -36,8 +40,12 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=user1, type=USER] does not have following 
privileges for operation QUERY [[INSERT] on Object [type=TABLE_OR_VIEW, 
name=default.testp, action=INSERT]]
 PREHOOK: query: explain authorization insert overwrite table testp partition 
(dt = '2012')  values (1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@testp@dt=2012
 POSTHOOK: query: explain authorization insert overwrite table testp partition 
(dt = '2012')  values (1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@testp@dt=2012
 INPUTS: 
   _dummy_database@_dummy_table
 OUTPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/authorization_kill_query.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/authorization_kill_query.q.out 
b/ql/src/test/results/clientnegative/authorization_kill_query.q.out
index 1ce79c0..d135f34 100644
--- a/ql/src/test/results/clientnegative/authorization_kill_query.q.out
+++ b/ql/src/test/results/clientnegative/authorization_kill_query.q.out
@@ -4,6 +4,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization kill query 'dummyqueryid'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization kill query 'dummyqueryid'
 POSTHOOK: type: KILL QUERY
 INPUTS: 
@@ -20,6 +21,7 @@ POSTHOOK: query: kill query 'dummyqueryid'
 POSTHOOK: type: KILL QUERY
 PREHOOK: query: explain authorization kill query 'dummyqueryid'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization kill query 'dummyqueryid'
 POSTHOOK: type: KILL QUERY
 INPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out 
b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
index 4d4760c..061c8ac 100644
--- a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
+++ b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
@@ -79,11 +79,21 @@ select a.key, a.value, b.value
 from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
 on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part
+PREHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, a.value, b.value 
 from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
 on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part
+POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -156,11 +166,21 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
 on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part
+PREHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_2
+PREHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
 on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part
+POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
+#### 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/clientnegative/masking_mv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/masking_mv.q.out 
b/ql/src/test/results/clientnegative/masking_mv.q.out
index 1c40f50..54e9843 100644
--- a/ql/src/test/results/clientnegative/masking_mv.q.out
+++ b/ql/src/test/results/clientnegative/masking_mv.q.out
@@ -16,10 +16,16 @@ PREHOOK: query: explain
 create materialized view `masking_test_view_n_mv` as
 select key from `masking_test_n_mv`
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@masking_test_n_mv
+PREHOOK: Output: database:default
+PREHOOK: Output: default@masking_test_view_n_mv
 POSTHOOK: query: explain
 create materialized view `masking_test_view_n_mv` as
 select key from `masking_test_n_mv`
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@masking_test_n_mv
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@masking_test_view_n_mv
 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/clientnegative/script_error.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/script_error.q.out 
b/ql/src/test/results/clientnegative/script_error.q.out
index c38f6d4..ca5e372 100644
--- a/ql/src/test/results/clientnegative/script_error.q.out
+++ b/ql/src/test/results/clientnegative/script_error.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: EXPLAIN
 SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' 
AS (tkey, tvalue)
 FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' 
AS (tkey, tvalue)
 FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out 
b/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
index 5614cec..0fd2824 100644
--- a/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
+++ b/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
@@ -41,9 +41,15 @@ POSTHOOK: Lineage: table_desc.value SIMPLE 
[(src)src.FieldSchema(name:value, typ
 PREHOOK: query: explain 
 select /*+mapjoin(a)*/ * from table_asc a join table_desc b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_asc
+PREHOOK: Input: default@table_desc
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select /*+mapjoin(a)*/ * from table_asc a join table_desc b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_asc
+POSTHOOK: Input: default@table_desc
+#### 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/clientnegative/spark/spark_job_max_tasks.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/spark/spark_job_max_tasks.q.out 
b/ql/src/test/results/clientnegative/spark/spark_job_max_tasks.q.out
index a3a264d..97780ff 100644
--- a/ql/src/test/results/clientnegative/spark/spark_job_max_tasks.q.out
+++ b/ql/src/test/results/clientnegative/spark/spark_job_max_tasks.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: EXPLAIN
 SELECT TRANSFORM(key) USING 'python sleep.py' AS k
   FROM (SELECT key FROM src1 GROUP BY key) a ORDER BY k
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT TRANSFORM(key) USING 'python sleep.py' AS k
   FROM (SELECT key FROM src1 GROUP BY key) a ORDER BY k
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to