http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 470f132..e4aada4 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
@@ -319,6 +331,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
@@ -326,6 +340,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
@@ -422,9 +438,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
@@ -527,6 +547,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
@@ -534,6 +557,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/c39b5d1b/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 c675aeb..c40c5f4 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/c39b5d1b/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/c39b5d1b/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 fde446c..9972046 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/c39b5d1b/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 455bdd5..64cdd17 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-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -224,11 +248,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
 
@@ -256,11 +284,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
 
@@ -288,11 +320,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
 
@@ -320,11 +356,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
 
@@ -352,11 +392,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
 
@@ -384,11 +428,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
 
@@ -417,12 +465,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
 
@@ -453,6 +505,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
@@ -461,6 +515,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
 
@@ -494,6 +550,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
@@ -505,6 +563,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
 
@@ -529,8 +589,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
 
@@ -555,8 +619,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
 
@@ -581,8 +649,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
 
@@ -607,8 +679,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/c39b5d1b/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 7bfd2ae..5d7543a 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/c39b5d1b/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 ee9a4af..c571e0b 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -114,8 +120,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -184,8 +196,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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 80ffad6..3a72a2d 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 ###
 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/c39b5d1b/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 c88a6f3..ac18b48 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 ###
 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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/ql/src/test/results/clientpositive/explain_logical.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out 
b/ql/src/test/results/clientpositive/explain_logical.q.out
index 6b7e986..428fa58 100644
--- a/ql/src/test/results/clientpositive/explain_logical.q.out
+++ b/ql/src/test/results/clientpositive/explain_logical.q.out
@@ -69,9 +69,13 @@ POSTHOOK: Lineage: V4_n1.value2 SIMPLE 
[(src)src3.FieldSchema(name:value, type:s
 PREHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -110,9 +114,13 @@ srcpart
 PREHOOK: query: EXPLAIN LOGICAL 
   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 LOGICAL 
   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 ####
 LOGICAL PLAN:
 src 
   TableScan (TS_0)
@@ -153,11 +161,17 @@ PREHOOK: query: EXPLAIN LOGICAL
     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
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   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
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0-subquery1:src 
   TableScan (TS_0)
@@ -190,9 +204,15 @@ $hdt$_0-subquery2:srcpart
 PREHOOK: query: EXPLAIN LOGICAL 
   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
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   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
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:s1 
   TableScan (TS_0)
@@ -257,8 +277,14 @@ $hdt$_1:s2
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V1_n8
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@v1_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V1_n8
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@v1_n8
+#### A masked pattern was here ####
 LOGICAL PLAN:
 src 
   TableScan (TS_0)
@@ -274,8 +300,22 @@ src
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V2_n3
 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_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V2_n3
 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_n3
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -291,8 +331,18 @@ srcpart
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V3_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v2_n3
+PREHOOK: Input: default@v3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V3_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v2_n3
+POSTHOOK: Input: default@v3_n1
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:srcpart 
   TableScan (TS_0)
@@ -361,8 +411,20 @@ $hdt$_1:src2
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V4_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v1_n8
+PREHOOK: Input: default@v2_n3
+PREHOOK: Input: default@v4_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V4_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v1_n8
+POSTHOOK: Input: default@v2_n3
+POSTHOOK: Input: default@v4_n1
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:srcpart 
   TableScan (TS_0)
@@ -478,8 +540,14 @@ POSTHOOK: Lineage: V5_n0.key SIMPLE 
[(srcpart)srcpart.FieldSchema(name:key, type
 POSTHOOK: Lineage: V5_n0.value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V5_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v5_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V5_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v5_n0
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -498,8 +566,12 @@ srcpart
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT s1.key, s1.cnt, s2.value FROM (SELECT 
key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src s2 ON (s1.key = 
s2.key) ORDER BY s1.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT s1.key, s1.cnt, s2.value FROM (SELECT 
key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src s2 ON (s1.key = 
s2.key) ORDER BY s1.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:src 
   TableScan (TS_0)

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

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/explain_rearrange.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_rearrange.q.out 
b/ql/src/test/results/clientpositive/explain_rearrange.q.out
index be1b8ed..e36248f 100644
--- a/ql/src/test/results/clientpositive/explain_rearrange.q.out
+++ b/ql/src/test/results/clientpositive/explain_rearrange.q.out
@@ -32,6 +32,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -50,6 +53,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, 
Stage-11, Stage-2 [CONDITIONAL]
@@ -304,6 +310,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -322,6 +331,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 depends on stages: Stage-1, Stage-9 , consists of Stage-3, Stage-6, 
Stage-8 [CONDITIONAL]
@@ -576,6 +588,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -594,6 +609,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]
@@ -848,6 +866,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -866,6 +887,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]

Reply via email to