http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out 
b/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
index b664e8c..8429ab3 100644
--- a/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
@@ -205,6 +205,9 @@ FROM druid_kafka_test) b
   ON a.shortname = b.language
 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_kafka_test
+PREHOOK: Input: default@languages
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT a.fullname, b.`user`
 FROM
@@ -217,6 +220,9 @@ FROM druid_kafka_test) b
   ON a.shortname = b.language
 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_kafka_test
+POSTHOOK: Input: default@languages
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 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/druid/druidmini_dynamic_partition.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
index 8b1e446..3c33eb2 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
@@ -78,6 +78,9 @@ PREHOOK: query: EXPLAIN CREATE EXTERNAL TABLE 
druid_partitioned_table
           cboolean2
           FROM alltypesorc where ctimestamp1 IS NOT NULL
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@druid_partitioned_table
 POSTHOOK: query: EXPLAIN CREATE EXTERNAL TABLE druid_partitioned_table
         STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
         TBLPROPERTIES (
@@ -99,6 +102,9 @@ POSTHOOK: query: EXPLAIN CREATE EXTERNAL TABLE 
druid_partitioned_table
           cboolean2
           FROM alltypesorc where ctimestamp1 IS NOT NULL
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@druid_partitioned_table
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -309,6 +315,8 @@ SELECT cast (`ctimestamp2` as timestamp with local time 
zone) as `__time`,
   cboolean2
   FROM alltypesorc where ctimestamp2 IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: default@druid_partitioned_table
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE druid_partitioned_table
 SELECT cast (`ctimestamp2` as timestamp with local time zone) as `__time`,
   cstring1,
@@ -323,6 +331,8 @@ SELECT cast (`ctimestamp2` as timestamp with local time 
zone) as `__time`,
   cboolean2
   FROM alltypesorc where ctimestamp2 IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: default@druid_partitioned_table
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 is a root stage
@@ -446,6 +456,8 @@ PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
druid_partitioned_table
     cboolean2
     FROM alltypesorc where ctimestamp1 IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: default@druid_partitioned_table
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE druid_partitioned_table
   SELECT cast (`ctimestamp1` as timestamp with local time zone) as `__time`,
     cstring1,
@@ -460,6 +472,8 @@ POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
druid_partitioned_table
     cboolean2
     FROM alltypesorc where ctimestamp1 IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: default@druid_partitioned_table
 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/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out
index a7fb6c5..575bf53 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out
@@ -805,11 +805,15 @@ year(date_c), month(date_c),day(date_c),
 year(timestamp_c), month(timestamp_c),day(timestamp_c), hour(timestamp_c), 
minute (timestamp_c), second (timestamp_c)
 from druid_test_extract_from_string_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_test_extract_from_string_table
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select
 year(date_c), month(date_c),day(date_c),
 year(timestamp_c), month(timestamp_c),day(timestamp_c), hour(timestamp_c), 
minute (timestamp_c), second (timestamp_c)
 from druid_test_extract_from_string_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_test_extract_from_string_table
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
index f3c0ba7..39b7a12 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
@@ -146,11 +146,17 @@ SELECT a, c
 FROM cmv_basetable_n2
 WHERE a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n2
+PREHOOK: Input: default@cmv_mat_view2_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN
 SELECT a, c
 FROM cmv_basetable_n2
 WHERE a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n2
+POSTHOOK: Input: default@cmv_mat_view2_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -196,6 +202,9 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n2
+PREHOOK: Input: default@cmv_mat_view2_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN
 SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE a = 3) table1
@@ -203,6 +212,9 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n2
+POSTHOOK: Input: default@cmv_mat_view2_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -321,6 +333,8 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN
 SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE a = 3) table1
@@ -328,6 +342,8 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -426,9 +442,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view2_n0 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n2
+PREHOOK: Output: default@cmv_mat_view2_n0
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view2_n0 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n2
+POSTHOOK: Output: default@cmv_mat_view2_n0
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-4 depends on stages: Stage-0, Stage-1, Stage-2
@@ -531,6 +551,9 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n2
+PREHOOK: Input: default@cmv_mat_view2_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN
 SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE a = 3) table1
@@ -538,6 +561,9 @@ SELECT * FROM (
   (SELECT a, c FROM cmv_basetable_n2 WHERE d = 3) table2
   ON table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n2
+POSTHOOK: Input: default@cmv_mat_view2_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 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/druid/druidmini_test_insert.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidmini_test_insert.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_test_insert.q.out
index 0da7610..a4a5594 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_test_insert.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_test_insert.q.out
@@ -426,8 +426,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 2015-03-10 23:59:59.0 US/Pacific       i3-end  2.0
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 00:00:00' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 00:00:00' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -450,8 +454,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 23:59:59' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 23:59:59' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -474,8 +482,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 00:00:00' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 00:00:00' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -498,8 +510,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 23:59:59' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 23:59:59' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -522,8 +538,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 00:00:00' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 00:00:00' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -546,8 +566,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 23:59:59' as timestamp with local time zone)
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 23:59:59' as timestamp with local time zone)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -624,8 +648,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 2015-03-10 23:59:59.0 US/Pacific       i3-end  2.0
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 00:00:00' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 00:00:00' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -648,8 +676,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 23:59:59' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-08 23:59:59' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -672,8 +704,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 00:00:00' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 00:00:00' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -696,8 +732,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 23:59:59' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-09 23:59:59' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -720,8 +760,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 00:00:00' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 00:00:00' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -744,8 +788,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 23:59:59' as timestamp )
 PREHOOK: type: QUERY
+PREHOOK: Input: druid_test_dst@druid_test_table_n9
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN select * from druid_test_table_n9 where `__time` = 
cast('2015-03-10 23:59:59' as timestamp )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: druid_test_dst@druid_test_table_n9
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/druid_basic3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_basic3.q.out 
b/ql/src/test/results/clientpositive/druid_basic3.q.out
index 54719f7..f8d4f17 100644
--- a/ql/src/test/results/clientpositive/druid_basic3.q.out
+++ b/ql/src/test/results/clientpositive/druid_basic3.q.out
@@ -16,12 +16,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT sum(added) + sum(delta) as a, language
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -50,12 +54,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT sum(delta), sum(added) + sum(delta) AS a, language
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -84,12 +92,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(added) / sum(delta) AS a
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -118,12 +130,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(added) * sum(delta) AS a
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -152,12 +168,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(added) - sum(delta) AS a
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -186,12 +206,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(added) + 100 AS a
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -222,6 +246,8 @@ FROM (
   GROUP BY language) subq
 ORDER BY c DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, -1 * (a + b) AS c
 FROM (
@@ -230,6 +256,8 @@ FROM (
   GROUP BY language) subq
 ORDER BY c DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -258,12 +286,16 @@ FROM druid_table_1_n4
 WHERE extract (week from `__time`) IN (10,11)
 GROUP BY language, robot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, robot, sum(added) - sum(delta) AS a
 FROM druid_table_1_n4
 WHERE extract (week from `__time`) IN (10,11)
 GROUP BY language, robot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -292,12 +324,16 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(delta) / count(*) AS a
 FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -327,6 +363,8 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, sum(added) / sum(delta) AS a,
        CASE WHEN sum(deleted)=0 THEN 1.0 ELSE sum(deleted) END AS b
@@ -334,6 +372,8 @@ FROM druid_table_1_n4
 GROUP BY language
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -364,6 +404,8 @@ FROM (
   GROUP BY language) subq
 ORDER BY a DESC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, a, a - b as c
 FROM (
@@ -372,6 +414,8 @@ FROM (
   GROUP BY language) subq
 ORDER BY a DESC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -403,6 +447,8 @@ FROM (
 ORDER BY "A"
 LIMIT 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, robot, "A"
 FROM (
@@ -412,6 +458,8 @@ FROM (
 ORDER BY "A"
 LIMIT 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -443,6 +491,8 @@ FROM (
 ORDER BY robot, language
 LIMIT 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT language, robot, "A"
 FROM (
@@ -452,6 +502,8 @@ FROM (
 ORDER BY robot, language
 LIMIT 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n4
+#### 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/druid_intervals.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_intervals.q.out 
b/ql/src/test/results/clientpositive/druid_intervals.q.out
index a5203c3..f95cbc2 100644
--- a/ql/src/test/results/clientpositive/druid_intervals.q.out
+++ b/ql/src/test/results/clientpositive/druid_intervals.q.out
@@ -64,10 +64,14 @@ PREHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -95,11 +99,15 @@ SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` < '2012-03-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` < '2012-03-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -127,11 +135,15 @@ SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` >= '2010-01-01 00:00:00' AND `__time` <= '2012-03-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` >= '2010-01-01 00:00:00' AND `__time` <= '2012-03-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -160,12 +172,16 @@ FROM druid_table_1_n0
 WHERE `__time` >= '2010-01-01 00:00:00' AND `__time` <= '2012-03-01 00:00:00'
     AND `__time` < '2011-01-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` >= '2010-01-01 00:00:00' AND `__time` <= '2012-03-01 00:00:00'
     AND `__time` < '2011-01-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -193,11 +209,15 @@ SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -226,12 +246,16 @@ FROM druid_table_1_n0
 WHERE (`__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00')
     OR (`__time` BETWEEN '2012-01-01 00:00:00' AND '2013-01-01 00:00:00')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE (`__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00')
     OR (`__time` BETWEEN '2012-01-01 00:00:00' AND '2013-01-01 00:00:00')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -260,12 +284,16 @@ FROM druid_table_1_n0
 WHERE (`__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00')
     OR (`__time` BETWEEN '2010-06-01 00:00:00' AND '2012-01-01 00:00:00')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE (`__time` BETWEEN '2010-01-01 00:00:00' AND '2011-01-01 00:00:00')
     OR (`__time` BETWEEN '2010-06-01 00:00:00' AND '2012-01-01 00:00:00')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -293,11 +321,15 @@ SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` IN ('2010-01-01 00:00:00','2011-01-01 00:00:00')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`
 FROM druid_table_1_n0
 WHERE `__time` IN ('2010-01-01 00:00:00','2011-01-01 00:00:00')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -325,11 +357,15 @@ SELECT `__time`, robot
 FROM druid_table_1_n0
 WHERE robot = 'user1' AND `__time` IN ('2010-01-01 00:00:00','2011-01-01 
00:00:00')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`, robot
 FROM druid_table_1_n0
 WHERE robot = 'user1' AND `__time` IN ('2010-01-01 00:00:00','2011-01-01 
00:00:00')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -357,11 +393,15 @@ SELECT `__time`, robot
 FROM druid_table_1_n0
 WHERE robot = 'user1' OR `__time` IN ('2010-01-01 00:00:00','2011-01-01 
00:00:00')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`, robot
 FROM druid_table_1_n0
 WHERE robot = 'user1' OR `__time` IN ('2010-01-01 00:00:00','2011-01-01 
00:00:00')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n0
+#### 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/druid_timeseries.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_timeseries.q.out 
b/ql/src/test/results/clientpositive/druid_timeseries.q.out
index 8b29145..c0c12bc 100644
--- a/ql/src/test/results/clientpositive/druid_timeseries.q.out
+++ b/ql/src/test/results/clientpositive/druid_timeseries.q.out
@@ -12,8 +12,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@druid_table_1_n3
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` >= '2010-01-01 00:00:00 UTC' AND  `__time` <= '2012-03-01 00:00:00 
UTC' OR  added <= 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` >= '2010-01-01 00:00:00 UTC' AND  `__time` <= '2012-03-01 00:00:00 
UTC' OR  added <= 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -38,8 +42,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00 UTC'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00 UTC'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -66,10 +74,14 @@ PREHOOK: query: EXPLAIN
 SELECT max(added), sum(variation)
 FROM druid_table_1_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT max(added), sum(variation)
 FROM druid_table_1_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -97,11 +109,15 @@ SELECT `__time`, max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY `__time`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `__time`, max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY `__time`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -129,11 +145,15 @@ SELECT floor_year(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_year(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_year(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_year(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -161,11 +181,15 @@ SELECT floor_quarter(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_quarter(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_quarter(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_quarter(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -193,11 +217,15 @@ SELECT floor_month(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_month(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_month(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_month(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -225,11 +253,15 @@ SELECT floor_week(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_week(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_week(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_week(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -257,11 +289,15 @@ SELECT floor_day(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_day(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_day(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_day(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -289,11 +325,15 @@ SELECT floor_hour(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_hour(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_hour(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_hour(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -321,11 +361,15 @@ SELECT floor_minute(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_minute(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_minute(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_minute(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -353,11 +397,15 @@ SELECT floor_second(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_second(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_second(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 GROUP BY floor_second(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -386,12 +434,16 @@ FROM druid_table_1_n3
 WHERE robot='1'
 GROUP BY floor_hour(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_hour(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
 WHERE robot='1'
 GROUP BY floor_hour(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -422,6 +474,8 @@ WHERE floor_hour(`__time`)
         AND CAST('2014-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME ZONE)
 GROUP BY floor_hour(`__time`)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT floor_hour(`__time`), max(added), sum(variation)
 FROM druid_table_1_n3
@@ -430,6 +484,8 @@ WHERE floor_hour(`__time`)
         AND CAST('2014-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME ZONE)
 GROUP BY floor_hour(`__time`)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -463,6 +519,8 @@ FROM
 WHERE subq.h BETWEEN CAST('2010-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME 
ZONE)
         AND CAST('2014-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME ZONE)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT subq.h, subq.m, subq.s
 FROM
@@ -474,6 +532,8 @@ FROM
 WHERE subq.h BETWEEN CAST('2010-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME 
ZONE)
         AND CAST('2014-01-01 00:00:00' AS TIMESTAMP WITH LOCAL TIME ZONE)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -498,8 +558,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -524,8 +588,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00 UTC'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00 UTC'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -550,8 +618,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` >= '2010-01-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` >= '2010-01-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -576,8 +648,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00' OR  `__time` <= '2012-03-01 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT count(`__time`) from druid_table_1_n3 where 
`__time` <= '2010-01-01 00:00:00' OR  `__time` <= '2012-03-01 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n3
+#### 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/druid_topn.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_topn.q.out 
b/ql/src/test/results/clientpositive/druid_topn.q.out
index 3ce327d..179902a 100644
--- a/ql/src/test/results/clientpositive/druid_topn.q.out
+++ b/ql/src/test/results/clientpositive/druid_topn.q.out
@@ -67,6 +67,8 @@ GROUP BY robot
 ORDER BY m DESC
 LIMIT 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, max(added) as m, sum(variation)
 FROM druid_table_1_n1
@@ -74,6 +76,8 @@ GROUP BY robot
 ORDER BY m DESC
 LIMIT 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -103,6 +107,8 @@ GROUP BY robot, `__time`
 ORDER BY s DESC
 LIMIT 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, `__time`, max(added), sum(variation) as s
 FROM druid_table_1_n1
@@ -110,6 +116,8 @@ GROUP BY robot, `__time`
 ORDER BY s DESC
 LIMIT 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -139,6 +147,8 @@ GROUP BY robot, floor_year(`__time`)
 ORDER BY s DESC
 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_year(`__time`), max(added), sum(variation) as s
 FROM druid_table_1_n1
@@ -146,6 +156,8 @@ GROUP BY robot, floor_year(`__time`)
 ORDER BY s DESC
 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -175,6 +187,8 @@ GROUP BY robot, floor_month(`__time`)
 ORDER BY s
 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_month(`__time`), max(added), sum(variation) as s
 FROM druid_table_1_n1
@@ -182,6 +196,8 @@ GROUP BY robot, floor_month(`__time`)
 ORDER BY s
 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -211,6 +227,8 @@ GROUP BY robot, namespace, floor_month(`__time`)
 ORDER BY s DESC, m DESC
 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_month(`__time`), max(added) as m, sum(variation) as s
 FROM druid_table_1_n1
@@ -218,6 +236,8 @@ GROUP BY robot, namespace, floor_month(`__time`)
 ORDER BY s DESC, m DESC
 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -247,6 +267,8 @@ GROUP BY robot, namespace, floor_month(`__time`)
 ORDER BY robot ASC, m DESC
 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_month(`__time`), max(added) as m, sum(variation) as s
 FROM druid_table_1_n1
@@ -254,6 +276,8 @@ GROUP BY robot, namespace, floor_month(`__time`)
 ORDER BY robot ASC, m DESC
 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -284,6 +308,8 @@ GROUP BY robot, floor_year(`__time`)
 ORDER BY s
 LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_year(`__time`), max(added), sum(variation) as s
 FROM druid_table_1_n1
@@ -292,6 +318,8 @@ GROUP BY robot, floor_year(`__time`)
 ORDER BY s
 LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -324,6 +352,8 @@ GROUP BY robot, floor_hour(`__time`)
 ORDER BY m
 LIMIT 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@druid_table_1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT robot, floor_hour(`__time`), max(added) as m, sum(variation)
 FROM druid_table_1_n1
@@ -334,6 +364,8 @@ GROUP BY robot, floor_hour(`__time`)
 ORDER BY m
 LIMIT 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@druid_table_1_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/dynamic_partition_skip_default.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out 
b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
index 5d925d4..d594ed4 100644
--- a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
+++ b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
@@ -44,8 +44,14 @@ POSTHOOK: Output: 
default@dynamic_part_table@partcol1=__HIVE_DEFAULT_PARTITION__
 POSTHOOK: Lineage: dynamic_part_table 
PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=__HIVE_DEFAULT_PARTITION__).intcol
 SIMPLE []
 PREHOOK: query: explain extended select intcol from dynamic_part_table where 
partcol1='1' and partcol2='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dynamic_part_table
+PREHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select intcol from dynamic_part_table where 
partcol1='1' and partcol2='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dynamic_part_table
+POSTHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `intcol`
 FROM `default`.`dynamic_part_table`
 WHERE `partcol1` = '1' AND `partcol2` = '1'
@@ -117,8 +123,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select intcol from dynamic_part_table where 
partcol1='1' and partcol2='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dynamic_part_table
+PREHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select intcol from dynamic_part_table where 
partcol1='1' and partcol2='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dynamic_part_table
+POSTHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `intcol`
 FROM `default`.`dynamic_part_table`
 WHERE `partcol1` = '1' AND `partcol2` = '1'
@@ -190,8 +202,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select intcol from dynamic_part_table where 
(partcol1='1' and partcol2='1')or (partcol1='1' and 
partcol2='__HIVE_DEFAULT_PARTITION__')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dynamic_part_table
+PREHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+PREHOOK: Input: 
default@dynamic_part_table@partcol1=1/partcol2=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select intcol from dynamic_part_table where 
(partcol1='1' and partcol2='1')or (partcol1='1' and 
partcol2='__HIVE_DEFAULT_PARTITION__')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dynamic_part_table
+POSTHOOK: Input: default@dynamic_part_table@partcol1=1/partcol2=1
+POSTHOOK: Input: 
default@dynamic_part_table@partcol1=1/partcol2=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `intcol`
 FROM `default`.`dynamic_part_table`
 WHERE `partcol1` = '1' AND (`partcol2` = '1' OR `partcol2` = 
'__HIVE_DEFAULT_PARTITION__')

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/dynpart_sort_optimization_acid2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/dynpart_sort_optimization_acid2.q.out 
b/ql/src/test/results/clientpositive/dynpart_sort_optimization_acid2.q.out
index aea7572..35726b2 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_optimization_acid2.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_optimization_acid2.q.out
@@ -15,9 +15,20 @@ POSTHOOK: Output: default@non_acid
 PREHOOK: query: explain
 insert into table non_acid partition(ds,hr) select * from srcpart sort by value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Output: default@non_acid
 POSTHOOK: query: explain
 insert into table non_acid partition(ds,hr) select * from srcpart sort by value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 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/empty_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/empty_join.q.out 
b/ql/src/test/results/clientpositive/empty_join.q.out
index dc473e1..12c0525 100644
--- a/ql/src/test/results/clientpositive/empty_join.q.out
+++ b/ql/src/test/results/clientpositive/empty_join.q.out
@@ -46,12 +46,20 @@ FROM test_1_n2 t1
 LEFT JOIN test_2_n2 t2 ON t1.id = t2.id
 INNER JOIN test_3_n0 t3 ON t1.id = t3.id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n2
+PREHOOK: Input: default@test_2_n2
+PREHOOK: Input: default@test_3_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT t1.id, t2.id, t3.id
 FROM test_1_n2 t1
 LEFT JOIN test_2_n2 t2 ON t1.id = t2.id
 INNER JOIN test_3_n0 t3 ON t1.id = t3.id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n2
+POSTHOOK: Input: default@test_2_n2
+POSTHOOK: Input: default@test_3_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-4 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index c258e82..49f7be8 100644
--- 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++ 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -534,8 +534,14 @@ POSTHOOK: Input: default@encrypted_table
 97     val_97
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2 
WHERE t1.key = t2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@encrypted_table
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2 
WHERE t1.key = t2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@encrypted_table
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, `value`
 FROM `default`.`src`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
index 01343bf..ddde45b 100644
--- 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
+++ 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
@@ -52,8 +52,14 @@ POSTHOOK: Lineage: table_key_2.key EXPRESSION 
[(src)src.FieldSchema(name:key, ty
 POSTHOOK: Lineage: table_key_2.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM table_key_1 t1 JOIN table_key_2 
t2 WHERE (t1.key = t2.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_key_1
+PREHOOK: Input: default@table_key_2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM table_key_1 t1 JOIN 
table_key_2 t2 WHERE (t1.key = t2.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_key_1
+POSTHOOK: Input: default@table_key_2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 OPTIMIZED SQL: SELECT *
 FROM (SELECT `key`, `value`
 FROM `default`.`table_key_1`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/escape_clusterby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_clusterby1.q.out 
b/ql/src/test/results/clientpositive/escape_clusterby1.q.out
index da37ef5..116b0fd 100644
--- a/ql/src/test/results/clientpositive/escape_clusterby1.q.out
+++ b/ql/src/test/results/clientpositive/escape_clusterby1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src cluster by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src cluster by key, value
 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
@@ -47,9 +51,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select `key`, value from src cluster by `key`, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select `key`, value from src cluster by `key`, value
 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/escape_distributeby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_distributeby1.q.out 
b/ql/src/test/results/clientpositive/escape_distributeby1.q.out
index ed20201..1e006f7 100644
--- a/ql/src/test/results/clientpositive/escape_distributeby1.q.out
+++ b/ql/src/test/results/clientpositive/escape_distributeby1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src distribute by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src distribute by key, value
 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
@@ -47,9 +51,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select `key`, value from src distribute by `key`, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select `key`, value from src distribute by `key`, value
 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/escape_orderby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_orderby1.q.out 
b/ql/src/test/results/clientpositive/escape_orderby1.q.out
index 70ed8f4..30a0c8f 100644
--- a/ql/src/test/results/clientpositive/escape_orderby1.q.out
+++ b/ql/src/test/results/clientpositive/escape_orderby1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src order by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src order by key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -46,9 +50,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select `key`, value from src order by `key`, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select `key`, value from src order by `key`, value
 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/escape_sortby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/escape_sortby1.q.out 
b/ql/src/test/results/clientpositive/escape_sortby1.q.out
index 7d28cf2..ce473e1 100644
--- a/ql/src/test/results/clientpositive/escape_sortby1.q.out
+++ b/ql/src/test/results/clientpositive/escape_sortby1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src sort by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src sort by key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -46,9 +50,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select `key`, value from src sort by `key`, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select `key`, value from src sort by `key`, value
 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/except_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/except_all.q.out 
b/ql/src/test/results/clientpositive/except_all.q.out
index 5263e3c..faba237 100644
--- a/ql/src/test/results/clientpositive/except_all.q.out
+++ b/ql/src/test/results/clientpositive/except_all.q.out
@@ -212,8 +212,12 @@ POSTHOOK: Input: default@b_n11
 2      20
 PREHOOK: query: explain select * from src except all select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from src except all select * from src
 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, Stage-3
@@ -386,8 +390,12 @@ POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from src except all select * from src except 
distinct select * from src except distinct select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from src except all select * from src except 
distinct select * from src except distinct select * from src
 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, Stage-6
@@ -816,8 +824,14 @@ POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 PREHOOK: query: explain select value from a_n15 group by value except distinct 
select key from b_n11 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n15
+PREHOOK: Input: default@b_n11
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from a_n15 group by value except 
distinct select key from b_n11 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n15
+POSTHOOK: Input: default@b_n11
+#### 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/exec_parallel_column_stats.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/exec_parallel_column_stats.q.out 
b/ql/src/test/results/clientpositive/exec_parallel_column_stats.q.out
index b178aff..9622041 100644
--- a/ql/src/test/results/clientpositive/exec_parallel_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/exec_parallel_column_stats.q.out
@@ -12,8 +12,14 @@ POSTHOOK: Lineage: t_n25.key SIMPLE 
[(src)src.FieldSchema(name:key, type:string,
 POSTHOOK: Lineage: t_n25.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: explain analyze table t_n25 compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@t_n25
+PREHOOK: Output: default@t_n25
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table t_n25 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@t_n25
+POSTHOOK: Output: default@t_n25
+#### 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/explain_ddl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_ddl.q.out 
b/ql/src/test/results/clientpositive/explain_ddl.q.out
index df31faa..3846b2c 100644
--- a/ql/src/test/results/clientpositive/explain_ddl.q.out
+++ b/ql/src/test/results/clientpositive/explain_ddl.q.out
@@ -44,8 +44,14 @@ POSTHOOK: Input: default@m1
 497
 PREHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from src
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@M1
 POSTHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from src
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@M1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -138,8 +144,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from M1
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@m1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@M1
 POSTHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from M1
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@m1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@M1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -232,8 +244,16 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from V1_n0
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Input: default@v1_n0
+PREHOOK: Output: database:default
+PREHOOK: Output: default@M1
 POSTHOOK: query: EXPLAIN CREATE TABLE M1 AS select * from V1_n0
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@v1_n0
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@M1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -328,8 +348,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE TABLE V1_n0 AS select * from M1
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@m1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@V1_n0
 POSTHOOK: query: EXPLAIN CREATE TABLE V1_n0 AS select * from M1
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@m1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@V1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -422,8 +448,14 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE VIEW V1_n0 AS select * from M1
 PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@m1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@V1_n0
 POSTHOOK: query: EXPLAIN CREATE VIEW V1_n0 AS select * from M1
 POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@m1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@V1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
 
@@ -438,8 +470,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE TABLE M1 LIKE src
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@M1
 POSTHOOK: query: EXPLAIN CREATE TABLE M1 LIKE src
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@M1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -455,8 +491,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN CREATE TABLE M1 LIKE M1
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@M1
 POSTHOOK: query: EXPLAIN CREATE TABLE M1 LIKE M1
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@M1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -472,8 +512,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN DROP TABLE M1
 PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@m1
+PREHOOK: Output: default@m1
 POSTHOOK: query: EXPLAIN DROP TABLE M1
 POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@m1
+POSTHOOK: Output: default@m1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -494,8 +538,12 @@ POSTHOOK: Input: default@m1
 497
 PREHOOK: query: EXPLAIN INSERT INTO M1 SELECT * FROM M1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@m1
+PREHOOK: Output: default@m1
 POSTHOOK: query: EXPLAIN INSERT INTO M1 SELECT * FROM M1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@m1
+POSTHOOK: Output: default@m1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -620,8 +668,10 @@ POSTHOOK: Input: default@m1
 497
 PREHOOK: query: EXPLAIN TRUNCATE TABLE M1
 PREHOOK: type: TRUNCATETABLE
+PREHOOK: Output: default@m1
 POSTHOOK: query: EXPLAIN TRUNCATE TABLE M1
 POSTHOOK: type: TRUNCATETABLE
+POSTHOOK: Output: default@m1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explain_dependency.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_dependency.q.out 
b/ql/src/test/results/clientpositive/explain_dependency.q.out
index b7b18e1..da1036b 100644
--- a/ql/src/test/results/clientpositive/explain_dependency.q.out
+++ b/ql/src/test/results/clientpositive/explain_dependency.q.out
@@ -69,54 +69,156 @@ POSTHOOK: Lineage: V4.value2 SIMPLE 
[(src)src3.FieldSchema(name:value, type:stri
 PREHOOK: query: EXPLAIN DEPENDENCY 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY 
   SELECT key, count(1) FROM (SELECT key, value FROM src) subq1 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY 
   SELECT key, count(1) FROM (SELECT key, value FROM src) subq1 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY 
   SELECT * FROM (
     SELECT key, value FROM src UNION ALL SELECT key, value FROM srcpart WHERE 
ds IS NOT NULL
   ) S1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY 
   SELECT * FROM (
     SELECT key, value FROM src UNION ALL SELECT key, value FROM srcpart WHERE 
ds IS NOT NULL
   ) S1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY 
   SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE 
ds IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY 
   SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE 
ds IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V1_n6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@v1_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V1_n6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@v1_n6
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@v1_n6","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v1_n6]"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V2_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Input: default@v2_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V2_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+POSTHOOK: Input: default@v2_n1
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@v2_n1","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2_n1]"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Input: default@v2_n1
+PREHOOK: Input: default@v3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+POSTHOOK: Input: default@v2_n1
+POSTHOOK: Input: default@v3
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@v3","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2_n1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v3]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v3]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2_n1]"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Input: default@v1_n6
+PREHOOK: Input: default@v2_n1
+PREHOOK: Input: default@v4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+POSTHOOK: Input: default@v1_n6
+POSTHOOK: Input: default@v2_n1
+POSTHOOK: Input: default@v4
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@v4","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v1_n6","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@v2_n1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v4,
 
default@v1_n6]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2_n1]"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10'
 PREHOOK: type: CREATEVIEW
@@ -134,6 +236,12 @@ POSTHOOK: Lineage: V5.key SIMPLE 
[(srcpart)srcpart.FieldSchema(name:key, type:st
 POSTHOOK: Lineage: V5.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v5
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@v5","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v5]"}],"input_partitions":[]}

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explain_dependency2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_dependency2.q.out 
b/ql/src/test/results/clientpositive/explain_dependency2.q.out
index c2ee3f5..102ddc2 100644
--- a/ql/src/test/results/clientpositive/explain_dependency2.q.out
+++ b/ql/src/test/results/clientpositive/explain_dependency2.q.out
@@ -1,32 +1,64 @@
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM srcpart where ds is not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM srcpart where ds is not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM srcpart where ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM srcpart where ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds is 
not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds is 
not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: create table tstsrcpart like srcpart
 PREHOOK: type: CREATETABLE
@@ -38,11 +70,19 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tstsrcpart
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM tstsrcpart where ds is not 
null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tstsrcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM tstsrcpart where ds is not 
null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tstsrcpart
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@tstsrcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM tstsrcpart where ds is 
not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tstsrcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT count(*) FROM tstsrcpart where ds 
is not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tstsrcpart
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@tstsrcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explain_locks.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_locks.q.out 
b/ql/src/test/results/clientpositive/explain_locks.q.out
index 72aa410..ed7f1e8 100644
--- a/ql/src/test/results/clientpositive/explain_locks.q.out
+++ b/ql/src/test/results/clientpositive/explain_locks.q.out
@@ -4,8 +4,12 @@ POSTHOOK: query: explain locks drop table test_explain_locks
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: explain locks create table test_explain_locks (a int, b int)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@test_explain_locks
 POSTHOOK: query: explain locks create table test_explain_locks (a int, b int)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@test_explain_locks
 LOCK INFORMATION:
 default -> SHARED_READ
 PREHOOK: query: drop table if exists target
@@ -50,8 +54,24 @@ POSTHOOK: Lineage: target PARTITION(p=2,q=2).a SCRIPT []
 POSTHOOK: Lineage: target PARTITION(p=2,q=2).b SCRIPT []
 PREHOOK: query: explain locks update target set b = 1 where p in (select t.q1 
from source t where t.a1=5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@source
+PREHOOK: Input: default@target
+PREHOOK: Input: default@target@p=1/q=2
+PREHOOK: Input: default@target@p=1/q=3
+PREHOOK: Input: default@target@p=2/q=2
+PREHOOK: Output: default@target@p=1/q=2
+PREHOOK: Output: default@target@p=1/q=3
+PREHOOK: Output: default@target@p=2/q=2
 POSTHOOK: query: explain locks update target set b = 1 where p in (select t.q1 
from source t where t.a1=5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@source
+POSTHOOK: Input: default@target
+POSTHOOK: Input: default@target@p=1/q=2
+POSTHOOK: Input: default@target@p=1/q=3
+POSTHOOK: Input: default@target@p=2/q=2
+POSTHOOK: Output: default@target@p=1/q=2
+POSTHOOK: Output: default@target@p=1/q=3
+POSTHOOK: Output: default@target@p=2/q=2
 LOCK INFORMATION:
 default.source -> SHARED_READ
 default.target.p=1/q=2 -> SHARED_READ
@@ -62,21 +82,62 @@ default.target.p=1/q=3 -> SHARED_WRITE
 default.target.p=1/q=2 -> SHARED_WRITE
 PREHOOK: query: explain locks update source set b1 = 1 where p1 in (select t.q 
from target t where t.p=2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@source
+PREHOOK: Input: default@target
+PREHOOK: Input: default@target@p=2/q=2
+PREHOOK: Output: default@source
 POSTHOOK: query: explain locks update source set b1 = 1 where p1 in (select 
t.q from target t where t.p=2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@source
+POSTHOOK: Input: default@target
+POSTHOOK: Input: default@target@p=2/q=2
+POSTHOOK: Output: default@source
 LOCK INFORMATION:
 default.target -> SHARED_READ
 default.target.p=2/q=2 -> SHARED_READ
 default.source -> SHARED_WRITE
 PREHOOK: query: explain formatted locks update source set b1 = 1 where p1 in 
(select t.q from target t where t.p=2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@source
+PREHOOK: Input: default@target
+PREHOOK: Input: default@target@p=2/q=2
+PREHOOK: Output: default@source
 POSTHOOK: query: explain formatted locks update source set b1 = 1 where p1 in 
(select t.q from target t where t.p=2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@source
+POSTHOOK: Input: default@target
+POSTHOOK: Input: default@target@p=2/q=2
+POSTHOOK: Output: default@source
 {"LOCK INFORMATION:":"[default.target -> SHARED_READ, default.target.p=2/q=2 
-> SHARED_READ, default.source -> SHARED_WRITE]"}
 PREHOOK: query: explain locks merge into target t using source s on t.a = s.a1 
when matched and p = 1 and q = 2 then update set b = 1 when matched and p = 2 
and q = 2 then delete when not matched and a1 > 100 then insert 
values(s.a1,s.b1,s.p1, s.q1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@source
+PREHOOK: Input: default@target
+PREHOOK: Input: default@target@p=1/q=2
+PREHOOK: Input: default@target@p=1/q=3
+PREHOOK: Input: default@target@p=2/q=2
+PREHOOK: Output: default@merge_tmp_table
+PREHOOK: Output: default@target
+PREHOOK: Output: default@target@p=1/q=2
+PREHOOK: Output: default@target@p=1/q=2
+PREHOOK: Output: default@target@p=1/q=3
+PREHOOK: Output: default@target@p=1/q=3
+PREHOOK: Output: default@target@p=2/q=2
+PREHOOK: Output: default@target@p=2/q=2
 POSTHOOK: query: explain locks merge into target t using source s on t.a = 
s.a1 when matched and p = 1 and q = 2 then update set b = 1 when matched and p 
= 2 and q = 2 then delete when not matched and a1 > 100 then insert 
values(s.a1,s.b1,s.p1, s.q1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@source
+POSTHOOK: Input: default@target
+POSTHOOK: Input: default@target@p=1/q=2
+POSTHOOK: Input: default@target@p=1/q=3
+POSTHOOK: Input: default@target@p=2/q=2
+POSTHOOK: Output: default@merge_tmp_table
+POSTHOOK: Output: default@target@p=1/q=2
+POSTHOOK: Output: default@target@p=1/q=2
+POSTHOOK: Output: default@target@p=1/q=3
+POSTHOOK: Output: default@target@p=1/q=3
+POSTHOOK: Output: default@target@p=2/q=2
+POSTHOOK: Output: default@target@p=2/q=2
 LOCK INFORMATION:
 default.source -> SHARED_READ
 default.target.p=1/q=2 -> SHARED_READ

Reply via email to