http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out 
b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
index c9823ce..e52b2f7 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
@@ -36,9 +36,20 @@ hr                   string
 PREHOOK: query: explain
 insert overwrite table nzhang_part3 partition (ds, hr) select key, value, ds, 
hr from srcpart where ds is not null and hr 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
+PREHOOK: Output: default@nzhang_part3
 POSTHOOK: query: explain
 insert overwrite table nzhang_part3 partition (ds, hr) select key, value, ds, 
hr from srcpart where ds is not null and hr 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
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out 
b/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
index 7223808..c024062 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part5.q.out
@@ -23,9 +23,12 @@ value                string
 PREHOOK: query: explain
 insert overwrite table nzhang_part5 partition (value) select key, value from 
src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@nzhang_part5
 POSTHOOK: query: explain
 insert overwrite table nzhang_part5 partition (value) select key, value from 
src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
index 56aff94..aac3d75 100644
--- a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
@@ -90,6 +90,9 @@ select sub1.aid, sub1.avalue, sub2.bvalue
 from sub1,sub2
 where sub1.aid=sub2.bid
 PREHOOK: type: QUERY
+PREHOOK: Input: default@expod1
+PREHOOK: Input: default@expod2
+#### A masked pattern was here ####
 POSTHOOK: query: explain with sub1 as
 (select aid, avalue from expod1 lateral view explode(av) avs as avalue ),
 sub2 as
@@ -98,6 +101,9 @@ select sub1.aid, sub1.avalue, sub2.bvalue
 from sub1,sub2
 where sub1.aid=sub2.bid
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@expod1
+POSTHOOK: Input: default@expod2
+#### 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/llap/mapjoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin3.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin3.q.out
index 7aa7318..ac36e4f 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin3.q.out
@@ -76,6 +76,9 @@ test_1
 ) t1 
 ON t2.member = t1.member
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1
+PREHOOK: Input: default@test_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT 
 t2.member 
@@ -93,6 +96,9 @@ test_1
 ) t1 
 ON t2.member = t1.member
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1
+POSTHOOK: Input: default@test_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
index 60128da..a7ad252 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
@@ -45,11 +45,17 @@ SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -143,6 +149,9 @@ ON (test1_n4.value=test2_n2.value
   AND test1_n4.key between 100 and 102
   AND test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
@@ -150,6 +159,9 @@ ON (test1_n4.value=test2_n2.value
   AND test1_n4.key between 100 and 102
   AND test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -251,12 +263,18 @@ FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.key between 100 and 102
   AND test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.key between 100 and 102
   AND test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -353,11 +371,17 @@ SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value AND true)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value AND true)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -448,11 +472,17 @@ SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -553,6 +583,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
@@ -560,6 +593,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -662,12 +698,18 @@ FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -768,12 +810,18 @@ FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -869,6 +917,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 LEFT OUTER JOIN test2_n2
@@ -876,6 +927,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -974,6 +1028,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
@@ -981,6 +1038,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1083,12 +1143,18 @@ FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1186,12 +1252,18 @@ FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1289,6 +1361,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 RIGHT OUTER JOIN test2_n2
@@ -1296,6 +1371,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1392,6 +1470,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 FULL OUTER JOIN test2_n2
@@ -1399,6 +1480,9 @@ ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1506,12 +1590,18 @@ FROM test1_n4 FULL OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 FULL OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test1_n4.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1617,12 +1707,18 @@ FROM test1_n4 FULL OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 FULL OUTER JOIN test2_n2
 ON (test1_n4.value=test2_n2.value
   OR test2_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1725,6 +1821,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n4 FULL OUTER JOIN test2_n2
@@ -1732,6 +1831,9 @@ ON (test1_n4.value=test2_n2.value
   AND (test1_n4.key between 100 and 102
     OR test2_n2.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1852,6 +1954,9 @@ FULL OUTER JOIN (
   ) sq2
 ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n4
+PREHOOK: Input: default@test2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM (
@@ -1872,6 +1977,9 @@ FULL OUTER JOIN (
   ) sq2
 ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n4
+POSTHOOK: Input: default@test2_n2
+#### 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/llap/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
index 795ecfe..60af066 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
@@ -75,9 +75,15 @@ POSTHOOK: Lineage: t2_n59.dec EXPRESSION 
[(over1k_n5)over1k_n5.FieldSchema(name:
 PREHOOK: query: explain
 select t1_n95.`dec`, t2_n59.`dec` from t1_n95 join t2_n59 on 
(t1_n95.`dec`=t2_n59.`dec`) order by t1_n95.`dec`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n95
+PREHOOK: Input: default@t2_n59
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select t1_n95.`dec`, t2_n59.`dec` from t1_n95 join t2_n59 on 
(t1_n95.`dec`=t2_n59.`dec`) order by t1_n95.`dec`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n95
+POSTHOOK: Input: default@t2_n59
+#### 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/llap/mapjoin_emit_interval.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
index f6a1a6e..3f0ebf3 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
@@ -45,11 +45,17 @@ SELECT *
 FROM test1_n0 LEFT OUTER JOIN test2
 ON (test1_n0.value=test2.value AND test1_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n0
+PREHOOK: Input: default@test2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n0 LEFT OUTER JOIN test2
 ON (test1_n0.value=test2.value AND test1_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n0
+POSTHOOK: Input: default@test2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -144,11 +150,17 @@ SELECT *
 FROM test1_n0 LEFT OUTER JOIN test2
 ON (test1_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n0
+PREHOOK: Input: default@test2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n0 LEFT OUTER JOIN test2
 ON (test1_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n0
+POSTHOOK: Input: default@test2
+#### 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/llap/mapjoin_hint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
index 5cccce9..a5fde81 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
@@ -122,8 +122,22 @@ POSTHOOK: Output: default@srcpart_small_n1@ds=2008-04-09
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN select /*+ mapjoin(None)*/ count(*) from 
srcpart_date_n5 join srcpart_small_n1 on (srcpart_date_n5.key = 
srcpart_small_n1.key1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_date_n5
+PREHOOK: Input: default@srcpart_date_n5@ds=2008-04-08
+PREHOOK: Input: default@srcpart_date_n5@ds=2008-04-09
+PREHOOK: Input: default@srcpart_small_n1
+PREHOOK: Input: default@srcpart_small_n1@ds=2008-04-08
+PREHOOK: Input: default@srcpart_small_n1@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN select /*+ mapjoin(None)*/ count(*) from 
srcpart_date_n5 join srcpart_small_n1 on (srcpart_date_n5.key = 
srcpart_small_n1.key1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_date_n5
+POSTHOOK: Input: default@srcpart_date_n5@ds=2008-04-08
+POSTHOOK: Input: default@srcpart_date_n5@ds=2008-04-09
+POSTHOOK: Input: default@srcpart_small_n1
+POSTHOOK: Input: default@srcpart_small_n1@ds=2008-04-08
+POSTHOOK: Input: default@srcpart_small_n1@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -247,8 +261,22 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date_n5 join 
srcpart_small_n1 on (srcpart_date_n5.key = srcpart_small_n1.key1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_date_n5
+PREHOOK: Input: default@srcpart_date_n5@ds=2008-04-08
+PREHOOK: Input: default@srcpart_date_n5@ds=2008-04-09
+PREHOOK: Input: default@srcpart_small_n1
+PREHOOK: Input: default@srcpart_small_n1@ds=2008-04-08
+PREHOOK: Input: default@srcpart_small_n1@ds=2008-04-09
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN select count(*) from srcpart_date_n5 join 
srcpart_small_n1 on (srcpart_date_n5.key = srcpart_small_n1.key1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_date_n5
+POSTHOOK: Input: default@srcpart_date_n5@ds=2008-04-08
+POSTHOOK: Input: default@srcpart_date_n5@ds=2008-04-09
+POSTHOOK: Input: default@srcpart_small_n1
+POSTHOOK: Input: default@srcpart_small_n1@ds=2008-04-08
+POSTHOOK: Input: default@srcpart_small_n1@ds=2008-04-09
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -421,8 +449,14 @@ POSTHOOK: Lineage: part_null_n1.p_type SCRIPT []
 Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select /*+ mapjoin(None)*/ * from part where p_name = 
(select p_name from part_null_n1 where p_name is null)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Input: default@part_null_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select /*+ mapjoin(None)*/ * from part where p_name = 
(select p_name from part_null_n1 where p_name is null)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Input: default@part_null_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -530,8 +564,14 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from part where p_name = (select p_name from 
part_null_n1 where p_name is null)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Input: default@part_null_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from part where p_name = (select p_name from 
part_null_n1 where p_name is null)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Input: default@part_null_n1
+#### 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/llap/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
index a6dd161..08d751e 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
@@ -1,7 +1,23 @@
 PREHOOK: query: explain extended select srcpart.key from srcpart join src on 
(srcpart.value=src.value) join src1 on (srcpart.key=src1.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+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 extended select srcpart.key from srcpart join src on 
(srcpart.value=src.value) join src1 on (srcpart.key=src1.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+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 ####
 OPTIMIZED SQL: SELECT `t2`.`key`
 FROM (SELECT `value`
 FROM `default`.`src`
@@ -454,9 +470,25 @@ STAGE PLANS:
 PREHOOK: query: explain
 select srcpart.key from srcpart join src on (srcpart.value=src.value) join 
src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+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
 select srcpart.key from srcpart join src on (srcpart.value=src.value) join 
src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+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 ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -558,9 +590,23 @@ STAGE PLANS:
 PREHOOK: query: explain
 select count(*) from srcpart join src on (srcpart.value=src.value) join src 
src1 on (srcpart.key=src1.key) group by ds
 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
 select count(*) from srcpart join src on (srcpart.value=src.value) join src 
src1 on (srcpart.key=src1.key) group by ds
 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 ####
 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/llap/mapreduce1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapreduce1.q.out 
b/ql/src/test/results/clientpositive/llap/mapreduce1.q.out
index b675392..9b9110f 100644
--- a/ql/src/test/results/clientpositive/llap/mapreduce1.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapreduce1.q.out
@@ -14,6 +14,8 @@ USING 'cat' AS (tkey, ten, one, tvalue)
 DISTRIBUTE BY tvalue, tkey
 SORT BY ten, one
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n120
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n120
@@ -22,6 +24,8 @@ USING 'cat' AS (tkey, ten, one, tvalue)
 DISTRIBUTE BY tvalue, tkey
 SORT BY ten, one
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n120
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/mapreduce2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapreduce2.q.out 
b/ql/src/test/results/clientpositive/llap/mapreduce2.q.out
index db7b992..5df015f 100644
--- a/ql/src/test/results/clientpositive/llap/mapreduce2.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapreduce2.q.out
@@ -13,6 +13,8 @@ MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS 
INT), src.value
 USING 'cat' AS (tkey, ten, one, tvalue)
 DISTRIBUTE BY tvalue, tkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n162
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n162
@@ -20,6 +22,8 @@ MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS 
INT), src.value
 USING 'cat' AS (tkey, ten, one, tvalue)
 DISTRIBUTE BY tvalue, tkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n162
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
index b949618..3c493f0 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
@@ -107,9 +107,15 @@ totalSize  326
 PREHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, c from cmv_basetable_n10 where a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -153,6 +159,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -160,6 +168,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -259,9 +269,13 @@ POSTHOOK: Input: default@cmv_basetable_n10
 PREHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view2_n4
+PREHOOK: Output: default@cmv_mat_view2_n4
 POSTHOOK: query: explain
 alter materialized view cmv_mat_view2_n4 enable rewrite
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view2_n4
+POSTHOOK: Output: default@cmv_mat_view2_n4
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -288,6 +302,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+PREHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -295,6 +312,9 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+POSTHOOK: Input: default@cmv_mat_view2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -402,6 +422,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n10 where a = 3) table1
@@ -409,6 +431,8 @@ select * from (
   (select a, c from cmv_basetable_n10 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
index d311f36..ecfb397 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
@@ -53,9 +53,13 @@ POSTHOOK: Output: default@cmv_mat_view_n9
 PREHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -143,9 +147,13 @@ POSTHOOK: Output: default@cmv_mat_view_2
 PREHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -233,9 +241,15 @@ POSTHOOK: Output: default@cmv_mat_view_3
 PREHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n9
+PREHOOK: Input: default@cmv_mat_view_3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select b from cmv_basetable_n9 where c > 20.0 group by a, b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n9
+POSTHOOK: Input: default@cmv_mat_view_3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -325,9 +339,15 @@ POSTHOOK: Output: default@cmv_mat_view_4
 PREHOOK: query: explain
 select b from cmv_basetable_n9 group by b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n9
+PREHOOK: Input: default@cmv_mat_view_4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select b from cmv_basetable_n9 group by b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n9
+POSTHOOK: Input: default@cmv_mat_view_4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -458,12 +478,20 @@ from cmv_basetable_n9 join cmv_basetable_2_n4 on 
(cmv_basetable_n9.a = cmv_baset
 where cmv_basetable_2_n4.c > 10.10
 group by cmv_basetable_n9.a, cmv_basetable_2_n4.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n4
+PREHOOK: Input: default@cmv_basetable_n9
+PREHOOK: Input: default@cmv_mat_view_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select cmv_basetable_n9.a
 from cmv_basetable_n9 join cmv_basetable_2_n4 on (cmv_basetable_n9.a = 
cmv_basetable_2_n4.a)
 where cmv_basetable_2_n4.c > 10.10
 group by cmv_basetable_n9.a, cmv_basetable_2_n4.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n4
+POSTHOOK: Input: default@cmv_basetable_n9
+POSTHOOK: Input: default@cmv_mat_view_5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -507,12 +535,20 @@ from cmv_basetable_n9 join cmv_basetable_2_n4 on 
(cmv_basetable_n9.a = cmv_baset
 where cmv_basetable_2_n4.c > 10.10
 group by cmv_basetable_n9.a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n4
+PREHOOK: Input: default@cmv_basetable_n9
+PREHOOK: Input: default@cmv_mat_view_5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select cmv_basetable_n9.a
 from cmv_basetable_n9 join cmv_basetable_2_n4 on (cmv_basetable_n9.a = 
cmv_basetable_2_n4.a)
 where cmv_basetable_2_n4.c > 10.10
 group by cmv_basetable_n9.a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n4
+POSTHOOK: Input: default@cmv_basetable_n9
+POSTHOOK: Input: default@cmv_mat_view_5
+#### 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/llap/materialized_view_create_rewrite_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
index 909ab0b..da248e2 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
@@ -79,6 +79,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view AS
   WHERE cmv_basetable_2.c > 10.0
   GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@cmv_mat_view
 POSTHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW cmv_mat_view AS
   SELECT cmv_basetable.a, cmv_basetable_2.c
@@ -86,6 +90,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view AS
   WHERE cmv_basetable_2.c > 10.0
   GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@cmv_mat_view
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -237,12 +245,20 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -310,12 +326,18 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -437,9 +459,17 @@ POSTHOOK: Input: default@cmv_basetable_2
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Input: default@cmv_mat_view
+PREHOOK: Output: default@cmv_mat_view
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Input: default@cmv_mat_view
+POSTHOOK: Output: default@cmv_mat_view
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -649,12 +679,20 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -707,12 +745,18 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -847,12 +891,20 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -929,12 +981,20 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+PREHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+POSTHOOK: Input: default@cmv_mat_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -985,12 +1045,18 @@ FROM cmv_basetable join cmv_basetable_2 ON 
(cmv_basetable.a = cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable
+PREHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable.a
 FROM cmv_basetable join cmv_basetable_2 ON (cmv_basetable.a = 
cmv_basetable_2.a)
 WHERE cmv_basetable_2.c > 10.10
 GROUP BY cmv_basetable.a, cmv_basetable_2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable
+POSTHOOK: Input: default@cmv_basetable_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
index 289311e..6ab0b7a 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
@@ -79,6 +79,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE 
TBLPROPERTIES ('transac
   WHERE cmv_basetable_2_n2.c > 10.0
   GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Output: database:default
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE TBLPROPERTIES 
('transactional'='true') AS
   SELECT cmv_basetable_n5.a, cmv_basetable_2_n2.c, sum(cmv_basetable_2_n2.d)
@@ -86,6 +90,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE 
TBLPROPERTIES ('transac
   WHERE cmv_basetable_2_n2.c > 10.0
   GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -299,12 +307,18 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -452,9 +466,13 @@ POSTHOOK: Output: default@cmv_basetable_2_n2
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 ENABLE REWRITE
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view_n5
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 ENABLE REWRITE
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -527,12 +545,18 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -657,9 +681,19 @@ POSTHOOK: Input: default@cmv_basetable_n5
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+PREHOOK: Output: default@cmv_mat_view_n5
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -973,12 +1007,20 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1028,9 +1070,15 @@ POSTHOOK: Output: default@cmv_basetable_2_n2
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1192,12 +1240,20 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1247,9 +1303,15 @@ POSTHOOK: Output: default@cmv_basetable_2_n2
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1411,12 +1473,20 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1471,9 +1541,19 @@ POSTHOOK: Lineage: cmv_basetable_2_n2.d SCRIPT []
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+PREHOOK: Output: default@cmv_mat_view_n5
+PREHOOK: Output: default@cmv_mat_view_n5
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n5 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
+POSTHOOK: Output: default@cmv_mat_view_n5
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -1740,12 +1820,20 @@ FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON 
(cmv_basetable_n5.a = cmv_baset
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n2
+PREHOOK: Input: default@cmv_basetable_n5
+PREHOOK: Input: default@cmv_mat_view_n5
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n5.a, sum(cmv_basetable_2_n2.d)
 FROM cmv_basetable_n5 join cmv_basetable_2_n2 ON (cmv_basetable_n5.a = 
cmv_basetable_2_n2.a)
 WHERE cmv_basetable_2_n2.c > 10.10
 GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n2
+POSTHOOK: Input: default@cmv_basetable_n5
+POSTHOOK: Input: default@cmv_mat_view_n5
+#### 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/llap/materialized_view_create_rewrite_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
index f712eda..06422ab 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
@@ -131,11 +131,17 @@ SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -233,9 +239,15 @@ POSTHOOK: Input: default@cmv_basetable_n6
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Output: default@cmv_mat_view_n6
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Output: default@cmv_mat_view_n6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -430,11 +442,19 @@ SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -484,9 +504,15 @@ POSTHOOK: Output: default@cmv_basetable_2_n3
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Output: default@cmv_mat_view_n6
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Output: default@cmv_mat_view_n6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -637,11 +663,19 @@ SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -692,9 +726,15 @@ POSTHOOK: Output: default@cmv_basetable_2_n3
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Output: default@cmv_mat_view_n6
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Output: default@cmv_mat_view_n6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -845,11 +885,19 @@ SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -904,9 +952,15 @@ POSTHOOK: Lineage: cmv_basetable_2_n3.d SCRIPT []
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Output: default@cmv_mat_view_n6
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n6 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Output: default@cmv_mat_view_n6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1057,11 +1111,19 @@ SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n3
+PREHOOK: Input: default@cmv_basetable_n6
+PREHOOK: Input: default@cmv_mat_view_n6
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n6.a
 FROM cmv_basetable_n6 join cmv_basetable_2_n3 ON (cmv_basetable_n6.a = 
cmv_basetable_2_n3.a)
 WHERE cmv_basetable_2_n3.c > 10.10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n3
+POSTHOOK: Input: default@cmv_basetable_n6
+POSTHOOK: Input: default@cmv_mat_view_n6
+#### 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/llap/materialized_view_create_rewrite_dummy.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
index cff7f70..f744c96 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
@@ -107,9 +107,15 @@ totalSize  326
 PREHOOK: query: explain
 select a, c from cmv_basetable_n0 where a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n0
+PREHOOK: Input: default@cmv_mat_view2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, c from cmv_basetable_n0 where a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n0
+POSTHOOK: Input: default@cmv_mat_view2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -153,6 +159,8 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n0 where a = 3) table1
@@ -160,6 +168,8 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -259,9 +269,13 @@ POSTHOOK: Input: default@cmv_basetable_n0
 PREHOOK: query: explain
 alter materialized view cmv_mat_view2 enable rewrite
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view2
+PREHOOK: Output: default@cmv_mat_view2
 POSTHOOK: query: explain
 alter materialized view cmv_mat_view2 enable rewrite
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view2
+POSTHOOK: Output: default@cmv_mat_view2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -288,6 +302,9 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n0
+PREHOOK: Input: default@cmv_mat_view2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n0 where a = 3) table1
@@ -295,6 +312,9 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n0
+POSTHOOK: Input: default@cmv_mat_view2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -402,6 +422,8 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   (select a, c from cmv_basetable_n0 where a = 3) table1
@@ -409,6 +431,8 @@ select * from (
   (select a, c from cmv_basetable_n0 where d = 3) table2
   on table1.a = table2.a)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_n0
+#### 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/llap/materialized_view_create_rewrite_multi_db.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
index e5fb23d..d4bfcee 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
@@ -143,9 +143,15 @@ POSTHOOK: Input: database:db3
 PREHOOK: query: explain
 select a, c from db1.cmv_basetable_n7 where a = 3
 PREHOOK: type: QUERY
+PREHOOK: Input: db1@cmv_basetable_n7
+PREHOOK: Input: db2@cmv_mat_view2_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, c from db1.cmv_basetable_n7 where a = 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: db1@cmv_basetable_n7
+POSTHOOK: Input: db2@cmv_mat_view2_n2
+#### 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/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
index 09ebb8b..a72d31e 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
@@ -79,6 +79,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   WHERE cmv_basetable_2_n0.c > 10.0
   GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@cmv_mat_view_n1
 POSTHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   SELECT cmv_basetable_n1.a, cmv_basetable_2_n0.c
@@ -86,6 +90,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   WHERE cmv_basetable_2_n0.c > 10.0
   GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@cmv_mat_view_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -237,12 +245,20 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -310,12 +326,18 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -437,9 +459,17 @@ POSTHOOK: Input: default@cmv_basetable_n1
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n1 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Input: default@cmv_mat_view_n1
+PREHOOK: Output: default@cmv_mat_view_n1
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n1 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Input: default@cmv_mat_view_n1
+POSTHOOK: Output: default@cmv_mat_view_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -649,12 +679,20 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -707,12 +745,18 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -847,12 +891,20 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -929,12 +981,20 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+PREHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+POSTHOOK: Input: default@cmv_mat_view_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -985,12 +1045,18 @@ FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON 
(cmv_basetable_n1.a = cmv_baset
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n0
+PREHOOK: Input: default@cmv_basetable_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n1.a
 FROM cmv_basetable_n1 join cmv_basetable_2_n0 ON (cmv_basetable_n1.a = 
cmv_basetable_2_n0.a)
 WHERE cmv_basetable_2_n0.c > 10.10
 GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n0
+POSTHOOK: Input: default@cmv_basetable_n1
+#### 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/llap/materialized_view_create_rewrite_time_window.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
index 6335d04..9404668 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
@@ -79,6 +79,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE 
TBLPROPERTIES('rewritin
   WHERE cmv_basetable_2_n1.c > 10.0
   GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@cmv_basetable_2_n1
+PREHOOK: Input: default@cmv_basetable_n3
+PREHOOK: Output: database:default
+PREHOOK: Output: default@cmv_mat_view_n3
 POSTHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE 
TBLPROPERTIES('rewriting.time.window'='5min') AS
   SELECT cmv_basetable_n3.a, cmv_basetable_2_n1.c
@@ -86,6 +90,10 @@ CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE 
TBLPROPERTIES('rewritin
   WHERE cmv_basetable_2_n1.c > 10.0
   GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@cmv_basetable_2_n1
+POSTHOOK: Input: default@cmv_basetable_n3
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@cmv_mat_view_n3
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -284,12 +292,18 @@ FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON 
(cmv_basetable_n3.a = cmv_baset
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n1
+PREHOOK: Input: default@cmv_basetable_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n3.a
 FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON (cmv_basetable_n3.a = 
cmv_basetable_2_n1.a)
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n1
+POSTHOOK: Input: default@cmv_basetable_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -434,9 +448,13 @@ POSTHOOK: Output: default@cmv_basetable_2_n1
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n3 ENABLE REWRITE
 PREHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+PREHOOK: Input: default@cmv_mat_view_n3
+PREHOOK: Output: default@cmv_mat_view_n3
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n3 ENABLE REWRITE
 POSTHOOK: type: ALTER_MATERIALIZED_VIEW_REWRITE
+POSTHOOK: Input: default@cmv_mat_view_n3
+POSTHOOK: Output: default@cmv_mat_view_n3
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -507,12 +525,20 @@ FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON 
(cmv_basetable_n3.a = cmv_baset
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n1
+PREHOOK: Input: default@cmv_basetable_n3
+PREHOOK: Input: default@cmv_mat_view_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n3.a
 FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON (cmv_basetable_n3.a = 
cmv_basetable_2_n1.a)
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n1
+POSTHOOK: Input: default@cmv_basetable_n3
+POSTHOOK: Input: default@cmv_mat_view_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -553,9 +579,17 @@ POSTHOOK: Input: default@cmv_mat_view_n3
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n3 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n1
+PREHOOK: Input: default@cmv_basetable_n3
+PREHOOK: Input: default@cmv_mat_view_n3
+PREHOOK: Output: default@cmv_mat_view_n3
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view_n3 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n1
+POSTHOOK: Input: default@cmv_basetable_n3
+POSTHOOK: Input: default@cmv_mat_view_n3
+POSTHOOK: Output: default@cmv_mat_view_n3
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -811,12 +845,20 @@ FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON 
(cmv_basetable_n3.a = cmv_baset
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cmv_basetable_2_n1
+PREHOOK: Input: default@cmv_basetable_n3
+PREHOOK: Input: default@cmv_mat_view_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT cmv_basetable_n3.a
 FROM cmv_basetable_n3 join cmv_basetable_2_n1 ON (cmv_basetable_n3.a = 
cmv_basetable_2_n1.a)
 WHERE cmv_basetable_2_n1.c > 10.10
 GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cmv_basetable_2_n1
+POSTHOOK: Input: default@cmv_basetable_n3
+POSTHOOK: Input: default@cmv_mat_view_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/llap/materialized_view_partitioned.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
index e68ec4a..d5d7fad 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
@@ -16,10 +16,17 @@ PREHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW partition_mv_1 PARTITIONED ON (key) AS
 SELECT value, key FROM src_txn where key > 200 and key < 250
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
+PREHOOK: Input: default@src_txn
+PREHOOK: Output: database:default
+PREHOOK: Output: default@partition_mv_1
+PREHOOK: Output: default@partition_mv_1
 POSTHOOK: query: EXPLAIN
 CREATE MATERIALIZED VIEW partition_mv_1 PARTITIONED ON (key) AS
 SELECT value, key FROM src_txn where key > 200 and key < 250
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
+POSTHOOK: Input: default@src_txn
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@partition_mv_1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -211,9 +218,15 @@ Outdated for Rewriting:    No
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_mv_1 where key = 238
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_mv_1
+PREHOOK: Input: default@partition_mv_1@key=238
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_mv_1 where key = 238
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_mv_1
+POSTHOOK: Input: default@partition_mv_1@key=238
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -321,9 +334,15 @@ POSTHOOK: Lineage: partition_mv_2 
PARTITION(value=val_249).key SIMPLE [(src_txn)
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_mv_2 where value = 'val_238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_mv_2
+PREHOOK: Input: default@partition_mv_2@value=val_238
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_mv_2 where value = 'val_238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_mv_2
+POSTHOOK: Input: default@partition_mv_2@value=val_238
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -354,9 +373,77 @@ POSTHOOK: Input: default@partition_mv_2@value=val_238
 PREHOOK: query: EXPLAIN
 SELECT value FROM partition_mv_2 where key = 238
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_mv_2
+PREHOOK: Input: default@partition_mv_2@value=val_201
+PREHOOK: Input: default@partition_mv_2@value=val_202
+PREHOOK: Input: default@partition_mv_2@value=val_203
+PREHOOK: Input: default@partition_mv_2@value=val_205
+PREHOOK: Input: default@partition_mv_2@value=val_207
+PREHOOK: Input: default@partition_mv_2@value=val_208
+PREHOOK: Input: default@partition_mv_2@value=val_209
+PREHOOK: Input: default@partition_mv_2@value=val_213
+PREHOOK: Input: default@partition_mv_2@value=val_214
+PREHOOK: Input: default@partition_mv_2@value=val_216
+PREHOOK: Input: default@partition_mv_2@value=val_217
+PREHOOK: Input: default@partition_mv_2@value=val_218
+PREHOOK: Input: default@partition_mv_2@value=val_219
+PREHOOK: Input: default@partition_mv_2@value=val_221
+PREHOOK: Input: default@partition_mv_2@value=val_222
+PREHOOK: Input: default@partition_mv_2@value=val_223
+PREHOOK: Input: default@partition_mv_2@value=val_224
+PREHOOK: Input: default@partition_mv_2@value=val_226
+PREHOOK: Input: default@partition_mv_2@value=val_228
+PREHOOK: Input: default@partition_mv_2@value=val_229
+PREHOOK: Input: default@partition_mv_2@value=val_230
+PREHOOK: Input: default@partition_mv_2@value=val_233
+PREHOOK: Input: default@partition_mv_2@value=val_235
+PREHOOK: Input: default@partition_mv_2@value=val_237
+PREHOOK: Input: default@partition_mv_2@value=val_238
+PREHOOK: Input: default@partition_mv_2@value=val_239
+PREHOOK: Input: default@partition_mv_2@value=val_241
+PREHOOK: Input: default@partition_mv_2@value=val_242
+PREHOOK: Input: default@partition_mv_2@value=val_244
+PREHOOK: Input: default@partition_mv_2@value=val_247
+PREHOOK: Input: default@partition_mv_2@value=val_248
+PREHOOK: Input: default@partition_mv_2@value=val_249
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT value FROM partition_mv_2 where key = 238
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_mv_2
+POSTHOOK: Input: default@partition_mv_2@value=val_201
+POSTHOOK: Input: default@partition_mv_2@value=val_202
+POSTHOOK: Input: default@partition_mv_2@value=val_203
+POSTHOOK: Input: default@partition_mv_2@value=val_205
+POSTHOOK: Input: default@partition_mv_2@value=val_207
+POSTHOOK: Input: default@partition_mv_2@value=val_208
+POSTHOOK: Input: default@partition_mv_2@value=val_209
+POSTHOOK: Input: default@partition_mv_2@value=val_213
+POSTHOOK: Input: default@partition_mv_2@value=val_214
+POSTHOOK: Input: default@partition_mv_2@value=val_216
+POSTHOOK: Input: default@partition_mv_2@value=val_217
+POSTHOOK: Input: default@partition_mv_2@value=val_218
+POSTHOOK: Input: default@partition_mv_2@value=val_219
+POSTHOOK: Input: default@partition_mv_2@value=val_221
+POSTHOOK: Input: default@partition_mv_2@value=val_222
+POSTHOOK: Input: default@partition_mv_2@value=val_223
+POSTHOOK: Input: default@partition_mv_2@value=val_224
+POSTHOOK: Input: default@partition_mv_2@value=val_226
+POSTHOOK: Input: default@partition_mv_2@value=val_228
+POSTHOOK: Input: default@partition_mv_2@value=val_229
+POSTHOOK: Input: default@partition_mv_2@value=val_230
+POSTHOOK: Input: default@partition_mv_2@value=val_233
+POSTHOOK: Input: default@partition_mv_2@value=val_235
+POSTHOOK: Input: default@partition_mv_2@value=val_237
+POSTHOOK: Input: default@partition_mv_2@value=val_238
+POSTHOOK: Input: default@partition_mv_2@value=val_239
+POSTHOOK: Input: default@partition_mv_2@value=val_241
+POSTHOOK: Input: default@partition_mv_2@value=val_242
+POSTHOOK: Input: default@partition_mv_2@value=val_244
+POSTHOOK: Input: default@partition_mv_2@value=val_247
+POSTHOOK: Input: default@partition_mv_2@value=val_248
+POSTHOOK: Input: default@partition_mv_2@value=val_249
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -461,9 +548,12 @@ POSTHOOK: Lineage: src_txn.value SCRIPT []
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW partition_mv_1 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_txn
+PREHOOK: Output: default@partition_mv_1
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW partition_mv_1 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_txn
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -832,9 +922,14 @@ POSTHOOK: Lineage: src_txn.value SCRIPT []
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW partition_mv_3 REBUILD
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_txn
+PREHOOK: Input: default@src_txn_2
+PREHOOK: Output: default@partition_mv_3
 POSTHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW partition_mv_3 REBUILD
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_txn
+POSTHOOK: Input: default@src_txn_2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

Reply via email to